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 fea1f2c..69aec67 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9052,7 +9052,7 @@
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 @@
{ $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 92a1bb5..9f19c13 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2610,17 +2610,18 @@
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 2e876b0..2909149 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1390,
+/**/
1389,
/**/
1388,