3 # Patch managed by http://www.holgerschurig.de/patcher.html
10 +dnl Get the cflags and libraries from the gtk-config script
13 +dnl define an autoconf function to check for a specified version of GTK, and
14 +dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16.
16 +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
17 +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
19 +AC_DEFUN(AM_PATH_GTK,
21 + if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
23 + min_gtk_version=ifelse([$1], ,0.99.7,$1)
24 + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
26 + if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
27 + && $PKG_CONFIG --exists gtk+-2.0; then
29 + dnl We should be using PKG_CHECK_MODULES() instead of this hack.
30 + dnl But I guess the dependency on pkgconfig.m4 is not wanted or
31 + dnl something like that.
32 + GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
33 + GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
34 + gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
35 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
36 + gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
37 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
38 + gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
39 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
41 + elif test "X$GTK_CONFIG" != "Xno"; then
43 + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
44 + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
45 + gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
46 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
47 + gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
48 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
49 + gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
50 + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
56 + if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then
58 + ac_save_CFLAGS="$CFLAGS"
59 + ac_save_LIBS="$LIBS"
60 + CFLAGS="$CFLAGS $GTK_CFLAGS"
61 + LIBS="$LIBS $GTK_LIBS"
64 + dnl Now check if the installed GTK is sufficiently new. (Also sanity
65 + dnl checks the results of gtk-config to some extent
75 +int major, minor, micro;
78 +system ("touch conf.gtktest");
80 +/* HP/UX 9 (%@#!) writes to sscanf strings */
81 +tmp_version = g_strdup("$min_gtk_version");
82 +if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
83 + printf("%s, bad version string\n", "$min_gtk_version");
87 +if ((gtk_major_version > major) ||
88 + ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
89 + ((gtk_major_version == major) && (gtk_minor_version == minor) &&
90 + (gtk_micro_version >= micro)))
96 +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
97 + CFLAGS="$ac_save_CFLAGS"
98 + LIBS="$ac_save_LIBS"
101 + if test "x$no_gtk" = x ; then
102 + if test "x$enable_gtktest" = "xyes"; then
103 + AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
105 + AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
107 + ifelse([$2], , :, [$2])
113 + ifelse([$3], , :, [$3])
120 + ifelse([$3], , :, [$3])
122 + AC_SUBST(GTK_CFLAGS)
127 +dnl ---------------------------------------------------------------------------
129 +dnl ---------------------------------------------------------------------------
130 +AC_DEFUN([GNOME_INIT_HOOK],
132 + AC_SUBST(GNOME_LIBS)
133 + AC_SUBST(GNOME_LIBDIR)
134 + AC_SUBST(GNOME_INCLUDEDIR)
136 + AC_ARG_WITH(gnome-includes,
137 + [ --with-gnome-includes=DIR Specify location of GNOME headers],
138 + [CFLAGS="$CFLAGS -I$withval"]
141 + AC_ARG_WITH(gnome-libs,
142 + [ --with-gnome-libs=DIR Specify location of GNOME libs],
143 + [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval]
147 + [ --with-gnome Specify prefix for GNOME files],
148 + if test x$withval = xyes; then
150 + ifelse([$1], [], :, [$1])
152 + if test "x$withval" = xno; then
156 + LDFLAGS="$LDFLAGS -L$withval/lib"
157 + CFLAGS="$CFLAGS -I$withval/include"
158 + gnome_prefix=$withval/lib
163 + if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
165 + AC_MSG_CHECKING(for libgnomeui-2.0)
166 + if $PKG_CONFIG --exists libgnomeui-2.0; then
168 + GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
169 + GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
170 + GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
173 + AC_MSG_RESULT(not found)
174 + if test "x$2" = xfail; then
175 + AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config)
179 + elif test "x$want_gnome" = xyes; then
181 + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
182 + if test "$GNOME_CONFIG" = "no"; then
183 + no_gnome_config="yes"
185 + AC_MSG_CHECKING(if $GNOME_CONFIG works)
186 + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
188 + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
189 + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
190 + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
194 + no_gnome_config="yes"
198 + if test x$exec_prefix = xNONE; then
199 + if test x$prefix = xNONE; then
200 + gnome_prefix=$ac_default_prefix/lib
202 + gnome_prefix=$prefix/lib
205 + gnome_prefix=`eval echo \`echo $libdir\``
208 + if test "$no_gnome_config" = "yes"; then
209 + AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
210 + if test -f $gnome_prefix/gnomeConf.sh; then
211 + AC_MSG_RESULT(found)
212 + echo "loading gnome configuration from" \
213 + "$gnome_prefix/gnomeConf.sh"
214 + . $gnome_prefix/gnomeConf.sh
217 + AC_MSG_RESULT(not found)
218 + if test x$2 = xfail; then
219 + AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
227 +AC_DEFUN([GNOME_INIT],[
228 + GNOME_INIT_HOOK([],fail)
233 --- src/configure.in~configure.in
236 dnl Should also work with autoconf 2.54 and later.
239 -AC_CONFIG_HEADER(auto/config.h:config.h.in)
240 +AC_CONFIG_HEADER(config.h:config.h.in)
242 dnl Being able to run configure means the system is Unix (compatible).
246 dnl If configure thinks we are cross compiling, there is probably something
247 dnl wrong with the CC or CFLAGS settings, give an understandable error message
248 -if test "$cross_compiling" = yes; then
249 - AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS
250 - (cross compiling doesn't work)])
252 +dnl if test "$cross_compiling" = yes; then
253 +dnl AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS
254 +dnl (cross compiling doesn't work)])
257 dnl gcc-cpp has the wonderful -MM option to produce nicer dependencies.
258 dnl But gcc 3.1 changed the meaning! See near the end.
260 compiledby=""; AC_MSG_RESULT(no))
263 +dnl on FreeBSD tclsh is a silly script, look for tclsh8.0 or tclsh8.2
264 +AC_MSG_CHECKING(--with-x argument)
265 +AC_ARG_WITH(x, [ --with-x= use X],
267 +if test X"$withval" = Xno; then
271 +AC_MSG_RESULT($withval),
274 AC_MSG_CHECKING(--disable-xsmp argument)
276 [ --disable-xsmp Disable XSMP session management],
278 LDFLAGS="$perlldflags $LDFLAGS"
281 - PERL_SRC="auto/if_perl.c if_perlsfio.c"
282 + PERL_SRC="if_perl.c if_perlsfio.c"
283 PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o"
284 PERL_PRO="if_perl.pro if_perlsfio.pro"
286 @@ -1176,229 +1187,6 @@
291 -dnl Get the cflags and libraries from the gtk-config script
294 -dnl define an autoconf function to check for a specified version of GTK, and
295 -dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16.
297 -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
298 -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
300 -AC_DEFUN(AM_PATH_GTK,
302 - if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
304 - min_gtk_version=ifelse([$1], ,0.99.7,$1)
305 - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
307 - if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
308 - && $PKG_CONFIG --exists gtk+-2.0; then
310 - dnl We should be using PKG_CHECK_MODULES() instead of this hack.
311 - dnl But I guess the dependency on pkgconfig.m4 is not wanted or
312 - dnl something like that.
313 - GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
314 - GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
315 - gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
316 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
317 - gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
318 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
319 - gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
320 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
322 - elif test "X$GTK_CONFIG" != "Xno"; then
324 - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
325 - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
326 - gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
327 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
328 - gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
329 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
330 - gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
331 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
337 - if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then
339 - ac_save_CFLAGS="$CFLAGS"
340 - ac_save_LIBS="$LIBS"
341 - CFLAGS="$CFLAGS $GTK_CFLAGS"
342 - LIBS="$LIBS $GTK_LIBS"
345 - dnl Now check if the installed GTK is sufficiently new. (Also sanity
346 - dnl checks the results of gtk-config to some extent
350 -#include <gtk/gtk.h>
356 -int major, minor, micro;
359 -system ("touch conf.gtktest");
361 -/* HP/UX 9 (%@#!) writes to sscanf strings */
362 -tmp_version = g_strdup("$min_gtk_version");
363 -if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
364 - printf("%s, bad version string\n", "$min_gtk_version");
368 -if ((gtk_major_version > major) ||
369 - ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
370 - ((gtk_major_version == major) && (gtk_minor_version == minor) &&
371 - (gtk_micro_version >= micro)))
377 -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
378 - CFLAGS="$ac_save_CFLAGS"
379 - LIBS="$ac_save_LIBS"
382 - if test "x$no_gtk" = x ; then
383 - if test "x$enable_gtktest" = "xyes"; then
384 - AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
386 - AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version)
388 - ifelse([$2], , :, [$2])
394 - ifelse([$3], , :, [$3])
401 - ifelse([$3], , :, [$3])
403 - AC_SUBST(GTK_CFLAGS)
408 -dnl ---------------------------------------------------------------------------
410 -dnl ---------------------------------------------------------------------------
411 -AC_DEFUN([GNOME_INIT_HOOK],
413 - AC_SUBST(GNOME_LIBS)
414 - AC_SUBST(GNOME_LIBDIR)
415 - AC_SUBST(GNOME_INCLUDEDIR)
417 - AC_ARG_WITH(gnome-includes,
418 - [ --with-gnome-includes=DIR Specify location of GNOME headers],
419 - [CFLAGS="$CFLAGS -I$withval"]
422 - AC_ARG_WITH(gnome-libs,
423 - [ --with-gnome-libs=DIR Specify location of GNOME libs],
424 - [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval]
428 - [ --with-gnome Specify prefix for GNOME files],
429 - if test x$withval = xyes; then
431 - ifelse([$1], [], :, [$1])
433 - if test "x$withval" = xno; then
437 - LDFLAGS="$LDFLAGS -L$withval/lib"
438 - CFLAGS="$CFLAGS -I$withval/include"
439 - gnome_prefix=$withval/lib
444 - if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
446 - AC_MSG_CHECKING(for libgnomeui-2.0)
447 - if $PKG_CONFIG --exists libgnomeui-2.0; then
449 - GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
450 - GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
451 - GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
454 - AC_MSG_RESULT(not found)
455 - if test "x$2" = xfail; then
456 - AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config)
460 - elif test "x$want_gnome" = xyes; then
462 - AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
463 - if test "$GNOME_CONFIG" = "no"; then
464 - no_gnome_config="yes"
466 - AC_MSG_CHECKING(if $GNOME_CONFIG works)
467 - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
469 - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
470 - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
471 - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
475 - no_gnome_config="yes"
479 - if test x$exec_prefix = xNONE; then
480 - if test x$prefix = xNONE; then
481 - gnome_prefix=$ac_default_prefix/lib
483 - gnome_prefix=$prefix/lib
486 - gnome_prefix=`eval echo \`echo $libdir\``
489 - if test "$no_gnome_config" = "yes"; then
490 - AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
491 - if test -f $gnome_prefix/gnomeConf.sh; then
492 - AC_MSG_RESULT(found)
493 - echo "loading gnome configuration from" \
494 - "$gnome_prefix/gnomeConf.sh"
495 - . $gnome_prefix/gnomeConf.sh
498 - AC_MSG_RESULT(not found)
499 - if test x$2 = xfail; then
500 - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
508 -AC_DEFUN([GNOME_INIT],[
509 - GNOME_INIT_HOOK([],fail)
513 dnl ---------------------------------------------------------------------------
514 dnl Check for GTK. First checks for gtk-config, cause it needs that to get the
515 dnl correct compiler flags. Then checks for GTK 1.1.16. If that fails, then
516 @@ -1801,7 +1589,7 @@
517 AC_TRY_RUN([#include <ctype.h>
518 main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }],
519 AC_DEFINE(BROKEN_TOUPPER) AC_MSG_RESULT(bad),
520 - AC_MSG_RESULT(good), AC_MSG_ERROR(failed to compile test program))
521 + AC_MSG_RESULT(good), AC_MSG_WARN(failed to compile test program))
523 AC_MSG_CHECKING(whether __DATE__ and __TIME__ work)
524 AC_TRY_COMPILE(, [printf("(" __DATE__ " " __TIME__ ")");],
525 @@ -1973,7 +1761,7 @@
526 # include <termcap.h>
528 main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }],
529 - res="OK", res="FAIL", res="FAIL")
530 + res="OK", res="FAIL", res="OK")
531 if test "$res" = "OK"; then
534 @@ -1992,7 +1780,8 @@
535 {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }],
536 AC_MSG_RESULT([no -- we are in termcap land]),
537 AC_MSG_RESULT([yes -- terminfo spoken here]); AC_DEFINE(TERMINFO),
538 - AC_MSG_ERROR(failed to compile test program.))
539 + AC_MSG_WARN(crosscompiling - defaulting to terminfo)
540 + AC_DEFINE(TERMINFO))
542 AC_MSG_RESULT(none found)
544 @@ -2007,7 +1796,8 @@
545 {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }],
546 AC_MSG_RESULT(zero); AC_DEFINE(TGETENT_ZERO_ERR, 0),
547 AC_MSG_RESULT(non-zero),
548 - AC_MSG_ERROR(failed to compile test program.))
549 + AC_MSG_WARN(crosscompiling - defaulting to zero)
550 + AC_DEFINE(TGETENT_ZERO_ERR))
553 AC_MSG_CHECKING(whether termcap.h contains ospeed)
554 @@ -2158,7 +1948,7 @@
557 AC_MSG_RESULT([can't determine - assume ptys are world accessable]),
558 - AC_MSG_ERROR(failed to compile test program))
559 + AC_MSG_WARN(failed to compile test program))
562 dnl Checks for library functions. ===================================
563 @@ -2201,7 +1991,7 @@
564 AC_MSG_RESULT(it is usable),
565 AC_MSG_RESULT(it stinks)
566 AC_DEFINE(BAD_GETCWD),
567 - AC_MSG_ERROR(failed to compile test program))
568 + AC_MSG_WARN(failed to compile test program))
570 dnl Check for functions in one big call, to reduce the size of configure
571 AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
572 @@ -2224,13 +2014,20 @@
573 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ST_BLKSIZE),
576 -AC_MSG_CHECKING(whether stat() ignores a trailing slash)
577 +AC_CACHE_CHECK([whether stat() ignores a trailing slash],
578 + [ac_cv_func_stat_ignores_trailing_slash],
580 [#include <sys/types.h>
581 #include <sys/stat.h>
582 main() {struct stat st; exit(stat("configure/", &st) != 0); }],
583 - AC_MSG_RESULT(yes); AC_DEFINE(STAT_IGNORES_SLASH),
584 - AC_MSG_RESULT(no), AC_MSG_ERROR(failed to compile test program))
585 + ac_cv_func_stat_ignores_trailing_slash=yes,
586 + ac_cv_func_stat_ignores_trailing_slash=no,
587 + ac_cv_func_stat_ignores_trailing_slash=no
590 +if X"$ac_cv_func_stat_ignores_trailing_slash" = Xyes; then
591 + AC_DEFINE(STAT_IGNORES_SLASH)
594 dnl Link with iconv for charset translation, if not found without library.
595 dnl check for iconv() requires including iconv.h
596 @@ -2369,7 +2166,7 @@
598 AC_DEFINE(HAVE_VSNPRINTF) AC_MSG_RESULT(yes),
600 - AC_MSG_ERROR(failed to compile test program))
601 + AC_MSG_WARN(failed to compile test program))
604 dnl rename needs to be checked separately to work on Nextstep with cc
605 @@ -2461,9 +2258,9 @@
606 AC_DEFINE(USEBCOPY) AC_MSG_RESULT(bcopy does),
607 AC_TRY_RUN([#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog],
608 AC_DEFINE(USEMEMCPY) AC_MSG_RESULT(memcpy does), AC_MSG_RESULT(no),
609 - AC_MSG_ERROR(failed to compile test program)),
610 - AC_MSG_ERROR(failed to compile test program)),
611 - AC_MSG_ERROR(failed to compile test program))
612 + AC_MSG_WARN(failed to compile test program)),
613 + AC_MSG_WARN(failed to compile test program)),
614 + AC_MSG_WARN(failed to compile test program))
616 dnl Check for multibyte locale functions
617 dnl Find out if _Xsetlocale() is supported by libX11.
618 @@ -2672,6 +2469,6 @@
621 dnl write output files
622 -AC_OUTPUT(auto/config.mk:config.mk.in)
623 +AC_OUTPUT(config.mk:config.mk.in)
625 dnl vim: set sw=2 tw=78 fo+=l:
627 --- src/proto/if_perl.pro~ifperl.pro
628 +++ src/proto/if_perl.pro
630 -/* auto/if_perl.c */
632 extern int perl_enabled __ARGS((int verbose));
633 extern void perl_end __ARGS((void));
634 extern void msg_split __ARGS((char_u *s, int attr));
636 --- src/link.sh~link.sh
642 -# If auto/link.sed already exists, use it. We assume a previous run of
643 +# If link.sed already exists, use it. We assume a previous run of
644 # link.sh has found the correct set of libraries.
646 -if test -f auto/link.sed; then
647 - echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now."
648 - echo "link.sh: If linking fails, try deleting the auto/link.sed file."
649 - echo "link.sh: If this fails too, try creating an empty auto/link.sed file."
650 +if test -f link.sed; then
651 + echo "link.sh: The file 'link.sed' exists, which is going to be used now."
652 + echo "link.sh: If linking fails, try deleting the link.sed file."
653 + echo "link.sh: If this fails too, try creating an empty link.sed file."
656 # If linking works with the full link command, try removing some libraries,
657 # that are known not to be needed on at least one system.
658 -# Remove auto/pathdef.c if there is a new link command and compile it again.
659 +# Remove pathdef.c if there is a new link command and compile it again.
660 # There is a loop to remove libraries that appear several times.
667 - touch auto/link.sed
669 cp link.cmd linkit.sh
670 for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do
673 if grep "l$libname " linkit.sh >/dev/null; then
674 if test ! -f link1.sed; then
675 echo "link.sh: OK, linking works, let's try removing a few libraries."
676 - echo "link.sh: See auto/link.log for details."
677 - rm -f auto/link.log
678 + echo "link.sh: See link.log for details."
681 echo "s/-l$libname *//" >link1.sed
682 - sed -f auto/link.sed <link.cmd >linkit2.sh
683 + sed -f link.sed <link.cmd >linkit2.sh
684 sed -f link1.sed <linkit2.sh >linkit.sh
686 if test $libname != "m" || grep "lm " linkit.sh >/dev/null; then
687 echo "link.sh: Trying to remove the $libname library..."
688 - cat linkit.sh >>auto/link.log
689 + cat linkit.sh >>link.log
690 # Redirect this link output, it may contain error messages which
692 - if sh linkit.sh >>auto/link.log 2>&1; then
693 + if sh linkit.sh >>link.log 2>&1; then
694 echo "link.sh: We don't need the $libname library!"
695 - cat link1.sed >>auto/link.sed
696 - rm -f auto/pathdef.c
697 + cat link1.sed >>link.sed
700 echo "link.sh: We DO need the $libname library."
706 - if test ! -f auto/pathdef.c; then
707 + if test ! -f pathdef.c; then
708 $MAKE objects/pathdef.o
710 if test ! -f link1.sed; then
713 # Now do the real linking.
715 -if test -s auto/link.sed; then
716 - echo "link.sh: Using auto/link.sed file to remove a few libraries"
717 - sed -f auto/link.sed <link.cmd >linkit.sh
718 +if test -s link.sed; then
719 + echo "link.sh: Using link.sed file to remove a few libraries"
720 + sed -f link.sed <link.cmd >linkit.sh
722 if sh linkit.sh; then
724 echo "link.sh: Linked fine with a few libraries removed"
727 - echo "link.sh: Linking failed, making auto/link.sed empty and trying again"
728 - mv -f auto/link.sed link2.sed
729 - touch auto/link.sed
730 - rm -f auto/pathdef.c
731 + echo "link.sh: Linking failed, making link.sed empty and trying again"
732 + mv -f link.sed link2.sed
735 $MAKE objects/pathdef.o
738 -if test -f auto/link.sed -a ! -s auto/link.sed -a ! -f link3.sed; then
739 +if test -f link.sed -a ! -s link.sed -a ! -f link3.sed; then
740 echo "link.sh: Using unmodified link command"
746 if test -f link2.sed; then
747 - echo "link.sh: Linking doesn't work at all, removing auto/link.sed"
748 - rm -f auto/link.sed
749 + echo "link.sh: Linking doesn't work at all, removing link.sed"
755 --- src/Makefile~Makefile
758 # this in two steps with:
761 -# The configuration phase creates/overwrites auto/config.h and
763 +# The configuration phase creates/overwrites config.h and
765 # The configure script is created with "make autoconf". It can detect
766 # different features of your system and act accordingly. However, it is
767 # not correct for all systems. Check this:
771 # - If you do not trust the automatic configuration code, then inspect
772 -# auto/config.h and auto/config.mk, before starting the actual build
773 -# phase. If possible edit this Makefile, rather than auto/config.mk --
774 +# config.h and config.mk, before starting the actual build
775 +# phase. If possible edit this Makefile, rather than config.mk --
776 # especially look at the definition of VIMLOC below. Note that the
777 -# configure phase overwrites auto/config.mk and auto/config.h again.
778 +# configure phase overwrites config.mk and config.h again.
779 # - If you get error messages, find out what is wrong and try to correct
780 # it in this Makefile. You may need to do "make reconfig" when you
781 # change anything that configure uses (e.g. switching from an old C
782 -# compiler to an ANSI C compiler). Only when auto/configure does
783 +# compiler to an ANSI C compiler). Only when configure does
784 # something wrong you may need to change one of the other files. If
785 # you find a clean way to fix the problem, consider sending a note to
786 # the author of autoconf (bug-gnu-utils@prep.ai.mit.edu) or Vim
788 # If the new Vim seems to be working OK you can install it and the
789 # documentation in the appropriate location. The default is
790 # "/usr/local". Change "prefix" below to change the location.
791 -# "auto/pathdef.c" will be compiled again after changing this to make
792 +# "pathdef.c" will be compiled again after changing this to make
793 # the executable know where the help files are located.
794 # Note that any existing executable is removed or overwritten. If you
795 # want to keep it you will have to make a backup copy first.
797 # (I) SINIX-N 5.42 and 5.43 need some EXTRA_LIBS. Also for Reliant-Unix.
798 # (J) If you get undefined symbols, see below for a solution.
799 # (K) See lines to uncomment below for machines with 64 bit pointers.
800 -# (L) For Silicon Graphics O2 workstations remove "-lnsl" from auto/config.mk
801 +# (L) For Silicon Graphics O2 workstations remove "-lnsl" from config.mk
802 # (M) gcc version cygnus-2.0.1 does NOT work (symptom: "dl" deletes two
803 # characters instead of one).
804 # (N) SCO with decmouse.
806 # detection, since the configure script runs into an error when it
807 # detects Python (probably because of the bash shell).
808 # (V) See lines to uncomment below.
809 -# (X) Need to use the .include "auto/config.mk" line below
810 +# (X) Need to use the .include "config.mk" line below
811 # (Y) See line with c89 below
812 # (Z) See lines with cc or c89 below
813 # (a) See line with EXTRA_LIBS below.
814 @@ -271,20 +271,20 @@
815 #GUI_LIB_LOC = -L/usr/X11R6/lib
818 -######################## auto/config.mk ######################## {{{1
819 -# At this position auto/config.mk is included. When starting from the
820 -# distribution it is almost empty. After running auto/configure it contains
821 +######################## config.mk ######################## {{{1
822 +# At this position config.mk is included. When starting from the
823 +# distribution it is almost empty. After running configure it contains
824 # settings that have been discovered for your system. Settings below this
825 -# include override settings in auto/config.mk!
826 +# include override settings in config.mk!
828 -# Note: if auto/config.mk is lost somehow (e.g., because configure was
829 -# interrupted), create an empty auto/config.mk file and do "make config".
830 +# Note: if config.mk is lost somehow (e.g., because configure was
831 +# interrupted), create an empty config.mk file and do "make config".
833 -# (X) How to include auto/config.mk depends on the version of "make" you have,
834 +# (X) How to include config.mk depends on the version of "make" you have,
835 # if the current choice doesn't work, try the other one.
837 -include auto/config.mk
838 -#.include "auto/config.mk"
840 +#.include "config.mk"
845 # Uncomment this when you want to include the Perl interface.
846 # The Perl option sometimes causes problems, because it adds extra flags
847 # to the command line. If you see strange flags during compilation, check in
848 -# auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting
849 +# config.mk where they come from. If it's PERL_CFLAGS, try commenting
851 # When you get an error for a missing "perl.exp" file, try creating an emtpy
852 # one: "touch perl.exp".
853 @@ -662,12 +662,12 @@
854 # 1. If you don't have an X server: Comment out CONF_OPT_GUI and uncomment
855 # CONF_OPT_X = --without-x.
857 -# 3. edit auto/config.mk and remove -ldir and -ltermcap from LIBS. It doesn't
858 +# 3. edit config.mk and remove -ldir and -ltermcap from LIBS. It doesn't
859 # have -ldir (does config find it somewhere?) and -ltermcap has at
860 # least one problem so I use termlib.o instead. The problem with
861 # termcap is that it segfaults if you call it with the name of
862 # a non-existent terminal type.
863 -# 4. edit auto/config.h and add #define USE_TMPNAM
864 +# 4. edit config.h and add #define USE_TMPNAM
865 # 5. add termlib.o to OBJ
869 #GUI_LIB_LOC = -L/usr/lib64
872 -# 2) edit auto/config.mk and delete the -lelf entry in the LIBS line
873 +# 2) edit config.mk and delete the -lelf entry in the LIBS line
876 # or (for 32bit pointers) uncomment the following line
878 #GUI_LIB_LOC = -L/usr/lib32
881 -# 2) edit auto/config.mk, add -n32 to LDFLAGS
882 +# 2) edit config.mk, add -n32 to LDFLAGS
886 @@ -1299,7 +1299,7 @@
895 @@ -1318,7 +1318,7 @@
897 TAGS_SRC = *.c *.cpp if_perl.xs
899 -EXTRA_SRC = hangulin.c auto/if_perl.c if_perlsfio.c if_python.c if_tcl.c \
900 +EXTRA_SRC = hangulin.c if_perl.c if_perlsfio.c if_python.c if_tcl.c \
901 if_ruby.c if_sniff.c gui_beval.c \
902 workshop.c wsdebug.c integration.c netbeans.c
904 @@ -1449,14 +1449,14 @@
906 # Run configure with all the setting from above.
908 -# Note: auto/config.h doesn't depend on configure, because running configure
909 -# doesn't always update auto/config.h. The timestamp isn't changed if the
910 +# Note: config.h doesn't depend on configure, because running configure
911 +# doesn't always update config.h. The timestamp isn't changed if the
912 # file contents didn't change (to avoid recompiling everything). Including a
913 -# dependency on auto/config.h would cause running configure each time when
914 -# auto/config.h isn't updated. The dependency on auto/config.mk should make
915 +# dependency on config.h would cause running configure each time when
916 +# config.h isn't updated. The dependency on config.mk should make
917 # sure configure is run when it's needed.
919 -config auto/config.mk: auto/configure config.mk.in config.h.in
920 +config config.mk: configure config.mk.in config.h.in
921 GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
922 CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
923 LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
924 @@ -1471,31 +1471,31 @@
926 # Use "make reconfig" to rerun configure without cached values.
927 # When config.h changes, most things will be recompiled automatically.
928 -# Use "myself" to make "all" with a possibly changed auto/config.mk.
929 +# Use "myself" to make "all" with a possibly changed config.mk.
930 reconfig: scratch clean config myself
932 -# Run autoconf to produce auto/configure.
933 +# Run autoconf to produce configure.
935 # - DO NOT RUN autoconf MANUALLY! It will overwrite ./configure instead of
936 -# producing auto/configure.
937 +# producing configure.
938 # - autoconf is not run automatically, because a patch usually changes both
939 -# configure.in and auto/configure but can't update the timestamps. People
940 +# configure.in and configure but can't update the timestamps. People
941 # who do not have (the correct version of) autoconf would run into trouble.
943 # Two tricks are required to make autoconf put its output in the "auto" dir:
944 # - Temporarily move the ./configure script to ./configure.save. Don't
945 # overwrite it, it's probably the result of an aborted autoconf.
946 -# - Use sed to change ./config.log to auto/config.log in the configure script.
947 +# - Use sed to change ./config.log to config.log in the configure script.
949 if test ! -f configure.save; then mv configure configure.save; fi
951 - sed -e 's+\./config.log+auto/config.log+' configure > auto/configure
952 - chmod 755 auto/configure
953 + sed -e 's+\./config.log+config.log+' configure > configure
954 + chmod 755 configure
955 mv -f configure.save configure
956 - -rm -f auto/config.status auto/config.cache
957 + -rm -f config.status config.cache
959 -# Re-execute this Makefile to include the new auto/config.mk produced by
960 -# configure Only used when typing "make" with a fresh auto/config.mk.
961 +# Re-execute this Makefile to include the new config.mk produced by
962 +# configure Only used when typing "make" with a fresh config.mk.
964 $(MAKE) -f Makefile all
966 @@ -1506,7 +1506,7 @@
968 # Link the target for normal use or debugging.
969 # A shell script is used to try linking without unneccesary libraries.
970 -$(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
971 +$(VIMTARGET): config.mk objects $(OBJ) version.c version.h
972 $(CCC) version.c -o objects/version.o
973 @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
974 -o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
975 @@ -1544,7 +1544,7 @@
976 # cproto $(PFLAGS) -DFEAT_GUI $(*F).c > $@
978 # Always define FEAT_GUI. This may generate a few warnings if it's also
979 -# defined in auto/config.h, you can ignore that.
980 +# defined in config.h, you can ignore that.
982 cproto $(PFLAGS) -DFEAT_GUI $< > proto/$@
983 echo "/* vim: set ft=c : */" >> proto/$@
984 @@ -1574,18 +1574,18 @@
985 echo "/* vim: set ft=c : */" >> proto/$@
988 -# must use os_vms_conf.h for auto/config.h
989 - mv auto/config.h auto/config.h.save
990 - cp os_vms_conf.h auto/config.h
991 +# must use os_vms_conf.h for config.h
992 + mv config.h config.h.save
993 + cp os_vms_conf.h config.h
994 cproto $(PFLAGS) -DVMS -UFEAT_GUI_ATHENA -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
995 echo "/* vim: set ft=c : */" >> proto/$@
997 - mv auto/config.h.save auto/config.h
999 + mv config.h.save config.h
1001 # if_perl.pro is special: Use the generated if_perl.c for input and remove
1002 # prototypes for local functions.
1003 -if_perl.pro: auto/if_perl.c
1004 - cproto $(PFLAGS) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@
1005 +if_perl.pro: if_perl.c
1006 + cproto $(PFLAGS) -DFEAT_GUI if_perl.c | sed "/_VI/d" > proto/$@
1010 @@ -1991,8 +1991,8 @@
1011 # We support common typing mistakes for Juergen! :-)
1012 clean celan: testclean
1013 -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) xxd/*.o
1014 - -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
1015 - -rm -f conftest* *~ auto/link.sed
1016 + -rm -f $(TOOLS) osdef.h pathdef.c if_perl.c
1017 + -rm -f conftest* *~ link.sed
1018 if test -d $(PODIR); then \
1019 cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \
1021 @@ -2005,11 +2005,11 @@
1023 cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../mkinstalldirs .
1024 mkdir $(SHADOWDIR)/auto
1025 - cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
1026 - cd $(SHADOWDIR); rm -f auto/link.sed
1027 + cd $(SHADOWDIR)/auto; ln -s ../../configure .
1028 + cd $(SHADOWDIR); rm -f link.sed
1029 cp Makefile configure $(SHADOWDIR)
1030 - rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist
1031 - cp config.mk.dist $(SHADOWDIR)/auto/config.mk
1032 + rm -f $(SHADOWDIR)/config.mk $(SHADOWDIR)/config.mk.dist
1033 + cp config.mk.dist $(SHADOWDIR)/config.mk
1034 cp config.mk.dist $(SHADOWDIR)
1035 mkdir $(SHADOWDIR)/xxd
1036 cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
1037 @@ -2035,10 +2035,10 @@
1039 # Start configure from scratch
1041 - -rm -f auto/config.status auto/config.cache config.log auto/config.log
1042 - -rm -f auto/config.h auto/link.log auto/link.sed auto/config.mk
1043 - touch auto/config.h
1044 - cp config.mk.dist auto/config.mk
1045 + -rm -f config.status config.cache config.log config.log
1046 + -rm -f config.h link.log link.sed config.mk
1048 + cp config.mk.dist config.mk
1050 distclean: clean scratch
1052 @@ -2087,16 +2087,16 @@
1056 -auto/if_perl.c: if_perl.xs
1057 +if_perl.c: if_perl.xs
1058 $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@
1059 $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
1060 $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
1062 -auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
1063 +osdef.h: config.h osdef.sh osdef1.h.in osdef2.h.in
1064 CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
1066 QUOTESED = sed -e 's/"/\\"/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
1067 -auto/pathdef.c: Makefile auto/config.mk
1068 +pathdef.c: Makefile config.mk
1070 -@echo '/* pathdef.c */' > $@
1071 -@echo '/* This file is automatically created by Makefile' >> $@
1072 @@ -2213,8 +2213,8 @@
1073 objects/if_xcmdsrv.o: if_xcmdsrv.c
1074 $(CCC) -o $@ if_xcmdsrv.c
1076 -objects/if_perl.o: auto/if_perl.c
1077 - $(CCC) -o $@ auto/if_perl.c
1078 +objects/if_perl.o: if_perl.c
1079 + $(CCC) -o $@ if_perl.c
1081 objects/if_perlsfio.o: if_perlsfio.c
1082 $(CCC) -o $@ if_perlsfio.c
1083 @@ -2285,8 +2285,8 @@
1084 objects/os_unix.o: os_unix.c
1085 $(CCC) -o $@ os_unix.c
1087 -objects/pathdef.o: auto/pathdef.c
1088 - $(CCC) -o $@ auto/pathdef.c
1089 +objects/pathdef.o: pathdef.c
1090 + $(CCC) -o $@ pathdef.c
1092 objects/py_config.o: $(PYTHON_CONFDIR)/config.c
1093 $(CCC) -o $@ $(PYTHON_CONFDIR)/config.c \
1094 @@ -2421,201 +2421,201 @@
1095 ###############################################################################
1096 ### (automatically generated by 'make depend')
1098 -objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1099 +objects/buffer.o: buffer.c vim.h config.h feature.h os_unix.h osdef.h \
1100 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1101 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1103 -objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1104 +objects/charset.o: charset.c vim.h config.h feature.h os_unix.h osdef.h \
1105 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1106 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1108 -objects/diff.o: diff.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1109 +objects/diff.o: diff.c vim.h config.h feature.h os_unix.h osdef.h \
1110 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1111 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1113 -objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1114 +objects/digraph.o: digraph.c vim.h config.h feature.h os_unix.h osdef.h \
1115 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1116 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1118 -objects/edit.o: edit.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1119 +objects/edit.o: edit.c vim.h config.h feature.h os_unix.h osdef.h \
1120 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1121 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1123 -objects/eval.o: eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1124 +objects/eval.o: eval.c vim.h config.h feature.h os_unix.h osdef.h \
1125 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1126 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1128 -objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1129 +objects/ex_cmds.o: ex_cmds.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/ex_cmds2.o: ex_cmds2.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 gui.h \
1135 +objects/ex_cmds2.o: ex_cmds2.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 gui.h \
1137 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1138 farsi.h arabic.h version.h
1139 -objects/ex_docmd.o: ex_docmd.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 gui.h \
1141 +objects/ex_docmd.o: ex_docmd.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 gui.h \
1143 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1145 -objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1146 +objects/ex_eval.o: ex_eval.c vim.h config.h feature.h os_unix.h osdef.h \
1147 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1148 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1150 -objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \
1151 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1152 +objects/ex_getln.o: ex_getln.c vim.h config.h feature.h os_unix.h \
1153 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1154 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1156 -objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1157 +objects/fileio.o: fileio.c vim.h config.h feature.h os_unix.h osdef.h \
1158 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1159 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1161 -objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1162 +objects/fold.o: fold.c vim.h config.h feature.h os_unix.h osdef.h \
1163 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1164 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1166 -objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1167 +objects/getchar.o: getchar.c vim.h config.h feature.h os_unix.h osdef.h \
1168 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1169 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1171 -objects/if_cscope.o: if_cscope.c vim.h auto/config.h feature.h os_unix.h \
1172 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1173 +objects/if_cscope.o: if_cscope.c vim.h config.h feature.h os_unix.h \
1174 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1175 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1176 farsi.h arabic.h if_cscope.h
1177 -objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h auto/config.h feature.h os_unix.h \
1178 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1179 +objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h config.h feature.h os_unix.h \
1180 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1181 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1182 farsi.h arabic.h version.h
1183 -objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1184 +objects/main.o: main.c vim.h config.h feature.h os_unix.h osdef.h \
1185 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1186 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1187 arabic.h farsi.c arabic.c
1188 -objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1189 +objects/mark.o: mark.c vim.h config.h feature.h os_unix.h osdef.h \
1190 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1191 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1193 -objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1194 +objects/memfile.o: memfile.c vim.h config.h feature.h os_unix.h osdef.h \
1195 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1196 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1198 -objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1199 +objects/memline.o: memline.c vim.h config.h feature.h os_unix.h osdef.h \
1200 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1201 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1203 -objects/menu.o: menu.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1204 +objects/menu.o: menu.c vim.h config.h feature.h os_unix.h osdef.h \
1205 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1206 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1208 -objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1209 +objects/message.o: message.c vim.h config.h feature.h os_unix.h osdef.h \
1210 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1211 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1213 -objects/misc1.o: misc1.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1214 +objects/misc1.o: misc1.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/misc2.o: misc2.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1219 +objects/misc2.o: misc2.c vim.h config.h feature.h os_unix.h osdef.h \
1220 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1221 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1223 -objects/move.o: move.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1224 +objects/move.o: move.c vim.h config.h feature.h os_unix.h osdef.h \
1225 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1226 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1228 -objects/mbyte.o: mbyte.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1229 +objects/mbyte.o: mbyte.c vim.h config.h feature.h os_unix.h osdef.h \
1230 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1231 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1233 -objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1234 +objects/normal.o: normal.c vim.h config.h feature.h os_unix.h osdef.h \
1235 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1236 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1238 -objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
1239 +objects/ops.o: ops.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \
1240 keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1241 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1243 -objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1244 +objects/option.o: option.c vim.h config.h feature.h os_unix.h osdef.h \
1245 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1246 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1248 -objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1249 +objects/os_unix.o: os_unix.c vim.h config.h feature.h os_unix.h osdef.h \
1250 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1251 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1253 -objects/pathdef.o: auto/pathdef.c ./vim.h ./auto/config.h ./feature.h ./os_unix.h \
1254 - ./auto/osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./structs.h \
1255 +objects/pathdef.o: pathdef.c ./vim.h ./config.h ./feature.h ./os_unix.h \
1256 + ./osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./structs.h \
1257 ./regexp.h ./gui.h ./gui_beval.h proto/gui_beval.pro ./option.h \
1258 ./ex_cmds.h ./proto.h ./globals.h ./farsi.h ./arabic.h
1259 -objects/quickfix.o: quickfix.c vim.h auto/config.h feature.h os_unix.h \
1260 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1261 +objects/quickfix.o: quickfix.c vim.h config.h feature.h os_unix.h \
1262 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1263 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1265 -objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1266 +objects/regexp.o: regexp.c vim.h config.h feature.h os_unix.h osdef.h \
1267 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1268 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1270 -objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1271 +objects/screen.o: screen.c vim.h config.h feature.h os_unix.h osdef.h \
1272 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1273 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1275 -objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1276 +objects/search.o: search.c vim.h config.h feature.h os_unix.h osdef.h \
1277 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1278 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1280 -objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1281 +objects/syntax.o: syntax.c vim.h config.h feature.h os_unix.h osdef.h \
1282 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1283 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1285 -objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
1286 +objects/tag.o: tag.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \
1287 keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1288 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1290 -objects/term.o: term.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1291 +objects/term.o: term.c vim.h config.h feature.h os_unix.h osdef.h \
1292 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1293 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1295 -objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
1296 +objects/ui.o: ui.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \
1297 keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1298 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1300 -objects/undo.o: undo.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1301 +objects/undo.o: undo.c vim.h config.h feature.h os_unix.h osdef.h \
1302 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1303 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1305 -objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1306 +objects/version.o: version.c vim.h config.h feature.h os_unix.h osdef.h \
1307 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1308 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1310 -objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1311 +objects/window.o: window.c vim.h config.h feature.h os_unix.h osdef.h \
1312 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1313 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1315 -objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
1316 +objects/gui.o: gui.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \
1317 keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1318 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1320 -objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h auto/config.h feature.h os_unix.h \
1321 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1322 +objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h config.h feature.h os_unix.h \
1323 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1324 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1325 farsi.h arabic.h ../pixmaps/stock_icons.h
1326 -objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \
1327 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1328 +objects/gui_gtk_f.o: gui_gtk_f.c vim.h config.h feature.h os_unix.h \
1329 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1330 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1331 farsi.h arabic.h gui_gtk_f.h
1332 -objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \
1333 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1334 +objects/gui_motif.o: gui_motif.c vim.h config.h feature.h os_unix.h \
1335 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1336 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1337 farsi.h arabic.h ../pixmaps/alert.xpm ../pixmaps/error.xpm \
1338 ../pixmaps/generic.xpm ../pixmaps/info.xpm ../pixmaps/quest.xpm
1339 -objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \
1340 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1341 +objects/gui_athena.o: gui_athena.c vim.h config.h feature.h os_unix.h \
1342 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1343 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1344 farsi.h arabic.h gui_at_sb.h
1345 -objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \
1346 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1347 +objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h config.h feature.h os_unix.h \
1348 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1349 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1350 farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \
1351 ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm
1352 -objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1353 +objects/gui_x11.o: gui_x11.c vim.h config.h feature.h os_unix.h osdef.h \
1354 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1355 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1356 arabic.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \
1357 @@ -2634,60 +2634,60 @@
1358 ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \
1359 ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \
1360 ../pixmaps/tb_minwidth.xpm
1361 -objects/gui_at_sb.o: gui_at_sb.c vim.h auto/config.h feature.h os_unix.h \
1362 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1363 +objects/gui_at_sb.o: gui_at_sb.c vim.h config.h feature.h os_unix.h \
1364 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1365 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1366 farsi.h arabic.h gui_at_sb.h
1367 -objects/gui_at_fs.o: gui_at_fs.c vim.h auto/config.h feature.h os_unix.h \
1368 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1369 +objects/gui_at_fs.o: gui_at_fs.c vim.h config.h feature.h os_unix.h \
1370 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1371 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1372 farsi.h arabic.h gui_at_sb.h
1373 -objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
1374 +objects/pty.o: pty.c vim.h config.h feature.h os_unix.h osdef.h ascii.h \
1375 keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1376 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1378 -objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \
1379 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1380 +objects/hangulin.o: hangulin.c vim.h config.h feature.h os_unix.h \
1381 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1382 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1384 -objects/if_perl.o: auto/if_perl.c ./vim.h ./auto/config.h ./feature.h ./os_unix.h \
1385 - ./auto/osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./structs.h \
1386 +objects/if_perl.o: if_perl.c ./vim.h ./config.h ./feature.h ./os_unix.h \
1387 + ./osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./structs.h \
1388 ./regexp.h ./gui.h ./gui_beval.h proto/gui_beval.pro ./option.h \
1389 ./ex_cmds.h ./proto.h ./globals.h ./farsi.h ./arabic.h
1390 -objects/if_perlsfio.o: if_perlsfio.c vim.h auto/config.h feature.h os_unix.h \
1391 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1392 +objects/if_perlsfio.o: if_perlsfio.c vim.h config.h feature.h os_unix.h \
1393 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1394 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1396 -objects/if_python.o: if_python.c vim.h auto/config.h feature.h os_unix.h \
1397 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1398 +objects/if_python.o: if_python.c vim.h config.h feature.h os_unix.h \
1399 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1400 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1402 -objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1403 +objects/if_tcl.o: if_tcl.c vim.h config.h feature.h os_unix.h osdef.h \
1404 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1405 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1407 -objects/if_ruby.o: if_ruby.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
1408 +objects/if_ruby.o: if_ruby.c vim.h config.h feature.h os_unix.h osdef.h \
1409 ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
1410 proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
1412 -objects/if_sniff.o: if_sniff.c vim.h auto/config.h feature.h os_unix.h \
1413 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1414 +objects/if_sniff.o: if_sniff.c vim.h config.h feature.h os_unix.h \
1415 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1416 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1417 farsi.h arabic.h os_unixx.h
1418 -objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \
1419 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1420 +objects/gui_beval.o: gui_beval.c vim.h config.h feature.h os_unix.h \
1421 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1422 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1424 -objects/workshop.o: workshop.c auto/config.h integration.h vim.h feature.h \
1425 - os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h structs.h \
1426 +objects/workshop.o: workshop.c config.h integration.h vim.h feature.h \
1427 + os_unix.h osdef.h ascii.h keymap.h term.h macros.h structs.h \
1428 regexp.h gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h \
1429 proto.h globals.h farsi.h arabic.h version.h workshop.h
1430 objects/wsdebug.o: wsdebug.c
1431 -objects/integration.o: integration.c vim.h auto/config.h feature.h os_unix.h \
1432 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1433 +objects/integration.o: integration.c vim.h config.h feature.h os_unix.h \
1434 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1435 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1436 farsi.h arabic.h integration.h
1437 -objects/netbeans.o: netbeans.c vim.h auto/config.h feature.h os_unix.h \
1438 - auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1439 +objects/netbeans.o: netbeans.c vim.h config.h feature.h os_unix.h \
1440 + osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
1441 gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
1442 farsi.h arabic.h version.h
1444 --- src/osdef.sh~osdef.sh
1447 # define select select_declared_wrong
1449 #define tgetstr tgetstr_declared_wrong
1450 -#include "auto/config.h"
1451 +#include "config.h"
1452 #include "os_unix.h" /* bring in most header files, more follow below */
1453 #include "os_unixx.h" /* bring in header files for os_unix.c */
1458 cat osdef0.ccc | sed -n -f osdef11.sed >> osdef2.sed
1459 -sed -f osdef2.sed < $srcdir/osdef1.h.in > auto/osdef.h
1460 +sed -f osdef2.sed < $srcdir/osdef1.h.in > osdef.h
1462 cat osdef0.ccc | sed -n -f osdef21.sed > osdef2.sed
1463 -sed -f osdef2.sed < $srcdir/osdef2.h.in >> auto/osdef.h
1464 +sed -f osdef2.sed < $srcdir/osdef2.h.in >> osdef.h
1466 rm osdef0.c osdef0.cc osdef0.ccc osdef11.sed osdef21.sed osdef2.sed
1471 cat $srcdir/osdef1.h.in $srcdir/osdef2.h.in >osdefX.h.in
1472 -if eval test "`diff auto/osdef.h osdefX.h.in | wc -l`" -eq 4; then
1473 +if eval test "`diff osdef.h osdefX.h.in | wc -l`" -eq 4; then
1474 echo " Hmm, sed is very pessimistic about your system header files."
1475 echo " But it did not dump core -- strange! Let's continue carefully..."
1476 echo " If this fails, you may want to remove offending lines from osdef.h"
1478 --- src/pathdef.sh~pathdef.sh
1483 -# pathdef.sh: adjust pathdef.c for auto/link.sed, if it exists
1484 +# pathdef.sh: adjust pathdef.c for link.sed, if it exists
1486 -if test -s auto/link.sed; then
1487 - cp auto/pathdef.c auto/pathdef.tmp
1488 - sed -f auto/link.sed <auto/pathdef.tmp >auto/pathdef.c
1489 - rm -f auto/pathdef.tmp
1490 +if test -s link.sed; then
1491 + cp pathdef.c auto/pathdef.tmp
1492 + sed -f link.sed <auto/pathdef.tmp >auto/pathdef.c
1501 /* ============ the header file puzzle (ca. 50-100 pieces) ========= */
1503 #ifdef HAVE_CONFIG_H /* GNU autoconf (or something else) was here */
1504 -# include "auto/config.h"
1505 +# include "config.h"
1506 # define HAVE_PATHDEF
1510 * test program. Other items from configure may also be wrong then!
1512 # if (SIZEOF_INT == 0)
1513 - Error: configure did not run properly. Check auto/config.log.
1514 + Error: configure did not run properly. Check config.log.
1521 #if defined(UNIX) && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */
1522 -# include "auto/osdef.h" /* bring missing declarations in */
1523 +# include "osdef.h" /* bring missing declarations in */
1528 --- src/workshop.c~workshop.c
1533 #ifdef HAVE_CONFIG_H
1534 -# include "auto/config.h"
1535 +# include "config.h"