Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 21 Feb 2009 18:00:18 +0000 (19:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 21 Feb 2009 18:00:18 +0000 (19:00 +0100)
source4/build/m4/public.m4
source4/configure.ac

index a707a113cd959d18986ffce4de39fa3dfacc39f1..1927e9977fdefa62262249201ea2142e03f704ed 100644 (file)
@@ -131,15 +131,17 @@ dnl SMB_INCLUDED_LIB_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF
 AC_DEFUN([SMB_INCLUDED_LIB_PKGCONFIG],
 [
        AC_ARG_ENABLE([external-]translit($1,`A-Z',`a-z'),
-               AS_HELP_STRING([--enable-external-]translit($1,`A-Z',`a-z'), [Use external $1 instead of built-in (default=auto)]), [], [enableval=auto])
+               AS_HELP_STRING([--enable-external-]translit($1,`A-Z',`a-z'), [Use external $1 instead of built-in (default=ifelse([$5],[],auto,$5))]), [], [enableval=ifelse([$5],[],auto,$5)])
 
        if test $enableval = yes -o $enableval = auto; then
                SMB_EXT_LIB_FROM_PKGCONFIG([$1], [$2], [$3], [
                        if test $enableval = yes; then
                                AC_MSG_ERROR([Unable to find external $1])
                        fi
+                       enableval=no
                ])
-       else
+       fi
+       if test $enableval = no; then
                ifelse([$4], [], [
                          SMB_EXT_LIB($1)
                          SMB_ENABLE($1, NO)
index bc3c01173fd206b093f4bb77d51a61174c8575e1..54ca9108b14d0d7857d34c06e772781f93a72188 100644 (file)
@@ -95,8 +95,7 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = 0.9.3,
                m4_include(lib/ldb/libldb.m4)
                SMB_INCLUDE_MK(lib/ldb/config.mk)
                AC_CONFIG_FILES(lib/ldb/ldb.pc)
-       ]
-)
+       ], [no])
 SMB_INCLUDE_MK(lib/ldb/python.mk) 
 
 m4_include(lib/tls/config.m4)