4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: When the "po" directory exists, but "po/Makefile" doesn't,
12 building fails. Make loops when the "po" directory has been
13 deleted after running configure.
14 Solution: Check for the "po/Makefile" instead of just the "po" directory.
15 Check this again before trying to run make with that Makefile.
16 Files: src/auto/configure, src/configure.in, src/Makefile
19 *** ../vim-6.2.271/src/auto/configure Wed Feb 4 12:12:05 2004
20 --- src/auto/configure Tue Feb 17 17:25:57 2004
25 echo $ac_n "checking for NLS""... $ac_c" 1>&6
26 ! echo "configure:7429: checking for NLS" >&5
29 if test -n "$MSGFMT"; then
30 cat > conftest.$ac_ext <<EOF
31 ! #line 7434 "configure"
38 ! if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40 echo "$ac_t""gettext() works" 1>&6; have_gettext="yes"
45 echo $ac_n "checking for NLS""... $ac_c" 1>&6
46 ! echo "configure:7673: checking for NLS" >&5
47 ! if test -f po/Makefile; then
49 if test -n "$MSGFMT"; then
50 cat > conftest.$ac_ext <<EOF
51 ! #line 7678 "configure"
58 ! if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60 echo "$ac_t""gettext() works" 1>&6; have_gettext="yes"
62 *** ../vim-6.2.271/src/configure.in Wed Feb 4 12:12:05 2004
63 --- src/configure.in Tue Feb 17 17:25:03 2004
67 AC_CHECK_PROG(MSGFMT, msgfmt, msgfmt, )
68 AC_MSG_CHECKING([for NLS])
71 if test -n "$MSGFMT"; then
75 AC_CHECK_PROG(MSGFMT, msgfmt, msgfmt, )
76 AC_MSG_CHECKING([for NLS])
77 ! if test -f po/Makefile; then
79 if test -n "$MSGFMT"; then
86 ! AC_MSG_RESULT([no "po" directory - disabled]);
94 ! AC_MSG_RESULT([no "po/Makefile" - disabled]);
98 *** ../vim-6.2.271/src/Makefile Mon Jan 12 19:56:01 2004
99 --- src/Makefile Tue Feb 17 21:13:56 2004
102 # Build the language specific files if they were unpacked.
103 # Generate the converted .mo files separately, it's no problem if this fails.
105 ! @if test -n "$(MAKEMO)"; then \
106 cd $(PODIR); CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix); \
108 ! -@if test -n "$(MAKEMO)"; then \
109 cd $(PODIR); CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix) converted; \
113 # Build the language specific files if they were unpacked.
114 # Generate the converted .mo files separately, it's no problem if this fails.
116 ! @if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
117 cd $(PODIR); CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix); \
119 ! -@if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
120 cd $(PODIR); CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix) converted; \
126 # install the language specific files, if they were unpacked
127 install-languages: languages $(DEST_LANG) $(DEST_KMAP)
128 ! if test -n "$(MAKEMO)"; then \
129 cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
130 INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
134 # install the language specific files, if they were unpacked
135 install-languages: languages $(DEST_LANG) $(DEST_KMAP)
136 ! if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
137 cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
138 INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
140 *** ../vim-6.2.271/src/version.c Thu Feb 19 14:43:37 2004
141 --- src/version.c Thu Feb 19 14:46:02 2004
145 { /* Add new patch number below this line */
151 A bad peace is better than a good war. - Yiddish Proverb
153 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
154 /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
155 \\\ Project leader for A-A-P -- http://www.A-A-P.org ///
156 \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///