On Sun, Jan 3, 2016 at 12:14 AM, Tony Mechelynck <[email protected]> wrote: > On Sat, Jan 2, 2016 at 10:46 PM, Bram Moolenaar <[email protected]> wrote: >> >> John Little wrote: >>> My Ubuntu 15.04 install says 2.31.3, so I think you could do what I did in >>> my post above, change line 2511 of src/configure.in to read >>> >>> $gdk_pixbuf_version_minor -ge 31 ; then >>> >>> and make reconfig. >> >> OK, let's do that. In case someone complains we can change it back. > > I see that line at line 2512, which is a continuation line. > > "make reconfig" does not recreate auto/configure so I had to make the > corresponding change manually there too. > > After that, configure says that gdk-pixbuf is now OK and the compile > warning has disappeared. > > The make logs now include _two_ runs of glib-compile-resources with > identical command lines, one before compiling gui_gtk_x11.c and the > other before gui_gtk_gresources.c > > After "make reconfig" comes to an end (after configure, compile and > link), viewing the config files shows that the resource lines in > auto/config.mk get nonempty values and the last line of auto/config.h > becomes a #define instead of a commented-out #undef. > > Best regards, > Tony. > >> >> -- >> An indication you must be a manager: >> You can explain to somebody the difference between "re-engineering", >> "down-sizing", "right-sizing", and "firing people's asses". >> >> /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ >> /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ >> \\\ an exciting new programming language -- http://www.Zimbu.org /// >> \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
P.S. FWIW, I'm attaching the patch I applied (with the mq extension) in my Mercurial repository. Best regards, Tony. -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
# HG changeset patch # User John Little <[email protected]> # Parent 9ed49c0ad804d68ecfc784ca830a60dc967bf984 lower gdk-pixbuf version test from 32 to 31 diff --git a/src/auto/configure b/src/auto/configure --- a/src/auto/configure +++ b/src/auto/configure @@ -8914,17 +8914,17 @@ fi if test "x$GUITYPE" = "xGTK"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of Gdk-Pixbuf" >&5 $as_echo_n "checking version of Gdk-Pixbuf... " >&6; } gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0` if test "x$gdk_pixbuf_version" != x ; 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 32 ; 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. set dummy glib-compile-resources; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then : $as_echo_n "(cached) " >&6 diff --git a/src/configure.in b/src/configure.in --- a/src/configure.in +++ b/src/configure.in @@ -2504,17 +2504,17 @@ dnl Check the version of Gdk-Pixbuf. If dnl glib-compile-resources is found in PATH, use GResource. if test "x$GUITYPE" = "xGTK"; then AC_MSG_CHECKING([version of Gdk-Pixbuf]) gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0` if test "x$gdk_pixbuf_version" != x ; 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 32 ; 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.]) else AC_MSG_RESULT([usable.]) AC_DEFINE(USE_GRESOURCE)
