r24872: Use torture API a bit more

[kai/samba.git] / source4 / configure.ac

diff --git a/source4/configure.ac b/source4/configure.ac
index c547d7740a1629fade837923f44ede23fd0e0ef0..c947a1629a8ed714288ae65b0c1300cd0abbf771 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -25,8 +25,26 @@ 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(nsswitch/nsstest.m4)
+
+#SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0,
+#                         [samba_cv_internal_talloc=no],
+#                         [samba_cv_internal_talloc=yes])
+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(LIBTDB, tdb >= 1.1.0,
+#                         [samba_cv_internal_tdb=no],
+#                         [samba_cv_internal_tdb=yes])
+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/ldb/sqlite3.m4)
 m4_include(lib/ldb/libldb.m4)
 m4_include(lib/tls/config.m4)
@@ -36,7 +54,6 @@ dnl m4_include(auth/kerberos/config.m4)
 
 m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
-m4_include(lib/registry/config.m4)
 m4_include(scripting/swig/config.m4)
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
@@ -79,6 +96,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!
@@ -108,15 +129,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