Mercurial > vim

comparison src/auto/configure @ 8194:265bcedffc15 v7.4.1390

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/33c31d5abf122806a4a1b4353e5bdc1dbb9468c0 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Feb 22 21:07:06 2016 +0100 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)
author Christian Brabandt <cb@256bit.org>
date Mon, 22 Feb 2016 21:15:05 +0100
parents e90a16795c74
children 3456e2ebebd4
comparison
equal deleted inserted replaced
8193:f5a0eeebe5a3 8194:265bcedffc15
9050 gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0` 9050 gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0`
9051 if test "x$gdk_pixbuf_version" != x ; then 9051 if test "x$gdk_pixbuf_version" != x ; then
9052 gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ 9052 gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
9053 sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'` 9053 sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`
9054 if test "x$gdk_pixbuf_version_minor" != x -a \ 9054 if test "x$gdk_pixbuf_version_minor" != x -a \
9055 $gdk_pixbuf_version_minor -ge 31 ; then 9055 $gdk_pixbuf_version_minor -ge 31 ; then
9056 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5 9056 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5
9057 $as_echo "OK." >&6; } 9057 $as_echo "OK." >&6; }
9058 # Extract the first word of "glib-compile-resources", so it can be a program name with args. 9058 # Extract the first word of "glib-compile-resources", so it can be a program name with args.
9059 set dummy glib-compile-resources; ac_word=$2 9059 set dummy glib-compile-resources; ac_word=$2
9060 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 9060 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9097 9097
9098 9098
9099 { $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5 9099 { $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5
9100 $as_echo_n "checking glib-compile-resources... " >&6; } 9100 $as_echo_n "checking glib-compile-resources... " >&6; }
9101 if test "x$GLIB_COMPILE_RESOURCES" = xno ; then 9101 if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
9102 { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5 9102 GLIB_COMPILE_RESOURCES=""
9103 { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5
9103 $as_echo "cannot be found in PATH." >&6; } 9104 $as_echo "cannot be found in PATH." >&6; }
9104 else 9105 else
9105 { $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5 9106 { $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5
9106 $as_echo "usable." >&6; } 9107 $as_echo "usable." >&6; }
9107 $as_echo "#define USE_GRESOURCE 1" >>confdefs.h 9108 $as_echo "#define USE_GRESOURCE 1" >>confdefs.h
9108 9109
9109 GRESOURCE_SRC="auto/gui_gtk_gresources.c" 9110 GRESOURCE_SRC="auto/gui_gtk_gresources.c"
9110 GRESOURCE_OBJ="objects/gui_gtk_gresources.o" 9111 GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
9111 fi 9112 fi
9112 else 9113 else
9113 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5 9114 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5
9114 $as_echo "not usable." >&6; } 9115 $as_echo "not usable." >&6; }
9115 fi 9116 fi