2002-02-01 Havoc Pennington <hp@redhat.com>

Author: hp
Date: 2002-02-01 19:45:36 GMT
2002-02-01  Havoc Pennington  <hp@redhat.com>

	* pkg.m4: fix shell portability issue, reported by Morten Welinder

diff --git a/ChangeLog b/ChangeLog
index bcc44e1bcb64abc4a7bcb117c33a081d273e1c34..fdd7931dbeeecc09a33bf529e5ccea627de5f245 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-01  Havoc Pennington  <hp@redhat.com>
+
+       * pkg.m4: fix shell portability issue, reported by Morten Welinder
+
 2002-01-24  Havoc Pennington  <hp@redhat.com>
 
        * pkg.c (print_package_list): make the output halfway attractive

diff --git a/pkg.m4 b/pkg.m4
index 874a120cfb106fd17e98317617d36281741901ce..2ee547a0ce4501f7cb327c0f202821bed0b78396 100644 (file)
--- a/pkg.m4
+++ b/pkg.m4
@@ -15,10 +15,8 @@ AC_DEFUN(PKG_CHECK_MODULES, [
      echo "*** to the full path to pkg-config."
      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
   else
-     if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7.0; then
-        echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     else
+     PKG_CONFIG_MIN_VERSION=0.8.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         AC_MSG_CHECKING(for $2)
 
         if $PKG_CONFIG --exists "$2" ; then
@@ -43,6 +41,9 @@ AC_DEFUN(PKG_CHECK_MODULES, [
 
         AC_SUBST($1_CFLAGS)
         AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
      fi
   fi