From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 17 Mar 2009 07:58:04 +0000 (+0100)
Subject: s4:build: use SAMBA_PKG_CONFIG_MIN_VERSION instead of PKG_CONFIG_MIN_VERSION
X-Git-Tag: tdb-1.1.5~1075^2~186
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=937a058cf25672bc22bf07183b0fb485138f6593;hp=467cc6927f57e36ce9b97131e72b79ef6e39a668

s4:build: use SAMBA_PKG_CONFIG_MIN_VERSION instead of PKG_CONFIG_MIN_VERSION

And also intialize the variable. This fixes ./autogen.sh
in the merged build for me.

metze
---

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 6860e56e7fc..bd98a400be4 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -82,7 +82,8 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
 		echo "*** Or see http://pkg-config.freedesktop.org/ to get pkg-config."
 			ac_cv_$1_found=no
 	else
-		if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then
+		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
+		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
 			AC_MSG_CHECKING(for $2)
 
 			if $PKG_CONFIG --exists '$2' ; then
@@ -114,7 +115,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
 				ac_cv_$1_found=no
 			fi
 		else
-			echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+			echo "*** Your version of pkg-config is too old. You need version $SAMBA_PKG_CONFIG_MIN_VERSION or newer."
 			echo "*** See http://pkg-config.freedesktop.org/"
 			ac_cv_$1_found=no
 		fi