s4-samr: merge samr_EnumDomainAliases from s3 idl. (fixme: python)

[ira/wip.git] / source4 / configure.ac

diff --git a/source4/configure.ac b/source4/configure.ac
index 7c95f2a17504e8310f95b04a7b048f404a1fcbfb..cf85b13225dc795f80ebaf8e5ee99f0b5ca56816 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -22,9 +22,14 @@ m4_include(../lib/util/xattr.m4)
 m4_include(../lib/util/capability.m4)
 m4_include(../lib/util/time.m4)
 m4_include(../lib/popt/samba.m4)
-m4_include(lib/charset/config.m4)
+m4_include(../lib/util/charset/config.m4)
 m4_include(lib/socket/config.m4)
-m4_include(lib/zlib.m4)
+m4_include(../lib/zlib/zlib.m4)
+AC_ZLIB([
+SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}])
+],[
+SMB_INCLUDE_MK(lib/zlib.mk)
+])
 m4_include(nsswitch/nsstest.m4)
 m4_include(../pidl/config.m4)