configure.ac: we should use AC_CONFIG_FILES() in order to use AC_OUTPUT only once

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

diff --git a/source/configure.ac b/source/configure.ac
index 02e6eb3710e6aca49dd93829cd75d6898d7f7149..ed74bc1251ffa70d553c32593f1ef194c05470d7 100644 (file)
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -25,27 +25,85 @@ 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(lib/talloc/libtalloc.m4)
-m4_include(lib/tdb/libtdb.m4)
-m4_include(lib/ldb/sqlite3.m4)
-m4_include(lib/ldb/libldb.m4)
+m4_include(nsswitch/nsstest.m4)
+
+AC_CONFIG_FILES(lib/registry/registry.pc)
+AC_CONFIG_FILES(librpc/dcerpc.pc)
+AC_CONFIG_FILES(librpc/ndr.pc)
+AC_CONFIG_FILES(torture/torture.pc)
+AC_CONFIG_FILES(auth/gensec/gensec.pc)
+AC_CONFIG_FILES(param/samba-config.pc)
+AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
+
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.1.0,
+       [],
+       [
+               m4_include(lib/talloc/libtalloc.m4)
+               SMB_INCLUDE_MK(lib/talloc/config.mk)
+               AC_CONFIG_FILES(lib/talloc/talloc.pc)
+       ]
+)
+
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
+       [],
+       [
+               m4_include(lib/tdb/libtdb.m4)
+               SMB_INCLUDE_MK(lib/tdb/config.mk)
+               AC_CONFIG_FILES(lib/tdb/tdb.pc)
+       ]
+)
+
+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)
+               AC_CONFIG_FILES(lib/ldb/ldb.pc)
+       ]
+)
+SMB_INCLUDE_MK(lib/ldb/python.mk) 
+
 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
@@ -78,6 +136,10 @@ CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
 
 AC_SUBST(ac_default_prefix)
 
+for d in build/smb_build bin include ; do
+    test -d ${builddir}/$d || AS_MKDIR_P(${builddir}/$d)
+done
+
 echo "configure: creating build/smb_build/config.pm"
 cat >build/smb_build/config.pm<<CEOF
 # config.pm - Autogenerate by configure. DO NOT EDIT!
@@ -107,15 +169,30 @@ $SMB_INFO_LIBRARIES
 CEOF
 
 AC_OUTPUT_COMMANDS(
-[test "x$ac_abs_srcdir" != "x$ac_abs_builddir" && 
- (cd $builddir; 
-       test -d heimdal || cp -r $srcdir/heimdal $builddir/
-       test -d heimdal_build || cp -r $srcdir/heimdal_build $builddir/
-       test -d build || samba_builddir="$builddir" samba_srcdir="$srcdir" $PERL $srcdir/script/buildtree.pl
-       test -f $builddir/include/smb.h || cp $srcdir/include/smb.h $builddir/include
+[
+test "x$ac_abs_srcdir" != "x$ac_abs_builddir" && (
+       cd $builddir;
+       # NOTE: We *must* use -R so we don't follow symlinks (at least on BSD
+       # systems).
+       test -d heimdal || cp -R $srcdir/heimdal $builddir/
+       test -d heimdal_build || cp -R $srcdir/heimdal_build $builddir/
+       test -d build || builddir="$builddir" \
+                       srcdir="$srcdir" \
+                       $PERL ${srcdir}/script/buildtree.pl
  )
-$PERL -I${builddir} -I${srcdir} -I${srcdir}/build ${srcdir}/build/smb_build/main.pl || exit $?],[
-PERL="$PERL";export PERL;export srcdir; export builddir;
+
+$PERL -I${builddir} -I${builddir}/build \
+    -I${srcdir} -I${srcdir}/build \
+    ${srcdir}/build/smb_build/main.pl || exit $?
+],
+[
+srcdir="$srcdir"
+builddir="$builddir"
+PERL="$PERL"
+
+export PERL
+export srcdir
+export builddir
 ])
 AC_OUTPUT