X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source4%2Fconfigure.ac;h=3f10419a42d39cbb6a2816a5be5e8fec7bb82f9f;hb=3d57da80e574f5f47effb41fd45361eec22f119e;hp=ef8ad66f6850f55f18bf5a545de979fed034d7b8;hpb=b00f6d169c1b5b4da5d8c5167d81a659e1deca13;p=nivanova%2Fsamba-autobuild%2F.git

diff --git a/source4/configure.ac b/source4/configure.ac
index ef8ad66f685..3f10419a42d 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([samba],[4],[samba-technical@samba.org])
 
 AC_CONFIG_SRCDIR([include/includes.h])
 AC_CONFIG_HEADER(include/config_tmp.h)
-AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
+AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h.])
 
 # Configuration rules.
 m4_include(build/m4/env.m4)
@@ -32,50 +32,61 @@ SMB_INCLUDE_MK(lib/zlib.mk)
 ])
 m4_include(../nsswitch/nsstest.m4)
 m4_include(../pidl/config.m4)
+m4_include(client/config.m4)
 
 AC_CONFIG_FILES(lib/registry/registry.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(../librpc/ndr.pc)
+AC_CONFIG_FILES(../librpc/ndr_standard.pc)
 AC_CONFIG_FILES(../lib/torture/torture.pc)
 AC_CONFIG_FILES(auth/gensec/gensec.pc)
 AC_CONFIG_FILES(param/samba-hostconfig.pc)
 AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
 AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
-	[],
+m4_include(min_versions.m4)
+
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= TALLOC_MIN_VERSION, [],
 	[
 		m4_include(../lib/talloc/libtalloc.m4)
 		SMB_INCLUDE_MK(../lib/talloc/config.mk)
 	]
 )
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
-	[],
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= TDB_MIN_VERSION,
+	[
+		AC_MSG_CHECKING([for Python TDB bindings])
+		if $PYTHON -c "from tdb import open" 2>/dev/null; then
+			AC_MSG_RESULT(yes)
+		else
+			SMB_INCLUDE_MK(../lib/tdb/python.mk) 
+			AC_MSG_RESULT(no)
+		fi
+	 ],
 	[
 		m4_include(../lib/tdb/libtdb.m4)
 		SMB_INCLUDE_MK(../lib/tdb/config.mk)
+		SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 	]
 )
 
-SMB_INCLUDE_MK(../lib/tdb/python.mk) 
-
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent >= 0.9.1,
-	[],
-	[
-		m4_include(../lib/tevent/libtevent.m4)
-		SMB_INCLUDE_MK(../lib/tevent/config.mk)
-		AC_CONFIG_FILES(../lib/tevent/tevent.pc)
-	]
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION,
+	[],[m4_include(../lib/tevent/samba.m4)]
 )
 
-SMB_INCLUDE_MK(../lib/tevent/python.mk) 
-
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
+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
@@ -101,11 +112,11 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
 		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)
 
 dnl m4_include(auth/kerberos/config.m4)
 m4_include(auth/gensec/config.m4)
@@ -114,6 +125,7 @@ m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
 m4_include(../lib/socket_wrapper/config.m4)
 m4_include(../lib/nss_wrapper/config.m4)
+m4_include(../lib/uid_wrapper/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
@@ -127,7 +139,7 @@ CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}"
 # final configure stuff
 
 AC_MSG_CHECKING([configure summary])
-AC_TRY_RUN([#include "${srcdir-.}/build/tests/summary.c"],
+AC_TRY_RUN([#include "${srcdir-.}/../tests/summary.c"],
            AC_MSG_RESULT(yes),
 	   AC_MSG_ERROR([summary failure. Aborting config]); exit 1;,
 	   AC_MSG_WARN([cannot run when cross-compiling]))