Require pkg-config 0.7.0 and fix download URL.

2001-06-13  Martin Baulig  <baulig@suse.de>

	* gnome-pkgconfig.m4 (GNOME_CHECK_PKGCONFIG): Require pkg-config 0.7.0
	and fix download URL.

	* gnome-platform.m4: Require pkgconfig on the GNOME 2.0 platform.

svn path=/trunk/; revision=1790

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 1a0b740..af379a1 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-13  Martin Baulig  <baulig@suse.de>
+
+       * gnome-pkgconfig.m4 (GNOME_CHECK_PKGCONFIG): Require pkg-config 0.7.0
+       and fix download URL.
+
+       * gnome-platform.m4: Require pkgconfig on the GNOME 2.0 platform.
+
 2001-06-01  Peter Williams  <peterw@ximian.com>
 
        * autogen.sh: s,Gnome,$PKG_NAME,g

diff --git a/macros2/gnome-pkgconfig.m4 b/macros2/gnome-pkgconfig.m4
index 976ed53..11621fb 100644 (file)
--- a/macros2/gnome-pkgconfig.m4
+++ b/macros2/gnome-pkgconfig.m4
@@ -45,7 +45,7 @@ AC_DEFUN([GNOME_CHECK_PKGCONFIG],[
        fi
        AC_MSG_CHECKING(for pkg-config)
        if test x$have_pkgconfig = xyes ; then
-           pkgconfig_required_version=0.4.1
+           pkgconfig_required_version=0.7
            pkgconfig_version=`pkg-config --version`
            GNOME_PKGCONFIG_CHECK_VERSION($pkgconfig_version, $pkgconfig_required_version, [have_pkgconfig=yes], [have_pkgconfig=no])
        fi
@@ -58,7 +58,7 @@ AC_DEFUN([GNOME_CHECK_PKGCONFIG],[
                AC_MSG_ERROR([
 *** You need the latest pkg-config (at least $pkgconfig_required_version).
 *** Get the latest version of pkg-config from
-*** http://pkgconfig.sourceforce.net.])
+*** http://www.freesoftware.org/software/pkgconfig.])
            fi
        fi
        AC_SUBST(PKG_CONFIG)

diff --git a/macros2/gnome-platform.m4 b/macros2/gnome-platform.m4
index 96b6c04..5d44a70 100644 (file)
--- a/macros2/gnome-platform.m4
+++ b/macros2/gnome-platform.m4
@@ -28,6 +28,7 @@ AC_DEFUN([GNOME_PLATFORM_GNOME_2],[
        if test $platform_gnome_2 = yes; then
            AC_MSG_RESULT(GNOME 2.x)
            GNOME_INTERFACE_VERSION=2
+           GNOME_REQUIRE_PKGCONFIG
        else
            AC_MSG_RESULT(GNOME 1.x)
            GNOME_INTERFACE_VERSION=1