[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-372-g0918711

[Stefan Metzmacher]

The branch, v3-4-test has been updated
       via  0918711c8cfd69d751ac7d0ab553575c34ea8ff4 (commit)
      from  da2cd75615f72b1e3d138e0d374fea0998800355 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 0918711c8cfd69d751ac7d0ab553575c34ea8ff4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 17 08:58:04 2009 +0100

    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
    (cherry picked from commit 937a058cf25672bc22bf07183b0fb485138f6593)

-----------------------------------------------------------------------

Summary of changes:
 source4/build/m4/public.m4 |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index ffdf92f..b0b8af3 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
@@ -112,7 +113,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


-- 
Samba Shared Repository