diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-22 21:07:06 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-22 21:07:06 +0100 |
| commit | 33c31d5abf122806a4a1b4353e5bdc1dbb9468c0 (patch) | |
| tree | 59303a67c9f16e8074c2ce7382ae9e74a71623c8 | |
| parent | b2bd6a087d0598f6934bba825bed7535f42efc91 (diff) | |
| download | vim-git-33c31d5abf122806a4a1b4353e5bdc1dbb9468c0.tar.gz | |
patch 7.4.1390v7.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)
| -rwxr-xr-x | src/auto/configure | 11 | ||||
| -rw-r--r-- | src/configure.in | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/auto/configure b/src/auto/configure index fea1f2cfa..69aec67c6 100755 --- 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 92a1bb525..9f19c137b 100644 --- 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 2e876b09c..290914906 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1390, +/**/ 1389, /**/ 1388, |