diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-03-17 08:58:04 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-03-17 09:00:14 +0100 |
| commit | 937a058cf25672bc22bf07183b0fb485138f6593 (patch) | |
| tree | 2a60b445c67e59e3a7b3f7b2fd21abff02058760 | |
| parent | 467cc6927f57e36ce9b97131e72b79ef6e39a668 (diff) | |
| download | samba-937a058cf25672bc22bf07183b0fb485138f6593.tar.gz samba-937a058cf25672bc22bf07183b0fb485138f6593.tar.bz2 samba-937a058cf25672bc22bf07183b0fb485138f6593.zip | |
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
| -rw-r--r-- | source4/build/m4/public.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 6860e56e7f..bd98a400be 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 |