Remove EJS tests.

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

diff --git a/source4/configure.ac b/source4/configure.ac
index 8671c1a35234d5405195d7f040c8979e696fa95b..cfae02bb6c11be683195c95c928ed5e49c61f61b 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -1,8 +1,7 @@
 dnl -*- mode: m4-mode -*-
 dnl Process this file with autoconf to produce a configure script.
 
-dnl disabled 2.53 requirement - we do work with 2.52 on suse 7.3 for example
-dnl AC_PREREQ(2.53)
+AC_PREREQ(2.54)
 
 AC_INIT([samba],[4],[samba-technical@samba.org])
 
@@ -25,10 +24,12 @@ 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/zlib.m4)
 m4_include(nsswitch/nsstest.m4)
 m4_include(pidl/config.m4)
 
 AC_CONFIG_FILES(lib/registry/registry.pc)
+AC_CONFIG_FILES(lib/events/events.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(librpc/ndr.pc)
 AC_CONFIG_FILES(lib/torture/torture.pc)
@@ -90,7 +91,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
 SMB_INCLUDE_MK(lib/ldb/python.mk) 
 
 m4_include(lib/tls/config.m4)
-m4_include(lib/events/config.m4)
+m4_include(lib/events/libevents.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
 m4_include(scripting/python/config.m4)
@@ -103,7 +104,6 @@ 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)
 
 #################################################
@@ -170,32 +170,7 @@ $SMB_INFO_SUBSYSTEMS
 $SMB_INFO_LIBRARIES
 CEOF
 
-AC_OUTPUT_COMMANDS(
-[
-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${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
-])
+SMB_BUILD_RUN(data.mk)
 AC_OUTPUT
 
 cmp include/config_tmp.h include/config.h >/dev/null 2>&1
@@ -209,8 +184,8 @@ SMB_WRITE_MAKEVARS(mkconfig.mk)
 if test $USESHARED = true
 then
        echo "To run binaries without installing, set the following environment variable:"
-       echo "$ac_cv_LIB_PATH_VAR=$builddir/bin/shared"
+       echo "$LIB_PATH_VAR=$builddir/bin/shared"
 fi
 
 echo
-echo "To build Samba, run $ac_cv_path_MAKE"
+echo "To build Samba, run $MAKE"