From 828dbf8727fe14096aef654b8d9312548f9cb997 Mon Sep 17 00:00:00 2001 From: Richard Hestilow Date: Wed, 27 Jun 2001 18:40:27 +0000 Subject: [PATCH] Check for pkg-config >= 0.6.0 without the use of a macro -- people were 2001-06-27 Richard Hestilow * configure.in: Check for pkg-config >= 0.6.0 without the use of a macro -- people were having issues with older versions with no macros. --- ChangeLog | 6 ++++++ configure.in | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index e0e3c20c1..872332589 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-06-27 Richard Hestilow + + * configure.in: Check for pkg-config >= 0.6.0 without the use of + a macro -- people were having issues with older versions with + no macros. + 2001-06-21 Havoc Pennington * configure.in: switch to using pkg-config to find things diff --git a/configure.in b/configure.in index 8a9b0c310..8f4d65d61 100644 --- a/configure.in +++ b/configure.in @@ -94,6 +94,19 @@ case "x$vers" in ;; esac +AC_PATH_PROG(PKGCONFIG, pkg-config, no) +if test "$PKGCONFIG" = no ; then + AC_MSG_ERROR(pkg-config was not found. Please install version 0.6.0 or newer from http://www.freedesktop.org/software.) +fi + +AC_MSG_CHECKING(for pkg-config >= 0.6.0) +vers=`$PKGCONFIG --version | awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 1000 + $3}'` +if test "$vers" -ge 6000; then + AC_MSG_RESULT(found) +else + AC_MSG_ERROR(You need at least pkg-config 0.6.0 or greater for this version of control-center. Please install a newer version from http://www.freedesktop.org/software.) +fi + capplet_modules="libcapplet2 libglade gdk_pixbuf $ARCHIVER_MODULE" PKG_CHECK_MODULES(CAPPLET, $capplet_modules)