3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 --- src/configure.in~configure
9 dnl Should also work with autoconf 2.54 and later.
12 -AC_CONFIG_HEADER(auto/config.h:config.h.in)
13 +AC_CONFIG_HEADER(config.h:config.h.in)
15 dnl Being able to run configure means the system is Unix (compatible).
19 dnl If configure thinks we are cross compiling, there is probably something
20 dnl wrong with the CC or CFLAGS settings, give an understandable error message
21 -if test "$cross_compiling" = yes; then
22 - AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS
23 - (cross compiling doesn't work)])
25 +dnl if test "$cross_compiling" = yes; then
26 +dnl AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS
27 +dnl (cross compiling doesn't work)])
30 dnl gcc-cpp has the wonderful -MM option to produce nicer dependencies
31 test "$GCC" = yes && CPP_MM=M; AC_SUBST(CPP_MM)
33 compiledby=""; AC_MSG_RESULT(no))
36 +dnl on FreeBSD tclsh is a silly script, look for tclsh8.0 or tclsh8.2
37 +AC_MSG_CHECKING(--with-x argument)
38 +AC_ARG_WITH(x, [ --with-x= use X],
40 +if test X"$withval" = Xno; then
44 +AC_MSG_RESULT($withval),
47 AC_MSG_CHECKING(--disable-xsmp argument)
49 [ --disable-xsmp Disable XSMP session management],
51 if test "X$perlldflags" != "X"; then
52 LDFLAGS="$perlldflags $LDFLAGS"
54 - PERL_SRC="auto/if_perl.c if_perlsfio.c"
55 + PERL_SRC="if_perl.c if_perlsfio.c"
56 PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o"
57 PERL_PRO="if_perl.pro if_perlsfio.pro"
61 AC_MSG_CHECKING(--enable-gui argument)
63 - [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon]], , enable_gui="auto")
64 + [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon]], , enable_gui="auto")
66 ## Canonicalize the --enable-gui= argument so that it can be easily compared.
67 ## Do not use character classes for portability with old tools.
73 -dnl Get the cflags and libraries from the gtk-config script
76 -dnl define an autoconf function to check for a specified version of GTK, and
77 -dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16.
79 -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
80 -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
82 -AC_DEFUN(AM_PATH_GTK,
84 - if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
86 - min_gtk_version=ifelse([$1], ,0.99.7,$1)
87 - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
89 - if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
90 - && $PKG_CONFIG --exists gtk+-2.0; then
92 - dnl We should be using PKG_CHECK_MODULES() instead of this hack.
93 - dnl But I guess the dependency on pkgconfig.m4 is not wanted or
94 - dnl something like that.
95 - GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
96 - GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
97 - gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
98 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
99 - gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
100 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
101 - gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
102 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
104 - elif test "X$GTK_CONFIG" != "Xno"; then
106 - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
107 - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
108 - gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
109 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
110 - gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
111 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
112 - gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
113 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
119 - if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then
121 - ac_save_CFLAGS="$CFLAGS"
122 - ac_save_LIBS="$LIBS"
123 - CFLAGS="$CFLAGS $GTK_CFLAGS"
124 - LIBS="$LIBS $GTK_LIBS"
127 - dnl Now check if the installed GTK is sufficiently new. (Also sanity
128 - dnl checks the results of gtk-config to some extent
132 -#include <gtk/gtk.h>
138 -int major, minor, micro;
141 -system ("touch conf.gtktest");
143 -/* HP/UX 9 (%@#!) writes to sscanf strings */
144 -tmp_version = g_strdup("$min_gtk_version");
145 -if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
146 - printf("%s, bad version string\n", "$min_gtk_version");
150 -if ((gtk_major_version > major) ||
151 - ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
152 - ((gtk_major_version == major) && (gtk_minor_version == minor) &&
153 - (gtk_micro_version >= micro)))
159 -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
160 - CFLAGS="$ac_save_CFLAGS"
161 - LIBS="$ac_save_LIBS"
164 - if test "x$no_gtk" = x ; then
165 - if test "x$enable_gtktest" = "xyes"; then
166 - AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
168 - AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
170 - ifelse([$2], , :, [$2])
176 - ifelse([$3], , :, [$3])
183 - ifelse([$3], , :, [$3])
185 - AC_SUBST(GTK_CFLAGS)
190 -dnl ---------------------------------------------------------------------------
192 -dnl ---------------------------------------------------------------------------
193 -AC_DEFUN([GNOME_INIT_HOOK],
195 - AC_SUBST(GNOME_LIBS)
196 - AC_SUBST(GNOME_LIBDIR)
197 - AC_SUBST(GNOME_INCLUDEDIR)
199 - AC_ARG_WITH(gnome-includes,
200 - [ --with-gnome-includes=DIR Specify location of GNOME headers],
201 - [CFLAGS="$CFLAGS -I$withval"]
204 - AC_ARG_WITH(gnome-libs,
205 - [ --with-gnome-libs=DIR Specify location of GNOME libs],
206 - [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval]
210 - [ --with-gnome Specify prefix for GNOME files],
211 - if test x$withval = xyes; then
213 - ifelse([$1], [], :, [$1])
215 - if test "x$withval" = xno; then
219 - LDFLAGS="$LDFLAGS -L$withval/lib"
220 - CFLAGS="$CFLAGS -I$withval/include"
221 - gnome_prefix=$withval/lib
226 - if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
228 - AC_MSG_CHECKING(for libgnomeui-2.0)
229 - if $PKG_CONFIG --exists libgnomeui-2.0; then
231 - GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
232 - GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
233 - GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
236 - AC_MSG_RESULT(not found)
237 - if test "x$2" = xfail; then
238 - AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config)
242 - elif test "x$want_gnome" = xyes; then
244 - AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
245 - if test "$GNOME_CONFIG" = "no"; then
246 - no_gnome_config="yes"
248 - AC_MSG_CHECKING(if $GNOME_CONFIG works)
249 - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
251 - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
252 - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
253 - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
257 - no_gnome_config="yes"
261 - if test x$exec_prefix = xNONE; then
262 - if test x$prefix = xNONE; then
263 - gnome_prefix=$ac_default_prefix/lib
265 - gnome_prefix=$prefix/lib
268 - gnome_prefix=`eval echo \`echo $libdir\``
271 - if test "$no_gnome_config" = "yes"; then
272 - AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
273 - if test -f $gnome_prefix/gnomeConf.sh; then
274 - AC_MSG_RESULT(found)
275 - echo "loading gnome configuration from" \
276 - "$gnome_prefix/gnomeConf.sh"
277 - . $gnome_prefix/gnomeConf.sh
280 - AC_MSG_RESULT(not found)
281 - if test x$2 = xfail; then
282 - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
290 -AC_DEFUN([GNOME_INIT],[
291 - GNOME_INIT_HOOK([],fail)
295 dnl ---------------------------------------------------------------------------
296 dnl Check for GTK. First checks for gtk-config, cause it needs that to get the
297 dnl correct compiler flags. Then checks for GTK 1.1.16. If that fails, then
298 @@ -1586,7 +1374,7 @@
299 AC_TRY_RUN([#include <ctype.h>
300 main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }],
301 AC_DEFINE(BROKEN_TOUPPER) AC_MSG_RESULT(bad),
302 - AC_MSG_RESULT(good), AC_MSG_ERROR(failed to compile test program))
303 + AC_MSG_RESULT(good), AC_MSG_WARN(failed to compile test program))
305 AC_MSG_CHECKING(whether __DATE__ and __TIME__ work)
306 AC_TRY_COMPILE(, [printf("(" __DATE__ " " __TIME__ ")");],
307 @@ -1753,7 +1541,7 @@
308 # include <termcap.h>
310 main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }],
311 - res="OK", res="FAIL", res="FAIL")
312 + res="OK", res="FAIL", res="OK")
313 if test "$res" = "OK"; then
316 @@ -1772,7 +1560,8 @@
317 {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }],
318 AC_MSG_RESULT([no -- we are in termcap land]),
319 AC_MSG_RESULT([yes -- terminfo spoken here]); AC_DEFINE(TERMINFO),
320 - AC_MSG_ERROR(failed to compile test program.))
321 + AC_MSG_WARN(crosscompiling - defaulting to terminfo)
322 + AC_DEFINE(TERMINFO))
324 AC_MSG_RESULT(none found)
326 @@ -1787,7 +1576,8 @@
327 {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }],
328 AC_MSG_RESULT(zero); AC_DEFINE(TGETENT_ZERO_ERR, 0),
329 AC_MSG_RESULT(non-zero),
330 - AC_MSG_ERROR(failed to compile test program.))
331 + AC_MSG_WARN(crosscompiling - defaulting to zero)
332 + AC_DEFINE(TGETENT_ZERO_ERR))
335 AC_MSG_CHECKING(whether termcap.h contains ospeed)
336 @@ -1938,7 +1728,7 @@
339 AC_MSG_RESULT([can't determine - assume ptys are world accessable]),
340 - AC_MSG_ERROR(failed to compile test program))
341 + AC_MSG_WARN(failed to compile test program))
344 dnl Checks for library functions. ===================================
345 @@ -1981,7 +1771,7 @@
346 AC_MSG_RESULT(it is usable),
347 AC_MSG_RESULT(it stinks)
348 AC_DEFINE(BAD_GETCWD),
349 - AC_MSG_ERROR(failed to compile test program))
350 + AC_MSG_WARN(failed to compile test program))
352 dnl Check for functions in one big call, to reduce the size of configure
353 AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
354 @@ -2004,13 +1794,20 @@
355 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ST_BLKSIZE),
358 -AC_MSG_CHECKING(whether stat() ignores a trailing slash)
359 +AC_CACHE_CHECK([whether stat() ignores a trailing slash],
360 + [ac_cv_func_stat_ignores_trailing_slash],
362 [#include <sys/types.h>
363 #include <sys/stat.h>
364 main() {struct stat st; exit(stat("configure/", &st) != 0); }],
365 - AC_MSG_RESULT(yes); AC_DEFINE(STAT_IGNORES_SLASH),
366 - AC_MSG_RESULT(no), AC_MSG_ERROR(failed to compile test program))
367 + ac_cv_func_stat_ignores_trailing_slash=yes,
368 + ac_cv_func_stat_ignores_trailing_slash=no,
369 + ac_cv_func_stat_ignores_trailing_slash=no
372 +if X"$ac_cv_func_stat_ignores_trailing_slash" = Xyes; then
373 + AC_DEFINE(STAT_IGNORES_SLASH)
376 dnl Link with iconv for charset translation, if not found without library.
377 dnl check for iconv() requires including iconv.h
378 @@ -2149,7 +1946,7 @@
380 AC_DEFINE(HAVE_VSNPRINTF) AC_MSG_RESULT(yes),
382 - AC_MSG_ERROR(failed to compile test program))
383 + AC_MSG_WARN(failed to compile test program))
386 dnl rename needs to be checked separately to work on Nextstep with cc
387 @@ -2241,9 +2038,9 @@
388 AC_DEFINE(USEBCOPY) AC_MSG_RESULT(bcopy does),
389 AC_TRY_RUN([#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog],
390 AC_DEFINE(USEMEMCPY) AC_MSG_RESULT(memcpy does), AC_MSG_RESULT(no),
391 - AC_MSG_ERROR(failed to compile test program)),
392 - AC_MSG_ERROR(failed to compile test program)),
393 - AC_MSG_ERROR(failed to compile test program))
394 + AC_MSG_WARN(failed to compile test program)),
395 + AC_MSG_WARN(failed to compile test program)),
396 + AC_MSG_WARN(failed to compile test program))
398 dnl Check for multibyte locale functions
399 dnl Find out if _Xsetlocale() is supported by libX11.
400 @@ -2418,6 +2215,6 @@
401 AC_CHECK_HEADERS(setjmp.h)
403 dnl write output files
404 -AC_OUTPUT(auto/config.mk:config.mk.in)
405 +AC_OUTPUT(config.mk:config.mk.in)
407 dnl vim: set sw=2 tw=78 fo+=l:
412 +dnl Get the cflags and libraries from the gtk-config script
415 +dnl define an autoconf function to check for a specified version of GTK, and
416 +dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16.
418 +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
419 +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
421 +AC_DEFUN(AM_PATH_GTK,
423 + if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
425 + min_gtk_version=ifelse([$1], ,0.99.7,$1)
426 + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
428 + if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
429 + && $PKG_CONFIG --exists gtk+-2.0; then
431 + dnl We should be using PKG_CHECK_MODULES() instead of this hack.
432 + dnl But I guess the dependency on pkgconfig.m4 is not wanted or
433 + dnl something like that.
434 + GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
435 + GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
436 + gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
437 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
438 + gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
439 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
440 + gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
441 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
443 + elif test "X$GTK_CONFIG" != "Xno"; then
445 + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
446 + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
447 + gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
448 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
449 + gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
450 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
451 + gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
452 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
458 + if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then
460 + ac_save_CFLAGS="$CFLAGS"
461 + ac_save_LIBS="$LIBS"
462 + CFLAGS="$CFLAGS $GTK_CFLAGS"
463 + LIBS="$LIBS $GTK_LIBS"
466 + dnl Now check if the installed GTK is sufficiently new. (Also sanity
467 + dnl checks the results of gtk-config to some extent
471 +#include <gtk/gtk.h>
477 +int major, minor, micro;
480 +system ("touch conf.gtktest");
482 +/* HP/UX 9 (%@#!) writes to sscanf strings */
483 +tmp_version = g_strdup("$min_gtk_version");
484 +if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
485 + printf("%s, bad version string\n", "$min_gtk_version");
489 +if ((gtk_major_version > major) ||
490 + ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
491 + ((gtk_major_version == major) && (gtk_minor_version == minor) &&
492 + (gtk_micro_version >= micro)))
498 +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
499 + CFLAGS="$ac_save_CFLAGS"
500 + LIBS="$ac_save_LIBS"
503 + if test "x$no_gtk" = x ; then
504 + if test "x$enable_gtktest" = "xyes"; then
505 + AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
507 + AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
509 + ifelse([$2], , :, [$2])
515 + ifelse([$3], , :, [$3])
522 + ifelse([$3], , :, [$3])
524 + AC_SUBST(GTK_CFLAGS)
529 +dnl ---------------------------------------------------------------------------
531 +dnl ---------------------------------------------------------------------------
532 +AC_DEFUN([GNOME_INIT_HOOK],
534 + AC_SUBST(GNOME_LIBS)
535 + AC_SUBST(GNOME_LIBDIR)
536 + AC_SUBST(GNOME_INCLUDEDIR)
538 + AC_ARG_WITH(gnome-includes,
539 + [ --with-gnome-includes=DIR Specify location of GNOME headers],
540 + [CFLAGS="$CFLAGS -I$withval"]
543 + AC_ARG_WITH(gnome-libs,
544 + [ --with-gnome-libs=DIR Specify location of GNOME libs],
545 + [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval]
549 + [ --with-gnome Specify prefix for GNOME files],
550 + if test x$withval = xyes; then
552 + ifelse([$1], [], :, [$1])
554 + if test "x$withval" = xno; then
558 + LDFLAGS="$LDFLAGS -L$withval/lib"
559 + CFLAGS="$CFLAGS -I$withval/include"
560 + gnome_prefix=$withval/lib
565 + if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
567 + AC_MSG_CHECKING(for libgnomeui-2.0)
568 + if $PKG_CONFIG --exists libgnomeui-2.0; then
570 + GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
571 + GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
572 + GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
575 + AC_MSG_RESULT(not found)
576 + if test "x$2" = xfail; then
577 + AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config)
581 + elif test "x$want_gnome" = xyes; then
583 + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
584 + if test "$GNOME_CONFIG" = "no"; then
585 + no_gnome_config="yes"
587 + AC_MSG_CHECKING(if $GNOME_CONFIG works)
588 + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
590 + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
591 + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
592 + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
596 + no_gnome_config="yes"
600 + if test x$exec_prefix = xNONE; then
601 + if test x$prefix = xNONE; then
602 + gnome_prefix=$ac_default_prefix/lib
604 + gnome_prefix=$prefix/lib
607 + gnome_prefix=`eval echo \`echo $libdir\``
610 + if test "$no_gnome_config" = "yes"; then
611 + AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
612 + if test -f $gnome_prefix/gnomeConf.sh; then
613 + AC_MSG_RESULT(found)
614 + echo "loading gnome configuration from" \
615 + "$gnome_prefix/gnomeConf.sh"
616 + . $gnome_prefix/gnomeConf.sh
619 + AC_MSG_RESULT(not found)
620 + if test x$2 = xfail; then
621 + AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
629 +AC_DEFUN([GNOME_INIT],[
630 + GNOME_INIT_HOOK([],fail)
634 --- src/Makefile~configure
637 # this in two steps with:
640 -# The configuration phase creates/overwrites auto/config.h and
642 +# The configuration phase creates/overwrites config.h and
644 # The configure script is created with "make autoconf". It can detect
645 # different features of your system and act accordingly. However, it is
646 # not correct for all systems. Check this:
650 # - If you do not trust the automatic configuration code, then inspect
651 -# auto/config.h and auto/config.mk, before starting the actual build
652 -# phase. If possible edit this Makefile, rather than auto/config.mk --
653 +# config.h and config.mk, before starting the actual build
654 +# phase. If possible edit this Makefile, rather than config.mk --
655 # especially look at the definition of VIMLOC below. Note that the
656 -# configure phase overwrites auto/config.mk and auto/config.h again.
657 +# configure phase overwrites config.mk and config.h again.
658 # - If you get error messages, find out what is wrong and try to correct
659 # it in this Makefile. You may need to do "make reconfig" when you
660 # change anything that configure uses (e.g. switching from an old C
661 -# compiler to an ANSI C compiler). Only when auto/configure does
662 +# compiler to an ANSI C compiler). Only when configure does
663 # something wrong you may need to change one of the other files. If
664 # you find a clean way to fix the problem, consider sending a note to
665 # the author of autoconf (bug-gnu-utils@prep.ai.mit.edu) or Vim
667 # If the new Vim seems to be working OK you can install it and the
668 # documentation in the appropriate location. The default is
669 # "/usr/local". Change "prefix" below to change the location.
670 -# "auto/pathdef.c" will be compiled again after changing this to make
671 +# "pathdef.c" will be compiled again after changing this to make
672 # the executable know where the help files are located.
673 # Note that any existing executable is removed or overwritten. If you
674 # want to keep it you will have to make a backup copy first.
676 # (I) SINIX-N 5.42 and 5.43 need some EXTRA_LIBS. Also for Reliant-Unix.
677 # (J) If you get undefined symbols, see below for a solution.
678 # (K) See lines to uncomment below for machines with 64 bit pointers.
679 -# (L) For Silicon Graphics O2 workstations remove "-lnsl" from auto/config.mk
680 +# (L) For Silicon Graphics O2 workstations remove "-lnsl" from config.mk
681 # (M) gcc version cygnus-2.0.1 does NOT work (symptom: "dl" deletes two
682 # characters instead of one).
683 # (N) SCO with decmouse.
685 # detection, since the configure script runs into an error when it
686 # detects Python (probably because of the bash shell).
687 # (V) See lines to uncomment below.
688 -# (X) Need to use the .include "auto/config.mk" line below
689 +# (X) Need to use the .include "config.mk" line below
690 # (Y) See line with c89 below
691 # (Z) See lines with cc or c89 below
692 # (a) See line with EXTRA_LIBS below.
693 @@ -263,20 +263,20 @@
694 #GUI_LIB_LOC = -L/usr/X11R6/lib
697 -######################## auto/config.mk ######################## {{{1
698 -# At this position auto/config.mk is included. When starting from the
699 -# distribution it is almost empty. After running auto/configure it contains
700 +######################## config.mk ######################## {{{1
701 +# At this position config.mk is included. When starting from the
702 +# distribution it is almost empty. After running configure it contains
703 # settings that have been discovered for your system. Settings below this
704 -# include override settings in auto/config.mk!
705 +# include override settings in config.mk!
707 -# Note: if auto/config.mk is lost somehow (e.g., because configure was
708 -# interrupted), create an empty auto/config.mk file and do "make config".
709 +# Note: if config.mk is lost somehow (e.g., because configure was
710 +# interrupted), create an empty config.mk file and do "make config".
712 -# (X) How to include auto/config.mk depends on the version of "make" you have,
713 +# (X) How to include config.mk depends on the version of "make" you have,
714 # if the current choice doesn't work, try the other one.
716 -include auto/config.mk
717 -#.include "auto/config.mk"
719 +#.include "config.mk"
724 # Uncomment this when you want to include the Perl interface.
725 # The Perl option sometimes causes problems, because it adds extra flags
726 # to the command line. If you see strange flags during compilation, check in
727 -# auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting
728 +# config.mk where they come from. If it's PERL_CFLAGS, try commenting
730 # When you get an error for a missing "perl.exp" file, try creating an emtpy
731 # one: "touch perl.exp".
732 @@ -633,12 +633,12 @@
733 # 1. If you don't have an X server: Comment out CONF_OPT_GUI and uncomment
734 # CONF_OPT_X = --without-x.
736 -# 3. edit auto/config.mk and remove -ldir and -ltermcap from LIBS. It doesn't
737 +# 3. edit config.mk and remove -ldir and -ltermcap from LIBS. It doesn't
738 # have -ldir (does config find it somewhere?) and -ltermcap has at
739 # least one problem so I use termlib.o instead. The problem with
740 # termcap is that it segfaults if you call it with the name of
741 # a non-existent terminal type.
742 -# 4. edit auto/config.h and add #define USE_TMPNAM
743 +# 4. edit config.h and add #define USE_TMPNAM
744 # 5. add termlib.o to OBJ
748 #GUI_LIB_LOC = -L/usr/lib64
751 -# 2) edit auto/config.mk and delete the -lelf entry in the LIBS line
752 +# 2) edit config.mk and delete the -lelf entry in the LIBS line
755 # or (for 32bit pointers) uncomment the following line
757 #GUI_LIB_LOC = -L/usr/lib32
760 -# 2) edit auto/config.mk, add -n32 to LDFLAGS
761 +# 2) edit config.mk, add -n32 to LDFLAGS
765 @@ -1242,7 +1242,7 @@
774 @@ -1261,7 +1261,7 @@
776 TAGS_SRC = *.c *.cpp if_perl.xs
778 -EXTRA_SRC = hangulin.c auto/if_perl.c if_perlsfio.c if_python.c if_tcl.c \
779 +EXTRA_SRC = hangulin.c if_perl.c if_perlsfio.c if_python.c if_tcl.c \
780 if_ruby.c if_sniff.c gui_beval.c \
781 workshop.c wsdebug.c integration.c netbeans.c
783 @@ -1392,14 +1392,14 @@
785 # Run configure with all the setting from above.
787 -# Note: auto/config.h doesn't depend on configure, because running configure
788 -# doesn't always update auto/config.h. The timestamp isn't changed if the
789 +# Note: config.h doesn't depend on configure, because running configure
790 +# doesn't always update config.h. The timestamp isn't changed if the
791 # file contents didn't change (to avoid recompiling everything). Including a
792 -# dependency on auto/config.h would cause running configure each time when
793 -# auto/config.h isn't updated. The dependency on auto/config.mk should make
794 +# dependency on config.h would cause running configure each time when
795 +# config.h isn't updated. The dependency on config.mk should make
796 # sure configure is run when it's needed.
798 -config auto/config.mk: auto/configure config.mk.in config.h.in
799 +config config.mk: configure config.mk.in config.h.in
800 GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
801 CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
802 LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
803 @@ -1414,31 +1414,31 @@
805 # Use "make reconfig" to rerun configure without cached values.
806 # When config.h changes, most things will be recompiled automatically.
807 -# Use "myself" to make "all" with a possibly changed auto/config.mk.
808 +# Use "myself" to make "all" with a possibly changed config.mk.
809 reconfig: scratch config myself
811 -# Run autoconf to produce auto/configure.
812 +# Run autoconf to produce configure.
814 # - DO NOT RUN autoconf MANUALLY! It will overwrite ./configure instead of
815 -# producing auto/configure.
816 +# producing configure.
817 # - autoconf is not run automatically, because a patch usually changes both
818 -# configure.in and auto/configure but can't update the timestamps. People
819 +# configure.in and configure but can't update the timestamps. People
820 # who do not have (the correct version of) autoconf would run into trouble.
822 # Two tricks are required to make autoconf put its output in the "auto" dir:
823 # - Temporarily move the ./configure script to ./configure.save. Don't
824 # overwrite it, it's probably the result of an aborted autoconf.
825 -# - Use sed to change ./config.log to auto/config.log in the configure script.
826 +# - Use sed to change ./config.log to config.log in the configure script.
828 if test ! -f configure.save; then mv configure configure.save; fi
830 - sed -e 's+\./config.log+auto/config.log+' configure > auto/configure
831 - chmod 755 auto/configure
832 + sed -e 's+\./config.log+config.log+' configure > configure
833 + chmod 755 configure
834 mv -f configure.save configure
835 - -rm -f auto/config.status auto/config.cache
836 + -rm -f config.status config.cache
838 -# Re-execute this Makefile to include the new auto/config.mk produced by
839 -# configure Only used when typing "make" with a fresh auto/config.mk.
840 +# Re-execute this Makefile to include the new config.mk produced by
841 +# configure Only used when typing "make" with a fresh config.mk.
843 $(MAKE) -f Makefile all
845 @@ -1449,7 +1449,7 @@
847 # Link the target for normal use or debugging.
848 # A shell script is used to try linking without unneccesary libraries.
849 -$(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
850 +$(VIMTARGET): config.mk objects $(OBJ) version.c version.h
851 $(CCC) version.c -o objects/version.o
852 @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
853 -o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
854 @@ -1487,7 +1487,7 @@
855 # cproto $(PFLAGS) -DFEAT_GUI $(*F).c > $@
857 # Always define FEAT_GUI. This may generate a few warnings if it's also
858 -# defined in auto/config.h, you can ignore that.
859 +# defined in config.h, you can ignore that.
861 cproto $(PFLAGS) -DFEAT_GUI $< > proto/$@
862 echo "/* vim: set ft=c : */" >> proto/$@
863 @@ -1517,18 +1517,18 @@
864 echo "/* vim: set ft=c : */" >> proto/$@
867 -# must use os_vms_conf.h for auto/config.h
868 - mv auto/config.h auto/config.h.save
869 - cp os_vms_conf.h auto/config.h
870 +# must use os_vms_conf.h for config.h
871 + mv config.h config.h.save
872 + cp os_vms_conf.h config.h
873 cproto $(PFLAGS) -DVMS -UFEAT_GUI_ATHENA -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
874 echo "/* vim: set ft=c : */" >> proto/$@
876 - mv auto/config.h.save auto/config.h
878 + mv config.h.save config.h
880 # if_perl.pro is special: Use the generated if_perl.c for input and remove
881 # prototypes for local functions.
882 -if_perl.pro: auto/if_perl.c
883 - cproto $(PFLAGS) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@
884 +if_perl.pro: if_perl.c
885 + cproto $(PFLAGS) -DFEAT_GUI if_perl.c | sed "/_VI/d" > proto/$@
889 @@ -1923,8 +1923,8 @@
890 # We support common typing mistakes for Juergen! :-)
891 clean celan: testclean
892 -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) xxd/*.o
893 - -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
894 - -rm -f conftest* *~ auto/link.sed
895 + -rm -f $(TOOLS) osdef.h pathdef.c if_perl.c
896 + -rm -f conftest* *~ link.sed
897 if test -d $(PODIR); then \
898 cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \
900 @@ -1937,11 +1937,11 @@
902 cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../mkinstalldirs .
903 mkdir $(SHADOWDIR)/auto
904 - cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
905 - cd $(SHADOWDIR); rm -f auto/link.sed
906 + cd $(SHADOWDIR)/auto; ln -s ../../configure .
907 + cd $(SHADOWDIR); rm -f link.sed
908 cp Makefile configure $(SHADOWDIR)
909 - rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist
910 - cp config.mk.dist $(SHADOWDIR)/auto/config.mk
911 + rm -f $(SHADOWDIR)/config.mk $(SHADOWDIR)/config.mk.dist
912 + cp config.mk.dist $(SHADOWDIR)/config.mk
913 cp config.mk.dist $(SHADOWDIR)
914 mkdir $(SHADOWDIR)/xxd
915 cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
916 @@ -1967,10 +1967,10 @@
918 # Start configure from scratch
920 - -rm -f auto/config.status auto/config.cache config.log auto/config.log
921 - -rm -f auto/config.h auto/link.log auto/link.sed auto/config.mk
922 - touch auto/config.h
923 - cp config.mk.dist auto/config.mk
924 + -rm -f config.status config.cache config.log config.log
925 + -rm -f config.h link.log link.sed config.mk
927 + cp config.mk.dist config.mk
929 distclean: clean scratch
931 @@ -2018,16 +2018,16 @@
935 -auto/if_perl.c: if_perl.xs
936 +if_perl.c: if_perl.xs
937 $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@
938 $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
939 $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
941 -auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
942 +osdef.h: config.h osdef.sh osdef1.h.in osdef2.h.in
943 CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
945 QUOTESED = sed -e 's/"/\\"/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
946 -auto/pathdef.c: Makefile auto/config.mk
947 +pathdef.c: Makefile config.mk
949 -@echo '/* pathdef.c */' > $@
950 -@echo '/* This file is automatically created by Makefile' >> $@
951 @@ -2141,8 +2141,8 @@
952 objects/if_xcmdsrv.o: if_xcmdsrv.c
953 $(CCC) -o $@ if_xcmdsrv.c
955 -objects/if_perl.o: auto/if_perl.c
956 - $(CCC) -o $@ auto/if_perl.c
957 +objects/if_perl.o: if_perl.c
958 + $(CCC) -o $@ if_perl.c
960 objects/if_perlsfio.o: if_perlsfio.c
961 $(CCC) -o $@ if_perlsfio.c
962 @@ -2210,8 +2210,8 @@
963 objects/os_unix.o: os_unix.c
964 $(CCC) -o $@ os_unix.c
966 -objects/pathdef.o: auto/pathdef.c
967 - $(CCC) -o $@ auto/pathdef.c
968 +objects/pathdef.o: pathdef.c
969 + $(CCC) -o $@ pathdef.c
971 objects/py_config.o: $(PYTHON_CONFDIR)/config.c
972 $(CCC) -o $@ $(PYTHON_CONFDIR)/config.c \
973 @@ -2270,180 +2270,180 @@
974 ###############################################################################
975 ### (automatically generated by 'make depend')
977 -objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h \
978 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
979 +objects/buffer.o: buffer.c vim.h config.h feature.h os_unix.h \
980 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
981 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
982 globals.h farsi.h arabic.h version.h
983 -objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h \
984 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
985 +objects/charset.o: charset.c vim.h config.h feature.h os_unix.h \
986 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
987 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
988 globals.h farsi.h arabic.h
989 -objects/diff.o: diff.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
990 +objects/diff.o: diff.c vim.h config.h feature.h os_unix.h osdef.h \
991 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
992 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
994 -objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h \
995 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
996 +objects/digraph.o: digraph.c vim.h config.h feature.h os_unix.h \
997 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
998 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
999 globals.h farsi.h arabic.h
1000 -objects/edit.o: edit.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1001 +objects/edit.o: edit.c vim.h config.h feature.h os_unix.h osdef.h \
1002 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1003 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1005 -objects/eval.o: eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1006 +objects/eval.o: eval.c vim.h config.h feature.h os_unix.h osdef.h \
1007 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1008 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1010 -objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h \
1011 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1012 +objects/ex_cmds.o: ex_cmds.c vim.h config.h feature.h os_unix.h \
1013 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1014 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1015 globals.h farsi.h arabic.h version.h
1016 -objects/ex_cmds2.o: ex_cmds2.c vim.h auto/config.h feature.h os_unix.h \
1017 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1018 +objects/ex_cmds2.o: ex_cmds2.c vim.h config.h feature.h os_unix.h \
1019 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1020 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1021 globals.h farsi.h arabic.h version.h
1022 -objects/ex_docmd.o: ex_docmd.c vim.h auto/config.h feature.h os_unix.h \
1023 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1024 +objects/ex_docmd.o: ex_docmd.c vim.h config.h feature.h os_unix.h \
1025 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1026 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1027 globals.h farsi.h arabic.h
1028 -objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h \
1029 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1030 +objects/ex_eval.o: ex_eval.c vim.h config.h feature.h os_unix.h \
1031 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1032 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1033 globals.h farsi.h arabic.h
1034 -objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \
1035 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1036 +objects/ex_getln.o: ex_getln.c vim.h config.h feature.h os_unix.h \
1037 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1038 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1039 globals.h farsi.h arabic.h
1040 -objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h \
1041 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1042 +objects/fileio.o: fileio.c vim.h config.h feature.h os_unix.h \
1043 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1044 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1045 globals.h farsi.h arabic.h
1046 -objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1047 +objects/fold.o: fold.c vim.h config.h feature.h os_unix.h osdef.h \
1048 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1049 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1051 -objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h \
1052 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1053 +objects/getchar.o: getchar.c vim.h config.h feature.h os_unix.h \
1054 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1055 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1056 globals.h farsi.h arabic.h
1057 -objects/if_cscope.o: if_cscope.c vim.h auto/config.h feature.h os_unix.h \
1058 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1059 +objects/if_cscope.o: if_cscope.c vim.h config.h feature.h os_unix.h \
1060 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1061 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1062 globals.h farsi.h arabic.h if_cscope.h
1063 -objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h auto/config.h feature.h os_unix.h \
1064 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1065 +objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h config.h feature.h os_unix.h \
1066 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1067 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1068 globals.h farsi.h arabic.h version.h
1069 -objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1070 +objects/main.o: main.c vim.h config.h feature.h os_unix.h osdef.h \
1071 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1072 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1073 arabic.h farsi.c arabic.c
1074 -objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1075 +objects/mark.o: mark.c vim.h config.h feature.h os_unix.h osdef.h \
1076 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1077 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1079 -objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h \
1080 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1081 +objects/memfile.o: memfile.c vim.h config.h feature.h os_unix.h \
1082 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1083 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1084 globals.h farsi.h arabic.h
1085 -objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h \
1086 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1087 +objects/memline.o: memline.c vim.h config.h feature.h os_unix.h \
1088 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1089 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1090 globals.h farsi.h arabic.h
1091 -objects/menu.o: menu.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1092 +objects/menu.o: menu.c vim.h config.h feature.h os_unix.h osdef.h \
1093 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1094 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1096 -objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h \
1097 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1098 +objects/message.o: message.c vim.h config.h feature.h os_unix.h \
1099 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1100 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1101 globals.h farsi.h arabic.h
1102 -objects/misc1.o: misc1.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1103 +objects/misc1.o: misc1.c vim.h config.h feature.h os_unix.h osdef.h \
1104 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1105 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1107 -objects/misc2.o: misc2.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1108 +objects/misc2.o: misc2.c vim.h config.h feature.h os_unix.h osdef.h \
1109 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1110 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1112 -objects/move.o: move.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1113 +objects/move.o: move.c vim.h config.h feature.h os_unix.h osdef.h \
1114 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1115 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1117 -objects/mbyte.o: mbyte.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1118 +objects/mbyte.o: mbyte.c vim.h config.h feature.h os_unix.h osdef.h \
1119 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1120 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1122 -objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h \
1123 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1124 +objects/normal.o: normal.c vim.h config.h feature.h os_unix.h \
1125 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1126 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1127 globals.h farsi.h arabic.h
1128 -objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1129 +objects/ops.o: ops.c vim.h config.h feature.h os_unix.h osdef.h \
1130 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1131 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1133 -objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h \
1134 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1135 +objects/option.o: option.c vim.h config.h feature.h os_unix.h \
1136 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1137 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1138 globals.h farsi.h arabic.h
1139 -objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h \
1140 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1141 +objects/os_unix.o: os_unix.c vim.h config.h feature.h os_unix.h \
1142 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1143 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1144 globals.h farsi.h arabic.h os_unixx.h
1145 -objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \
1146 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1147 +objects/pathdef.o: pathdef.c vim.h config.h feature.h os_unix.h \
1148 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1149 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1150 globals.h farsi.h arabic.h
1151 -objects/quickfix.o: quickfix.c vim.h auto/config.h feature.h os_unix.h \
1152 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1153 +objects/quickfix.o: quickfix.c vim.h config.h feature.h os_unix.h \
1154 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1155 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1156 globals.h farsi.h arabic.h
1157 -objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h \
1158 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1159 +objects/regexp.o: regexp.c vim.h config.h feature.h os_unix.h \
1160 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1161 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1162 globals.h farsi.h arabic.h
1163 -objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h \
1164 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1165 +objects/screen.o: screen.c vim.h config.h feature.h os_unix.h \
1166 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1167 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1168 globals.h farsi.h arabic.h
1169 -objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h \
1170 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1171 +objects/search.o: search.c vim.h config.h feature.h os_unix.h \
1172 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1173 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1174 globals.h farsi.h arabic.h
1175 -objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h \
1176 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1177 +objects/syntax.o: syntax.c vim.h config.h feature.h os_unix.h \
1178 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1179 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1180 globals.h farsi.h arabic.h
1181 -objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1182 +objects/tag.o: tag.c vim.h config.h feature.h os_unix.h osdef.h \
1183 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1184 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1186 -objects/term.o: term.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1187 +objects/term.o: term.c vim.h config.h feature.h os_unix.h osdef.h \
1188 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1189 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1191 -objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1192 +objects/ui.o: ui.c vim.h config.h feature.h os_unix.h osdef.h \
1193 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1194 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1196 -objects/undo.o: undo.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1197 +objects/undo.o: undo.c vim.h config.h feature.h os_unix.h osdef.h \
1198 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1199 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1201 -objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h \
1202 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1203 +objects/version.o: version.c vim.h config.h feature.h os_unix.h \
1204 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1205 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1206 globals.h farsi.h arabic.h version.h
1207 -objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h \
1208 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1209 +objects/window.o: window.c vim.h config.h feature.h os_unix.h \
1210 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1211 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1212 globals.h farsi.h arabic.h
1213 -objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1214 +objects/gui.o: gui.c vim.h config.h feature.h os_unix.h osdef.h \
1215 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1216 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1218 -objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h auto/config.h feature.h \
1219 - os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h structs.h \
1220 +objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h config.h feature.h \
1221 + os_unix.h osdef.h ascii.h keymap.h term.h macros.h structs.h \
1222 regexp.h gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h \
1223 proto.h globals.h farsi.h arabic.h ../pixmaps/alert.xpm \
1224 ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \
1225 @@ -2463,26 +2463,26 @@
1226 ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \
1227 ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \
1228 ../pixmaps/tb_minwidth.xpm ../pixmaps/stock_icons.h
1229 -objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \
1230 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1231 +objects/gui_gtk_f.o: gui_gtk_f.c vim.h config.h feature.h os_unix.h \
1232 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1233 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1234 globals.h farsi.h arabic.h gui_gtk_f.h
1235 -objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \
1236 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1237 +objects/gui_motif.o: gui_motif.c vim.h config.h feature.h os_unix.h \
1238 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1239 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1240 globals.h farsi.h arabic.h ../pixmaps/alert.xpm ../pixmaps/error.xpm \
1241 ../pixmaps/generic.xpm ../pixmaps/info.xpm ../pixmaps/quest.xpm
1242 -objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \
1243 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1244 +objects/gui_athena.o: gui_athena.c vim.h config.h feature.h os_unix.h \
1245 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1246 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1247 globals.h farsi.h arabic.h gui_at_sb.h
1248 -objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \
1249 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1250 +objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h config.h feature.h os_unix.h \
1251 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1252 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1253 globals.h farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \
1254 ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm
1255 -objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h \
1256 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1257 +objects/gui_x11.o: gui_x11.c vim.h config.h feature.h os_unix.h \
1258 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1259 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1260 globals.h farsi.h arabic.h ../runtime/vim32x32.xpm \
1261 ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm ../pixmaps/tb_new.xpm \
1262 @@ -2501,60 +2501,60 @@
1263 ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \
1264 ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \
1265 ../pixmaps/tb_minwidth.xpm
1266 -objects/gui_at_sb.o: gui_at_sb.c vim.h auto/config.h feature.h os_unix.h \
1267 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1268 +objects/gui_at_sb.o: gui_at_sb.c vim.h config.h feature.h os_unix.h \
1269 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1270 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1271 globals.h farsi.h arabic.h gui_at_sb.h
1272 -objects/gui_at_fs.o: gui_at_fs.c vim.h auto/config.h feature.h os_unix.h \
1273 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1274 +objects/gui_at_fs.o: gui_at_fs.c vim.h config.h feature.h os_unix.h \
1275 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1276 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1277 globals.h farsi.h arabic.h gui_at_sb.h
1278 -objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1279 +objects/pty.o: pty.c vim.h config.h feature.h os_unix.h osdef.h \
1280 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1281 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1283 -objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \
1284 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1285 +objects/hangulin.o: hangulin.c vim.h config.h feature.h os_unix.h \
1286 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1287 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1288 globals.h farsi.h arabic.h
1289 -objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \
1290 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1291 +objects/if_perl.o: if_perl.c vim.h config.h feature.h os_unix.h \
1292 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1293 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1294 globals.h farsi.h arabic.h
1295 -objects/if_perlsfio.o: if_perlsfio.c vim.h auto/config.h feature.h os_unix.h \
1296 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1297 +objects/if_perlsfio.o: if_perlsfio.c vim.h config.h feature.h os_unix.h \
1298 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1299 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1300 globals.h farsi.h arabic.h
1301 -objects/if_python.o: if_python.c vim.h auto/config.h feature.h os_unix.h \
1302 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1303 +objects/if_python.o: if_python.c vim.h config.h feature.h os_unix.h \
1304 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1305 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1306 globals.h farsi.h arabic.h
1307 -objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h \
1308 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1309 +objects/if_tcl.o: if_tcl.c vim.h config.h feature.h os_unix.h \
1310 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1311 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1312 globals.h farsi.h arabic.h
1313 -objects/if_ruby.o: if_ruby.c vim.h auto/config.h feature.h os_unix.h \
1314 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1315 +objects/if_ruby.o: if_ruby.c vim.h config.h feature.h os_unix.h \
1316 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1317 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1318 globals.h farsi.h arabic.h version.h
1319 -objects/if_sniff.o: if_sniff.c vim.h auto/config.h feature.h os_unix.h \
1320 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1321 +objects/if_sniff.o: if_sniff.c vim.h config.h feature.h os_unix.h \
1322 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1323 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1324 globals.h farsi.h arabic.h os_unixx.h
1325 -objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \
1326 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1327 +objects/gui_beval.o: gui_beval.c vim.h config.h feature.h os_unix.h \
1328 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1329 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1330 globals.h farsi.h arabic.h
1331 -objects/workshop.o: workshop.c auto/config.h integration.h vim.h feature.h \
1332 - os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h structs.h \
1333 +objects/workshop.o: workshop.c config.h integration.h vim.h feature.h \
1334 + os_unix.h osdef.h ascii.h keymap.h term.h macros.h structs.h \
1335 regexp.h gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h \
1336 proto.h globals.h farsi.h arabic.h version.h workshop.h
1337 objects/wsdebug.o: wsdebug.c
1338 -objects/integration.o: integration.c vim.h auto/config.h feature.h os_unix.h \
1339 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1340 +objects/integration.o: integration.c vim.h config.h feature.h os_unix.h \
1341 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1342 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1343 globals.h farsi.h arabic.h integration.h
1344 -objects/netbeans.o: netbeans.c vim.h auto/config.h feature.h os_unix.h \
1345 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1346 +objects/netbeans.o: netbeans.c vim.h config.h feature.h os_unix.h \
1347 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
1348 gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
1349 globals.h farsi.h arabic.h version.h
1350 --- src/link.sh~configure
1356 -# If auto/link.sed already exists, use it. We assume a previous run of
1357 +# If link.sed already exists, use it. We assume a previous run of
1358 # link.sh has found the correct set of libraries.
1360 -if test -f auto/link.sed; then
1361 - echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now."
1362 - echo "link.sh: If linking fails, try deleting the auto/link.sed file."
1363 - echo "link.sh: If this fails too, try creating an empty auto/link.sed file."
1364 +if test -f link.sed; then
1365 + echo "link.sh: The file 'link.sed' exists, which is going to be used now."
1366 + echo "link.sh: If linking fails, try deleting the link.sed file."
1367 + echo "link.sh: If this fails too, try creating an empty link.sed file."
1370 # If linking works with the full link command, try removing some libraries,
1371 # that are known not to be needed on at least one system.
1372 -# Remove auto/pathdef.c if there is a new link command and compile it again.
1373 +# Remove pathdef.c if there is a new link command and compile it again.
1374 # There is a loop to remove libraries that appear several times.
1380 if sh link.cmd; then
1381 - touch auto/link.sed
1383 cp link.cmd linkit.sh
1384 for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x pthread thread readline m perl crypt attr; do
1387 if grep "l$libname " linkit.sh >/dev/null; then
1388 if test ! -f link1.sed; then
1389 echo "link.sh: OK, linking works, let's try removing a few libraries."
1390 - echo "link.sh: See auto/link.log for details."
1391 - rm -f auto/link.log
1392 + echo "link.sh: See link.log for details."
1395 echo "s/-l$libname *//" >link1.sed
1396 - sed -f auto/link.sed <link.cmd >linkit2.sh
1397 + sed -f link.sed <link.cmd >linkit2.sh
1398 sed -f link1.sed <linkit2.sh >linkit.sh
1400 if test $libname != "m" || grep "lm " linkit.sh >/dev/null; then
1401 echo "link.sh: Trying to remove the $libname library..."
1402 - cat linkit.sh >>auto/link.log
1403 + cat linkit.sh >>link.log
1404 # Redirect this link output, it may contain error messages which
1405 # should be ignored.
1406 - if sh linkit.sh >>auto/link.log 2>&1; then
1407 + if sh linkit.sh >>link.log 2>&1; then
1408 echo "link.sh: We don't need the $libname library!"
1409 - cat link1.sed >>auto/link.sed
1410 - rm -f auto/pathdef.c
1411 + cat link1.sed >>link.sed
1414 echo "link.sh: We DO need the $libname library."
1420 - if test ! -f auto/pathdef.c; then
1421 + if test ! -f pathdef.c; then
1422 $MAKE objects/pathdef.o
1424 if test ! -f link1.sed; then
1427 # Now do the real linking.
1429 -if test -s auto/link.sed; then
1430 - echo "link.sh: Using auto/link.sed file to remove a few libraries"
1431 - sed -f auto/link.sed <link.cmd >linkit.sh
1432 +if test -s link.sed; then
1433 + echo "link.sh: Using link.sed file to remove a few libraries"
1434 + sed -f link.sed <link.cmd >linkit.sh
1436 if sh linkit.sh; then
1438 echo "link.sh: Linked fine with a few libraries removed"
1441 - echo "link.sh: Linking failed, making auto/link.sed empty and trying again"
1442 - mv -f auto/link.sed link2.sed
1443 - touch auto/link.sed
1444 - rm -f auto/pathdef.c
1445 + echo "link.sh: Linking failed, making link.sed empty and trying again"
1446 + mv -f link.sed link2.sed
1449 $MAKE objects/pathdef.o
1452 -if test -f auto/link.sed -a ! -s auto/link.sed -a ! -f link3.sed; then
1453 +if test -f link.sed -a ! -s link.sed -a ! -f link3.sed; then
1454 echo "link.sh: Using unmodified link command"
1456 if sh link.cmd; then
1460 if test -f link2.sed; then
1461 - echo "link.sh: Linking doesn't work at all, removing auto/link.sed"
1462 - rm -f auto/link.sed
1463 + echo "link.sh: Linking doesn't work at all, removing link.sed"
1468 --- src/osdef.sh~configure
1471 cat << EOF > osdef0.c
1472 #define select select_declared_wrong
1473 #define tgetstr tgetstr_declared_wrong
1474 -#include "auto/config.h"
1475 +#include "config.h"
1476 #include "os_unix.h" /* bring in most header files, more follow below */
1477 #include "os_unixx.h" /* bring in header files for os_unix.c */
1482 cat osdef0.ccc | sed -n -f osdef11.sed >> osdef2.sed
1483 -sed -f osdef2.sed < $srcdir/osdef1.h.in > auto/osdef.h
1484 +sed -f osdef2.sed < $srcdir/osdef1.h.in > osdef.h
1486 cat osdef0.ccc | sed -n -f osdef21.sed > osdef2.sed
1487 -sed -f osdef2.sed < $srcdir/osdef2.h.in >> auto/osdef.h
1488 +sed -f osdef2.sed < $srcdir/osdef2.h.in >> osdef.h
1490 rm osdef0.c osdef0.cc osdef0.ccc osdef11.sed osdef21.sed osdef2.sed
1495 cat $srcdir/osdef1.h.in $srcdir/osdef2.h.in >osdefX.h.in
1496 -if eval test "`diff auto/osdef.h osdefX.h.in | wc -l`" -eq 4; then
1497 +if eval test "`diff osdef.h osdefX.h.in | wc -l`" -eq 4; then
1498 echo " Hmm, sed is very pessimistic about your system header files."
1499 echo " But it did not dump core -- strange! Let's continue carefully..."
1500 echo " If this fails, you may want to remove offending lines from osdef.h"
1501 --- src/pathdef.sh~configure
1506 -# pathdef.sh: adjust pathdef.c for auto/link.sed, if it exists
1507 +# pathdef.sh: adjust pathdef.c for link.sed, if it exists
1509 -if test -s auto/link.sed; then
1510 - cp auto/pathdef.c auto/pathdef.tmp
1511 - sed -f auto/link.sed <auto/pathdef.tmp >auto/pathdef.c
1512 - rm -f auto/pathdef.tmp
1513 +if test -s link.sed; then
1514 + cp pathdef.c auto/pathdef.tmp
1515 + sed -f link.sed <auto/pathdef.tmp >auto/pathdef.c
1520 --- src/proto/if_perl.pro~configure
1521 +++ src/proto/if_perl.pro
1523 -/* auto/if_perl.c */
1525 int perl_enabled __ARGS((int verbose));
1526 void perl_end __ARGS((void));
1527 void msg_split __ARGS((char_u *s, int attr));
1528 --- src/vim.h~configure
1531 /* ============ the header file puzzle (ca. 50-100 pieces) ========= */
1533 #ifdef HAVE_CONFIG_H /* GNU autoconf (or something else) was here */
1534 -# include "auto/config.h"
1535 +# include "config.h"
1536 # define HAVE_PATHDEF
1540 * test program. Other items from configure may also be wrong then!
1542 # if (SIZEOF_INT == 0)
1543 - Error: configure did not run properly. Check auto/config.log.
1544 + Error: configure did not run properly. Check config.log.
1551 #if defined(UNIX) && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */
1552 -# include "auto/osdef.h" /* bring missing declarations in */
1553 +# include "osdef.h" /* bring missing declarations in */
1557 --- src/workshop.c~configure
1562 #ifdef HAVE_CONFIG_H
1563 -# include "auto/config.h"
1564 +# include "config.h"