Use PKG_PROG_PKG_CONFIG. (#392636, Yevgen Muntyan)

2007-01-07  Matthias Clasen  <mclasen@redhat.com>

        * m4macros/glib-2.0.m4: Use PKG_PROG_PKG_CONFIG.  (#392636,
        Yevgen Muntyan)

svn path=/trunk/; revision=5225

diff --git a/ChangeLog b/ChangeLog
index 5fbcd3c..cf19b80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * m4macros/glib-2.0.m4: Use PKG_PROG_PKG_CONFIG.  (#392636,
+       Yevgen Muntyan)
+
 2007-01-07  Tor Lillqvist  <tml@novell.com>
 
        * glib/giowin32.c: Handle GIOChannels for file descriptors

diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4
index d6413ff..2a5afd0 100644 (file)
--- a/m4macros/glib-2.0.m4
+++ b/m4macros/glib-2.0.m4
@@ -31,20 +31,13 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run
       esac
   done
 
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  PKG_PROG_PKG_CONFIG([0.7])
 
   no_glib=""
 
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_glib=yes
-      PKG_CONFIG=no
-    fi
-  else
+  if test "x$PKG_CONFIG" = x ; then
     no_glib=yes
+    PKG_CONFIG=no
   fi
 
   min_glib_version=ifelse([$1], ,2.0.0,$1)