[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2377-g78e316d

[Jelmer Vernooij]

The branch, master has been updated
       via  78e316ddbc15c37604c84cb08dd13c95e2539d68 (commit)
      from  8178a40dcd0f66e3858fcac8fe23d9fc8b54ecf4 (commit)

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


- Log -----------------------------------------------------------------
commit 78e316ddbc15c37604c84cb08dd13c95e2539d68
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jun 18 04:20:46 2009 +0200

    Use system Python LDB bindings, if present.

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

Summary of changes:
 source4/configure.ac |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/configure.ac b/source4/configure.ac
index 4b644d4..1930f4b 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -78,6 +78,14 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
 		SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
 		SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
 		define_ldb_modulesdir=no
+		AC_MSG_CHECKING([for Python LDB bindings])
+		if $PYTHON -c "import ldb" 2>/dev/null; then
+			AC_MSG_RESULT(yes)
+		else
+			SMB_INCLUDE_MK(lib/ldb/python.mk) 
+			AC_MSG_RESULT(no)
+		fi
+
 	],
 	[
 		# Here we need to do some tricks
@@ -103,8 +111,8 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
 		m4_include(lib/ldb/libldb.m4)
 		SMB_INCLUDE_MK(lib/ldb/config.mk)
 		AC_CONFIG_FILES(lib/ldb/ldb.pc)
+		SMB_INCLUDE_MK(lib/ldb/python.mk) 
 	])
-SMB_INCLUDE_MK(lib/ldb/python.mk) 
 
 m4_include(lib/tls/config.m4)
 m4_include(torture/libnetapi/config.m4)


-- 
Samba Shared Repository