Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

[samba.git] / source4 / configure.ac

diff --git a/source4/configure.ac b/source4/configure.ac
index a2b547154dc1648da5a87584e3589962b65fe4a2..164a21e82380e654bc2dcbaf9c3d14e35ebe011e 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -25,42 +25,74 @@ m4_include(lib/util/time.m4)
 m4_include(lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
+m4_include(nsswitch/nsstest.m4)
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0,
-                          [samba_cv_internal_talloc=no],
-                          [samba_cv_internal_talloc=yes])
-if test x"$samba_cv_internal_talloc" = x"yes"; then
-       m4_include(lib/talloc/libtalloc.m4)
-       SMB_INCLUDE_MK(lib/talloc/config.mk)
-fi
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.1.0,
+       [],
+       [
+               m4_include(lib/talloc/libtalloc.m4)
+               SMB_INCLUDE_MK(lib/talloc/config.mk)
+       ]
+)
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
-                          [samba_cv_internal_tdb=no],
-                          [samba_cv_internal_tdb=yes])
-if test x"$samba_cv_internal_tdb" = x"yes"; then
-       m4_include(lib/tdb/libtdb.m4)
-       SMB_INCLUDE_MK(lib/tdb/config.mk)
-fi
+       [],
+       [
+               m4_include(lib/tdb/libtdb.m4)
+               SMB_INCLUDE_MK(lib/tdb/config.mk)
+       ]
+)
+
+SMB_INCLUDE_MK(lib/tdb/python.mk) 
+
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
+       [
+               SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
+               SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
+               SMB_SUBSYSTEM(ldb_map, [], [LIBLDB])
+               define_ldb_modulesdir=no
+       ],
+       [
+               # Here we need to do some tricks
+               # with AC_CONFIG_COMMANDS_PRE
+               # as that's the deferrs the commands
+               # to location after $prefix and $exec_prefix
+               # have usefull values and directly before
+               # creating config.status.
+               #
+               # The 'eval eval echo' trick is used to
+               # actually get the raw absolute directory
+               # path as this is needed in config.h
+               define_ldb_modulesdir=yes
+               AC_CONFIG_COMMANDS_PRE([
+               if test x"$define_ldb_modulesdir" = x"yes";then
+                       LDB_MODULESDIR=`eval eval echo ${modulesdir}/ldb`
+                       AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
+               fi
+               ])
+               m4_include(lib/ldb/sqlite3.m4)
+               m4_include(lib/ldb/libldb.m4)
+               SMB_INCLUDE_MK(lib/ldb/config.mk)
+       ]
+)
+SMB_INCLUDE_MK(lib/ldb/python.mk) 
 
-m4_include(lib/ldb/sqlite3.m4)
-m4_include(lib/ldb/libldb.m4)
 m4_include(lib/tls/config.m4)
 m4_include(lib/events/config.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
-
+m4_include(scripting/python/config.m4)
 m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
-m4_include(scripting/swig/config.m4)
 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(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
 m4_include(lib/appweb/config.m4)
 m4_include(nsswitch/config.m4)
-m4_include(libcli/config.m4)
 
 #################################################
 # add *_CFLAGS only for the real build