From: Matthias Clasen Date: Thu, 8 Nov 2007 05:48:35 +0000 (+0000) Subject: Require pkg-config 0.16 in configure and in AM_PATH_GLIB_2_0 to be X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e24316997992859ea5e39f2f69f0b95fbe2b9c5f;p=dana%2Fcg-glib.git Require pkg-config 0.16 in configure and in AM_PATH_GLIB_2_0 to be 2007-11-08 Matthias Clasen * configure.in: * m4macros/glib-2.0.m4: Require pkg-config 0.16 in configure and in AM_PATH_GLIB_2_0 to be consistent with the use of PKG_PROG_PKG_CONFIG which was introduced in 0.16. (#418778, Loïc Minier) svn path=/trunk/; revision=5820 --- diff --git a/ChangeLog b/ChangeLog index 11e035e9..76263748 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-11-08 Matthias Clasen + + * configure.in: + * m4macros/glib-2.0.m4: Require pkg-config 0.16 in configure + and in AM_PATH_GLIB_2_0 to be consistent with the use of + PKG_PROG_PKG_CONFIG which was introduced in 0.16. (#418778, + Loïc Minier) + 2007-11-08 Matthias Clasen * glib/gstrfuncs.c (g_parse_long_long): Don't leave diff --git a/configure.in b/configure.in index e1353c2a..fcf083dd 100644 --- a/configure.in +++ b/configure.in @@ -276,10 +276,10 @@ if test x$PKG_CONFIG = xno ; then AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/]) fi -if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then +if $PKG_CONFIG --atleast-pkgconfig-version 0.16 ; then : else - AC_MSG_ERROR([*** pkg-config too old; version 0.14 or better required.]) + AC_MSG_ERROR([*** pkg-config too old; version 0.16 or better required.]) fi if test "x$enable_debug" = "xyes"; then diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4 index 2a5afd0c..11df0b4f 100644 --- a/m4macros/glib-2.0.m4 +++ b/m4macros/glib-2.0.m4 @@ -31,7 +31,7 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run esac done - PKG_PROG_PKG_CONFIG([0.7]) + PKG_PROG_PKG_CONFIG([0.16]) no_glib=""