patch 7.4.1390

Problem:    When building with GTK and glib-compile-resources cannot be found
            building Vim fails. (Michael Gehring)
Solution:   Make GLIB_COMPILE_RESOURCES empty instead of leaving it at "no".
            (nuko8, closes #655)

diff --git a/src/auto/configure b/src/auto/configure
index fea1f2cfab864828e18d26c958592bab0b35a0c5..69aec67c65b180c8f61f363221bf10aed36a578e 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9052,7 +9052,7 @@ $as_echo_n "checking version of Gdk-Pixbuf... " >&6; }
     gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
       sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`
     if test "x$gdk_pixbuf_version_minor" != x -a \
-      $gdk_pixbuf_version_minor -ge 31 ; then
+       $gdk_pixbuf_version_minor -ge 31 ; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5
 $as_echo "OK." >&6; }
       # Extract the first word of "glib-compile-resources", so it can be a program name with args.
@@ -9099,15 +9099,16 @@ fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5
 $as_echo_n "checking glib-compile-resources... " >&6; }
       if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5
+       GLIB_COMPILE_RESOURCES=""
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5
 $as_echo "cannot be found in PATH." >&6; }
       else
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5
 $as_echo "usable." >&6; }
-        $as_echo "#define USE_GRESOURCE 1" >>confdefs.h
+       $as_echo "#define USE_GRESOURCE 1" >>confdefs.h
 
-        GRESOURCE_SRC="auto/gui_gtk_gresources.c"
-        GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
+       GRESOURCE_SRC="auto/gui_gtk_gresources.c"
+       GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
       fi
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5

diff --git a/src/configure.in b/src/configure.in
index 92a1bb5251317d4a6c78cad6e8d59bc220f95e76..9f19c137b66786aca499ee16dc403849701fb577 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -2610,17 +2610,18 @@ if test "x$GUITYPE" = "xGTK"; then
     gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
       sed -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/'`
     if test "x$gdk_pixbuf_version_minor" != x -a \
-      $gdk_pixbuf_version_minor -ge 31 ; then
+       $gdk_pixbuf_version_minor -ge 31 ; then
       AC_MSG_RESULT([OK.])
       AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no)
       AC_MSG_CHECKING([glib-compile-resources])
       if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
-        AC_MSG_RESULT([cannot be found in PATH.])
+       GLIB_COMPILE_RESOURCES=""
+       AC_MSG_RESULT([cannot be found in PATH.])
       else
        AC_MSG_RESULT([usable.])
-        AC_DEFINE(USE_GRESOURCE)
-        GRESOURCE_SRC="auto/gui_gtk_gresources.c"
-        GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
+       AC_DEFINE(USE_GRESOURCE)
+       GRESOURCE_SRC="auto/gui_gtk_gresources.c"
+       GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
       fi
     else
       AC_MSG_RESULT([not usable.])

diff --git a/src/version.c b/src/version.c
index 2e876b09c6a89b1b4f2872f557484f4b93e662f7..2909149066449e20a221a2f8610cc1a4ddf3b1d5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1390,
 /**/
     1389,
 /**/