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
This commit is contained in:
Matthias Clasen 2007-11-08 05:48:35 +00:00 committed by Matthias Clasen
parent 263a48aaec
commit e243169979
3 changed files with 11 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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=""