diff options
| -rw-r--r-- | recipes/vim/gvim_7.0.bb | 15 | ||||
| -rw-r--r-- | recipes/vim/gvim_7.2.bb | 13 | ||||
| -rw-r--r-- | recipes/vim/vim-6.2/configure.patch | 1567 | ||||
| -rw-r--r-- | recipes/vim/vim-6.4/configure.patch | 1538 | ||||
| -rw-r--r-- | recipes/vim/vim-7.0/configure.patch | 1601 | ||||
| -rw-r--r-- | recipes/vim/vim-7.2/001-394.diff | 50853 | ||||
| -rw-r--r-- | recipes/vim/vim-tiny_6.2.bb | 12 | ||||
| -rw-r--r-- | recipes/vim/vim-tiny_6.4.bb | 9 | ||||
| -rw-r--r-- | recipes/vim/vim-tiny_7.0.bb | 9 | ||||
| -rw-r--r-- | recipes/vim/vim-tiny_7.2.bb | 5 | ||||
| -rw-r--r-- | recipes/vim/vim.inc | 58 | ||||
| -rw-r--r-- | recipes/vim/vim_6.2.bb | 29 | ||||
| -rw-r--r-- | recipes/vim/vim_6.4.bb | 11 | ||||
| -rw-r--r-- | recipes/vim/vim_7.0.bb | 10 | ||||
| -rw-r--r-- | recipes/vim/vim_7.2.bb | 27 |
15 files changed, 50941 insertions, 4816 deletions
diff --git a/recipes/vim/gvim_7.0.bb b/recipes/vim/gvim_7.0.bb deleted file mode 100644 index 60aa04127e..0000000000 --- a/recipes/vim/gvim_7.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -VIMVER = "70" - -require vim.inc - -DEPENDS += "gtk+ xt" -PR = "${INC_PR}.1" -FILESPATHPKG =. "vim-${PV}:vim:" - -EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \ - --disable-xim --with-features=big \ - --disable-gpm --with-x --disable-netbeans \ - --with-tlib=ncurses" - -#might needs RREPLACES as well -RCONFLICTS_${PN} = "vim" diff --git a/recipes/vim/gvim_7.2.bb b/recipes/vim/gvim_7.2.bb new file mode 100644 index 0000000000..da7a3be39a --- /dev/null +++ b/recipes/vim/gvim_7.2.bb @@ -0,0 +1,13 @@ +VIMGUI = "gtk2" +VIMX = "--with-x" + +require vim_${PV}.bb + +DEPENDS += "gtk+ xt" + +PR = "${INC_PR}.0" + +EXTRA_OECONF += "--enable-gtk2-test" + +#might needs RREPLACES as well +RCONFLICTS_${PN} = "vim vim-tiny" diff --git a/recipes/vim/vim-6.2/configure.patch b/recipes/vim/vim-6.2/configure.patch deleted file mode 100644 index 9402386107..0000000000 --- a/recipes/vim/vim-6.2/configure.patch +++ /dev/null @@ -1,1567 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- src/configure.in~configure -+++ src/configure.in -@@ -4,7 +4,7 @@ - dnl Should also work with autoconf 2.54 and later. - - AC_INIT(vim.h) --AC_CONFIG_HEADER(auto/config.h:config.h.in) -+AC_CONFIG_HEADER(config.h:config.h.in) - - dnl Being able to run configure means the system is Unix (compatible). - AC_DEFINE(UNIX) -@@ -42,10 +42,10 @@ - - dnl If configure thinks we are cross compiling, there is probably something - dnl wrong with the CC or CFLAGS settings, give an understandable error message --if test "$cross_compiling" = yes; then -- AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS -- (cross compiling doesn't work)]) --fi -+dnl if test "$cross_compiling" = yes; then -+dnl AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS -+dnl (cross compiling doesn't work)]) -+dnl fi - - dnl gcc-cpp has the wonderful -MM option to produce nicer dependencies - test "$GCC" = yes && CPP_MM=M; AC_SUBST(CPP_MM) -@@ -225,6 +225,17 @@ - compiledby=""; AC_MSG_RESULT(no)) - AC_SUBST(compiledby) - -+dnl on FreeBSD tclsh is a silly script, look for tclsh8.0 or tclsh8.2 -+AC_MSG_CHECKING(--with-x argument) -+AC_ARG_WITH(x, [ --with-x= use X], -+[ -+if test X"$withval" = Xno; then -+ no_x=yes -+fi -+], -+AC_MSG_RESULT($withval), -+AC_MSG_RESULT(yes)) -+ - AC_MSG_CHECKING(--disable-xsmp argument) - AC_ARG_ENABLE(xsmp, - [ --disable-xsmp Disable XSMP session management], -@@ -283,7 +294,7 @@ - if test "X$perlldflags" != "X"; then - LDFLAGS="$perlldflags $LDFLAGS" - fi -- PERL_SRC="auto/if_perl.c if_perlsfio.c" -+ PERL_SRC="if_perl.c if_perlsfio.c" - PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o" - PERL_PRO="if_perl.pro if_perlsfio.pro" - AC_DEFINE(FEAT_PERL) -@@ -818,7 +829,7 @@ - - AC_MSG_CHECKING(--enable-gui argument) - AC_ARG_ENABLE(gui, -- [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon]], , enable_gui="auto") -+ [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon]], , enable_gui="auto") - - ## Canonicalize the --enable-gui= argument so that it can be easily compared. - ## Do not use character classes for portability with old tools. -@@ -972,229 +983,6 @@ - fi - - --dnl --dnl Get the cflags and libraries from the gtk-config script --dnl -- --dnl define an autoconf function to check for a specified version of GTK, and --dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16. --dnl --dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) --dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS --dnl --AC_DEFUN(AM_PATH_GTK, --[ -- if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then -- { -- min_gtk_version=ifelse([$1], ,0.99.7,$1) -- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -- no_gtk="" -- if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ -- && $PKG_CONFIG --exists gtk+-2.0; then -- { -- dnl We should be using PKG_CHECK_MODULES() instead of this hack. -- dnl But I guess the dependency on pkgconfig.m4 is not wanted or -- dnl something like that. -- GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -- GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -- gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- } -- elif test "X$GTK_CONFIG" != "Xno"; then -- { -- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -- gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- } -- else -- no_gtk=yes -- fi -- -- if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then -- { -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GTK_CFLAGS" -- LIBS="$LIBS $GTK_LIBS" -- -- dnl -- dnl Now check if the installed GTK is sufficiently new. (Also sanity -- dnl checks the results of gtk-config to some extent -- dnl -- rm -f conf.gtktest -- AC_TRY_RUN([ --#include <gtk/gtk.h> --#include <stdio.h> -- --int --main () --{ --int major, minor, micro; --char *tmp_version; -- --system ("touch conf.gtktest"); -- --/* HP/UX 9 (%@#!) writes to sscanf strings */ --tmp_version = g_strdup("$min_gtk_version"); --if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_gtk_version"); -- exit(1); -- } -- --if ((gtk_major_version > major) || -- ((gtk_major_version == major) && (gtk_minor_version > minor)) || -- ((gtk_major_version == major) && (gtk_minor_version == minor) && -- (gtk_micro_version >= micro))) --{ -- return 0; --} --return 1; --} --],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- } -- fi -- if test "x$no_gtk" = x ; then -- if test "x$enable_gtktest" = "xyes"; then -- AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) -- else -- AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) -- fi -- ifelse([$2], , :, [$2]) -- else -- { -- AC_MSG_RESULT(no) -- GTK_CFLAGS="" -- GTK_LIBS="" -- ifelse([$3], , :, [$3]) -- } -- fi -- } -- else -- GTK_CFLAGS="" -- GTK_LIBS="" -- ifelse([$3], , :, [$3]) -- fi -- AC_SUBST(GTK_CFLAGS) -- AC_SUBST(GTK_LIBS) -- rm -f conf.gtktest --]) -- --dnl --------------------------------------------------------------------------- --dnl gnome --dnl --------------------------------------------------------------------------- --AC_DEFUN([GNOME_INIT_HOOK], --[ -- AC_SUBST(GNOME_LIBS) -- AC_SUBST(GNOME_LIBDIR) -- AC_SUBST(GNOME_INCLUDEDIR) -- -- AC_ARG_WITH(gnome-includes, -- [ --with-gnome-includes=DIR Specify location of GNOME headers], -- [CFLAGS="$CFLAGS -I$withval"] -- ) -- -- AC_ARG_WITH(gnome-libs, -- [ --with-gnome-libs=DIR Specify location of GNOME libs], -- [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval] -- ) -- -- AC_ARG_WITH(gnome, -- [ --with-gnome Specify prefix for GNOME files], -- if test x$withval = xyes; then -- want_gnome=yes -- ifelse([$1], [], :, [$1]) -- else -- if test "x$withval" = xno; then -- want_gnome=no -- else -- want_gnome=yes -- LDFLAGS="$LDFLAGS -L$withval/lib" -- CFLAGS="$CFLAGS -I$withval/include" -- gnome_prefix=$withval/lib -- fi -- fi, -- want_gnome=yes) -- -- if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then -- { -- AC_MSG_CHECKING(for libgnomeui-2.0) -- if $PKG_CONFIG --exists libgnomeui-2.0; then -- AC_MSG_RESULT(yes) -- GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` -- GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` -- GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` -- $1 -- else -- AC_MSG_RESULT(not found) -- if test "x$2" = xfail; then -- AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config) -- fi -- fi -- } -- elif test "x$want_gnome" = xyes; then -- { -- AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) -- if test "$GNOME_CONFIG" = "no"; then -- no_gnome_config="yes" -- else -- AC_MSG_CHECKING(if $GNOME_CONFIG works) -- if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then -- AC_MSG_RESULT(yes) -- GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`" -- GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" -- GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" -- $1 -- else -- AC_MSG_RESULT(no) -- no_gnome_config="yes" -- fi -- fi -- -- if test x$exec_prefix = xNONE; then -- if test x$prefix = xNONE; then -- gnome_prefix=$ac_default_prefix/lib -- else -- gnome_prefix=$prefix/lib -- fi -- else -- gnome_prefix=`eval echo \`echo $libdir\`` -- fi -- -- if test "$no_gnome_config" = "yes"; then -- AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) -- if test -f $gnome_prefix/gnomeConf.sh; then -- AC_MSG_RESULT(found) -- echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -- $1 -- else -- AC_MSG_RESULT(not found) -- if test x$2 = xfail; then -- AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) -- fi -- fi -- fi -- } -- fi --]) -- --AC_DEFUN([GNOME_INIT],[ -- GNOME_INIT_HOOK([],fail) --]) -- -- - dnl --------------------------------------------------------------------------- - dnl Check for GTK. First checks for gtk-config, cause it needs that to get the - dnl correct compiler flags. Then checks for GTK 1.1.16. If that fails, then -@@ -1586,7 +1374,7 @@ - AC_TRY_RUN([#include <ctype.h> - main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }], - AC_DEFINE(BROKEN_TOUPPER) AC_MSG_RESULT(bad), -- AC_MSG_RESULT(good), AC_MSG_ERROR(failed to compile test program)) -+ AC_MSG_RESULT(good), AC_MSG_WARN(failed to compile test program)) - - AC_MSG_CHECKING(whether __DATE__ and __TIME__ work) - AC_TRY_COMPILE(, [printf("(" __DATE__ " " __TIME__ ")");], -@@ -1753,7 +1541,7 @@ - # include <termcap.h> - #endif - main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }], -- res="OK", res="FAIL", res="FAIL") -+ res="OK", res="FAIL", res="OK") - if test "$res" = "OK"; then - break - fi -@@ -1772,7 +1560,8 @@ - {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }], - AC_MSG_RESULT([no -- we are in termcap land]), - AC_MSG_RESULT([yes -- terminfo spoken here]); AC_DEFINE(TERMINFO), -- AC_MSG_ERROR(failed to compile test program.)) -+ AC_MSG_WARN(crosscompiling - defaulting to terminfo) -+ AC_DEFINE(TERMINFO)) - else - AC_MSG_RESULT(none found) - fi -@@ -1787,7 +1576,8 @@ - {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }], - AC_MSG_RESULT(zero); AC_DEFINE(TGETENT_ZERO_ERR, 0), - AC_MSG_RESULT(non-zero), -- AC_MSG_ERROR(failed to compile test program.)) -+ AC_MSG_WARN(crosscompiling - defaulting to zero) -+ AC_DEFINE(TGETENT_ZERO_ERR)) - fi - - AC_MSG_CHECKING(whether termcap.h contains ospeed) -@@ -1938,7 +1728,7 @@ - fi - ], - AC_MSG_RESULT([can't determine - assume ptys are world accessable]), -- AC_MSG_ERROR(failed to compile test program)) -+ AC_MSG_WARN(failed to compile test program)) - rm -f conftest_grp - - dnl Checks for library functions. =================================== -@@ -1981,7 +1771,7 @@ - AC_MSG_RESULT(it is usable), - AC_MSG_RESULT(it stinks) - AC_DEFINE(BAD_GETCWD), -- AC_MSG_ERROR(failed to compile test program)) -+ AC_MSG_WARN(failed to compile test program)) - - dnl Check for functions in one big call, to reduce the size of configure - AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \ -@@ -2004,13 +1794,20 @@ - AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ST_BLKSIZE), - AC_MSG_RESULT(no)) - --AC_MSG_CHECKING(whether stat() ignores a trailing slash) -+AC_CACHE_CHECK([whether stat() ignores a trailing slash], -+ [ac_cv_func_stat_ignores_trailing_slash], - AC_TRY_RUN( - [#include <sys/types.h> - #include <sys/stat.h> - main() {struct stat st; exit(stat("configure/", &st) != 0); }], -- AC_MSG_RESULT(yes); AC_DEFINE(STAT_IGNORES_SLASH), -- AC_MSG_RESULT(no), AC_MSG_ERROR(failed to compile test program)) -+ ac_cv_func_stat_ignores_trailing_slash=yes, -+ ac_cv_func_stat_ignores_trailing_slash=no, -+ ac_cv_func_stat_ignores_trailing_slash=no -+)) -+ -+if X"$ac_cv_func_stat_ignores_trailing_slash" = Xyes; then -+ AC_DEFINE(STAT_IGNORES_SLASH) -+fi - - dnl Link with iconv for charset translation, if not found without library. - dnl check for iconv() requires including iconv.h -@@ -2149,7 +1946,7 @@ - ], - AC_DEFINE(HAVE_VSNPRINTF) AC_MSG_RESULT(yes), - AC_MSG_RESULT(no), -- AC_MSG_ERROR(failed to compile test program)) -+ AC_MSG_WARN(failed to compile test program)) - - - dnl rename needs to be checked separately to work on Nextstep with cc -@@ -2241,9 +2038,9 @@ - AC_DEFINE(USEBCOPY) AC_MSG_RESULT(bcopy does), - AC_TRY_RUN([#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog], - AC_DEFINE(USEMEMCPY) AC_MSG_RESULT(memcpy does), AC_MSG_RESULT(no), -- AC_MSG_ERROR(failed to compile test program)), -- AC_MSG_ERROR(failed to compile test program)), -- AC_MSG_ERROR(failed to compile test program)) -+ AC_MSG_WARN(failed to compile test program)), -+ AC_MSG_WARN(failed to compile test program)), -+ AC_MSG_WARN(failed to compile test program)) - - dnl Check for multibyte locale functions - dnl Find out if _Xsetlocale() is supported by libX11. -@@ -2418,6 +2215,6 @@ - AC_CHECK_HEADERS(setjmp.h) - - dnl write output files --AC_OUTPUT(auto/config.mk:config.mk.in) -+AC_OUTPUT(config.mk:config.mk.in) - - dnl vim: set sw=2 tw=78 fo+=l: ---- /dev/null -+++ src/acinclude.m4 -@@ -0,0 +1,223 @@ -+dnl -+dnl Get the cflags and libraries from the gtk-config script -+dnl -+ -+dnl define an autoconf function to check for a specified version of GTK, and -+dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16. -+dnl -+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN(AM_PATH_GTK, -+[ -+ if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then -+ { -+ min_gtk_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ no_gtk="" -+ if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ -+ && $PKG_CONFIG --exists gtk+-2.0; then -+ { -+ dnl We should be using PKG_CHECK_MODULES() instead of this hack. -+ dnl But I guess the dependency on pkgconfig.m4 is not wanted or -+ dnl something like that. -+ GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` -+ gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ gtk_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ } -+ elif test "X$GTK_CONFIG" != "Xno"; then -+ { -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ gtk_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ } -+ else -+ no_gtk=yes -+ fi -+ -+ if test "x$enable_gtktest" = "xyes" -a "x$no_gtk" = "x"; then -+ { -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ -+ dnl -+ dnl Now check if the installed GTK is sufficiently new. (Also sanity -+ dnl checks the results of gtk-config to some extent -+ dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include <gtk/gtk.h> -+#include <stdio.h> -+ -+int -+main () -+{ -+int major, minor, micro; -+char *tmp_version; -+ -+system ("touch conf.gtktest"); -+ -+/* HP/UX 9 (%@#!) writes to sscanf strings */ -+tmp_version = g_strdup("$min_gtk_version"); -+if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && -+ (gtk_micro_version >= micro))) -+{ -+ return 0; -+} -+return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ } -+ fi -+ if test "x$no_gtk" = x ; then -+ if test "x$enable_gtktest" = "xyes"; then -+ AC_MSG_RESULT(yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) -+ else -+ AC_MSG_RESULT(found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version) -+ fi -+ ifelse([$2], , :, [$2]) -+ else -+ { -+ AC_MSG_RESULT(no) -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ } -+ fi -+ } -+ else -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) -+ -+dnl --------------------------------------------------------------------------- -+dnl gnome -+dnl --------------------------------------------------------------------------- -+AC_DEFUN([GNOME_INIT_HOOK], -+[ -+ AC_SUBST(GNOME_LIBS) -+ AC_SUBST(GNOME_LIBDIR) -+ AC_SUBST(GNOME_INCLUDEDIR) -+ -+ AC_ARG_WITH(gnome-includes, -+ [ --with-gnome-includes=DIR Specify location of GNOME headers], -+ [CFLAGS="$CFLAGS -I$withval"] -+ ) -+ -+ AC_ARG_WITH(gnome-libs, -+ [ --with-gnome-libs=DIR Specify location of GNOME libs], -+ [LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval] -+ ) -+ -+ AC_ARG_WITH(gnome, -+ [ --with-gnome Specify prefix for GNOME files], -+ if test x$withval = xyes; then -+ want_gnome=yes -+ ifelse([$1], [], :, [$1]) -+ else -+ if test "x$withval" = xno; then -+ want_gnome=no -+ else -+ want_gnome=yes -+ LDFLAGS="$LDFLAGS -L$withval/lib" -+ CFLAGS="$CFLAGS -I$withval/include" -+ gnome_prefix=$withval/lib -+ fi -+ fi, -+ want_gnome=yes) -+ -+ if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then -+ { -+ AC_MSG_CHECKING(for libgnomeui-2.0) -+ if $PKG_CONFIG --exists libgnomeui-2.0; then -+ AC_MSG_RESULT(yes) -+ GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` -+ GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` -+ GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` -+ $1 -+ else -+ AC_MSG_RESULT(not found) -+ if test "x$2" = xfail; then -+ AC_MSG_ERROR(Could not find libgnomeui-2.0 via pkg-config) -+ fi -+ fi -+ } -+ elif test "x$want_gnome" = xyes; then -+ { -+ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) -+ if test "$GNOME_CONFIG" = "no"; then -+ no_gnome_config="yes" -+ else -+ AC_MSG_CHECKING(if $GNOME_CONFIG works) -+ if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then -+ AC_MSG_RESULT(yes) -+ GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`" -+ GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" -+ GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" -+ $1 -+ else -+ AC_MSG_RESULT(no) -+ no_gnome_config="yes" -+ fi -+ fi -+ -+ if test x$exec_prefix = xNONE; then -+ if test x$prefix = xNONE; then -+ gnome_prefix=$ac_default_prefix/lib -+ else -+ gnome_prefix=$prefix/lib -+ fi -+ else -+ gnome_prefix=`eval echo \`echo $libdir\`` -+ fi -+ -+ if test "$no_gnome_config" = "yes"; then -+ AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) -+ if test -f $gnome_prefix/gnomeConf.sh; then -+ AC_MSG_RESULT(found) -+ echo "loading gnome configuration from" \ -+ "$gnome_prefix/gnomeConf.sh" -+ . $gnome_prefix/gnomeConf.sh -+ $1 -+ else -+ AC_MSG_RESULT(not found) -+ if test x$2 = xfail; then -+ AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) -+ fi -+ fi -+ fi -+ } -+ fi -+]) -+ -+AC_DEFUN([GNOME_INIT],[ -+ GNOME_INIT_HOOK([],fail) -+]) -+ -+ ---- src/Makefile~configure -+++ src/Makefile -@@ -68,8 +68,8 @@ - # this in two steps with: - # make config - # make --# The configuration phase creates/overwrites auto/config.h and --# auto/config.mk. -+# The configuration phase creates/overwrites config.h and -+# config.mk. - # The configure script is created with "make autoconf". It can detect - # different features of your system and act accordingly. However, it is - # not correct for all systems. Check this: -@@ -84,14 +84,14 @@ - # make reconfig - # - # - If you do not trust the automatic configuration code, then inspect --# auto/config.h and auto/config.mk, before starting the actual build --# phase. If possible edit this Makefile, rather than auto/config.mk -- -+# config.h and config.mk, before starting the actual build -+# phase. If possible edit this Makefile, rather than config.mk -- - # especially look at the definition of VIMLOC below. Note that the --# configure phase overwrites auto/config.mk and auto/config.h again. -+# configure phase overwrites config.mk and config.h again. - # - If you get error messages, find out what is wrong and try to correct - # it in this Makefile. You may need to do "make reconfig" when you - # change anything that configure uses (e.g. switching from an old C --# compiler to an ANSI C compiler). Only when auto/configure does -+# compiler to an ANSI C compiler). Only when configure does - # something wrong you may need to change one of the other files. If - # you find a clean way to fix the problem, consider sending a note to - # the author of autoconf (bug-gnu-utils@prep.ai.mit.edu) or Vim -@@ -108,7 +108,7 @@ - # If the new Vim seems to be working OK you can install it and the - # documentation in the appropriate location. The default is - # "/usr/local". Change "prefix" below to change the location. --# "auto/pathdef.c" will be compiled again after changing this to make -+# "pathdef.c" will be compiled again after changing this to make - # the executable know where the help files are located. - # Note that any existing executable is removed or overwritten. If you - # want to keep it you will have to make a backup copy first. -@@ -224,7 +224,7 @@ - # (I) SINIX-N 5.42 and 5.43 need some EXTRA_LIBS. Also for Reliant-Unix. - # (J) If you get undefined symbols, see below for a solution. - # (K) See lines to uncomment below for machines with 64 bit pointers. --# (L) For Silicon Graphics O2 workstations remove "-lnsl" from auto/config.mk -+# (L) For Silicon Graphics O2 workstations remove "-lnsl" from config.mk - # (M) gcc version cygnus-2.0.1 does NOT work (symptom: "dl" deletes two - # characters instead of one). - # (N) SCO with decmouse. -@@ -238,7 +238,7 @@ - # detection, since the configure script runs into an error when it - # detects Python (probably because of the bash shell). - # (V) See lines to uncomment below. --# (X) Need to use the .include "auto/config.mk" line below -+# (X) Need to use the .include "config.mk" line below - # (Y) See line with c89 below - # (Z) See lines with cc or c89 below - # (a) See line with EXTRA_LIBS below. -@@ -263,20 +263,20 @@ - #GUI_LIB_LOC = -L/usr/X11R6/lib - # }}} - --######################## auto/config.mk ######################## {{{1 --# At this position auto/config.mk is included. When starting from the --# distribution it is almost empty. After running auto/configure it contains -+######################## config.mk ######################## {{{1 -+# At this position config.mk is included. When starting from the -+# distribution it is almost empty. After running configure it contains - # settings that have been discovered for your system. Settings below this --# include override settings in auto/config.mk! -+# include override settings in config.mk! - --# Note: if auto/config.mk is lost somehow (e.g., because configure was --# interrupted), create an empty auto/config.mk file and do "make config". -+# Note: if config.mk is lost somehow (e.g., because configure was -+# interrupted), create an empty config.mk file and do "make config". - --# (X) How to include auto/config.mk depends on the version of "make" you have, -+# (X) How to include config.mk depends on the version of "make" you have, - # if the current choice doesn't work, try the other one. - --include auto/config.mk --#.include "auto/config.mk" -+include config.mk -+#.include "config.mk" - CClink = $(CC) - - #}}} -@@ -344,7 +344,7 @@ - # Uncomment this when you want to include the Perl interface. - # The Perl option sometimes causes problems, because it adds extra flags - # to the command line. If you see strange flags during compilation, check in --# auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting -+# config.mk where they come from. If it's PERL_CFLAGS, try commenting - # the next line. - # When you get an error for a missing "perl.exp" file, try creating an emtpy - # one: "touch perl.exp". -@@ -633,12 +633,12 @@ - # 1. If you don't have an X server: Comment out CONF_OPT_GUI and uncomment - # CONF_OPT_X = --without-x. - # 2. make config --# 3. edit auto/config.mk and remove -ldir and -ltermcap from LIBS. It doesn't -+# 3. edit config.mk and remove -ldir and -ltermcap from LIBS. It doesn't - # have -ldir (does config find it somewhere?) and -ltermcap has at - # least one problem so I use termlib.o instead. The problem with - # termcap is that it segfaults if you call it with the name of - # a non-existent terminal type. --# 4. edit auto/config.h and add #define USE_TMPNAM -+# 4. edit config.h and add #define USE_TMPNAM - # 5. add termlib.o to OBJ - # 6. make - -@@ -708,7 +708,7 @@ - #GUI_LIB_LOC = -L/usr/lib64 - # then - # 1) make config --# 2) edit auto/config.mk and delete the -lelf entry in the LIBS line -+# 2) edit config.mk and delete the -lelf entry in the LIBS line - # 3) make - # - # or (for 32bit pointers) uncomment the following line -@@ -716,7 +716,7 @@ - #GUI_LIB_LOC = -L/usr/lib32 - # then - # 1) make config --# 2) edit auto/config.mk, add -n32 to LDFLAGS -+# 2) edit config.mk, add -n32 to LDFLAGS - # 3) make - ### - -@@ -1242,7 +1242,7 @@ - ops.c \ - option.c \ - os_unix.c \ -- auto/pathdef.c \ -+ pathdef.c \ - quickfix.c \ - regexp.c \ - screen.c \ -@@ -1261,7 +1261,7 @@ - - TAGS_SRC = *.c *.cpp if_perl.xs - --EXTRA_SRC = hangulin.c auto/if_perl.c if_perlsfio.c if_python.c if_tcl.c \ -+EXTRA_SRC = hangulin.c if_perl.c if_perlsfio.c if_python.c if_tcl.c \ - if_ruby.c if_sniff.c gui_beval.c \ - workshop.c wsdebug.c integration.c netbeans.c - -@@ -1392,14 +1392,14 @@ - - # Run configure with all the setting from above. - # --# Note: auto/config.h doesn't depend on configure, because running configure --# doesn't always update auto/config.h. The timestamp isn't changed if the -+# Note: config.h doesn't depend on configure, because running configure -+# doesn't always update config.h. The timestamp isn't changed if the - # file contents didn't change (to avoid recompiling everything). Including a --# dependency on auto/config.h would cause running configure each time when --# auto/config.h isn't updated. The dependency on auto/config.mk should make -+# dependency on config.h would cause running configure each time when -+# config.h isn't updated. The dependency on config.mk should make - # sure configure is run when it's needed. - # --config auto/config.mk: auto/configure config.mk.in config.h.in -+config config.mk: configure config.mk.in config.h.in - GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \ - CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \ -@@ -1414,31 +1414,31 @@ - - # Use "make reconfig" to rerun configure without cached values. - # When config.h changes, most things will be recompiled automatically. --# Use "myself" to make "all" with a possibly changed auto/config.mk. -+# Use "myself" to make "all" with a possibly changed config.mk. - reconfig: scratch config myself - --# Run autoconf to produce auto/configure. -+# Run autoconf to produce configure. - # Note: - # - DO NOT RUN autoconf MANUALLY! It will overwrite ./configure instead of --# producing auto/configure. -+# producing configure. - # - autoconf is not run automatically, because a patch usually changes both --# configure.in and auto/configure but can't update the timestamps. People -+# configure.in and configure but can't update the timestamps. People - # who do not have (the correct version of) autoconf would run into trouble. - # - # Two tricks are required to make autoconf put its output in the "auto" dir: - # - Temporarily move the ./configure script to ./configure.save. Don't - # overwrite it, it's probably the result of an aborted autoconf. --# - Use sed to change ./config.log to auto/config.log in the configure script. -+# - Use sed to change ./config.log to config.log in the configure script. - autoconf: - if test ! -f configure.save; then mv configure configure.save; fi - autoconf -- sed -e 's+\./config.log+auto/config.log+' configure > auto/configure -- chmod 755 auto/configure -+ sed -e 's+\./config.log+config.log+' configure > configure -+ chmod 755 configure - mv -f configure.save configure -- -rm -f auto/config.status auto/config.cache -+ -rm -f config.status config.cache - --# Re-execute this Makefile to include the new auto/config.mk produced by --# configure Only used when typing "make" with a fresh auto/config.mk. -+# Re-execute this Makefile to include the new config.mk produced by -+# configure Only used when typing "make" with a fresh config.mk. - myself: - $(MAKE) -f Makefile all - -@@ -1449,7 +1449,7 @@ - - # Link the target for normal use or debugging. - # A shell script is used to try linking without unneccesary libraries. --$(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h -+$(VIMTARGET): config.mk objects $(OBJ) version.c version.h - $(CCC) version.c -o objects/version.o - @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ - -o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \ -@@ -1487,7 +1487,7 @@ - # cproto $(PFLAGS) -DFEAT_GUI $(*F).c > $@ - - # Always define FEAT_GUI. This may generate a few warnings if it's also --# defined in auto/config.h, you can ignore that. -+# defined in config.h, you can ignore that. - .c.pro: - cproto $(PFLAGS) -DFEAT_GUI $< > proto/$@ - echo "/* vim: set ft=c : */" >> proto/$@ -@@ -1517,18 +1517,18 @@ - echo "/* vim: set ft=c : */" >> proto/$@ - - os_vms.pro: os_vms.c --# must use os_vms_conf.h for auto/config.h -- mv auto/config.h auto/config.h.save -- cp os_vms_conf.h auto/config.h -+# must use os_vms_conf.h for config.h -+ mv config.h config.h.save -+ cp os_vms_conf.h config.h - cproto $(PFLAGS) -DVMS -UFEAT_GUI_ATHENA -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@ - echo "/* vim: set ft=c : */" >> proto/$@ -- rm auto/config.h -- mv auto/config.h.save auto/config.h -+ rm config.h -+ mv config.h.save config.h - - # if_perl.pro is special: Use the generated if_perl.c for input and remove - # prototypes for local functions. --if_perl.pro: auto/if_perl.c -- cproto $(PFLAGS) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@ -+if_perl.pro: if_perl.c -+ cproto $(PFLAGS) -DFEAT_GUI if_perl.c | sed "/_VI/d" > proto/$@ - - - notags: -@@ -1923,8 +1923,8 @@ - # We support common typing mistakes for Juergen! :-) - clean celan: testclean - -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) xxd/*.o -- -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c -- -rm -f conftest* *~ auto/link.sed -+ -rm -f $(TOOLS) osdef.h pathdef.c if_perl.c -+ -rm -f conftest* *~ link.sed - if test -d $(PODIR); then \ - cd $(PODIR); $ |