[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1056-g7e9c735

[Jelmer Vernooij]

The branch, master has been updated
       via  7e9c735b3ca5ab311011a3d5c8f6f90dc56bb5f4 (commit)
       via  80e9e63cf611ed45cb2bfb4896f962270e92ee8e (commit)
      from  4a2e2c0c12e298cb72d4c03e59350393b0a5814f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7e9c735b3ca5ab311011a3d5c8f6f90dc56bb5f4
Merge: 80e9e63cf611ed45cb2bfb4896f962270e92ee8e 4a2e2c0c12e298cb72d4c03e59350393b0a5814f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Feb 21 19:00:18 2009 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 80e9e63cf611ed45cb2bfb4896f962270e92ee8e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Feb 21 18:59:12 2009 +0100

    Let --enable-external-libldb default to no (since linking against
    external LDB doesn't work yet).
    Fix flags when using internal libs.

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

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


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index a707a11..1927e99 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 bc3c011..54ca910 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)


-- 
Samba Shared Repository