summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-02-21 18:59:12 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-02-21 18:59:12 +0100
commit80e9e63cf611ed45cb2bfb4896f962270e92ee8e (patch)
tree843716fd941bc73f0175d90354caf48443430da2
parentfb1c564b78032b61bba182e748cdbadf94d26e15 (diff)
downloadsamba-80e9e63cf611ed45cb2bfb4896f962270e92ee8e.tar.gz
samba-80e9e63cf611ed45cb2bfb4896f962270e92ee8e.tar.bz2
samba-80e9e63cf611ed45cb2bfb4896f962270e92ee8e.zip
Let --enable-external-libldb default to no (since linking against
external LDB doesn't work yet). Fix flags when using internal libs.
-rw-r--r--source4/build/m4/public.m46
-rw-r--r--source4/configure.ac3
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index a707a113cd..1927e9977f 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -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)
diff --git a/source4/configure.ac b/source4/configure.ac
index bc3c01173f..54ca9108b1 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -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)