Require pkg-config 0.16 in configure and in AM_PATH_GLIB_2_0 to be

2007-11-08  Matthias Clasen <mclasen@redhat.com>

        * 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 11e035e985ddad02c477842d7508f4bbe721a904..76263748d3b1fd6a9cbabce9e4379ed5a5a9b03b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-08  Matthias Clasen <mclasen@redhat.com>
+
+       * 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 <mclasen@redhat.com>
 
        * glib/gstrfuncs.c (g_parse_long_long): Don't leave

diff --git a/configure.in b/configure.in
index e1353c2a7257b316f894b5c071d1be77baaafe0b..fcf083dd65f76a79bb68103fe90e8af91492f18d 100644 (file)
--- 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 2a5afd0c034b9b0b4349e49ad5b6cf7c197f3124..11df0b4f0ef465c308fcee15f6409b3e0016b998 100644 (file)
--- 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=""