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)
(cherry picked from commit 0918711c8cfd69d751ac7d0ab553575c34ea8ff4)

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index ffdf92f78444a100315be4579b8f4a8e607ceb62..b0b8af3db4661d2dc3513253f3899dcee508b027 100644 (file)
--- 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