Merge branch 'singlereplace' into single

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

diff --git a/source4/configure.ac b/source4/configure.ac
index 34657cf6f91b96fe179863e13515526270711f98..3263073d4533c21becf2aeb018430ea931edf3bf 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])
 
@@ -12,7 +11,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
 
 # Configuration rules.
 m4_include(build/m4/env.m4)
-m4_include(lib/replace/samba.m4)
+m4_include(../replace/samba.m4)
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/config.m4)
 m4_include(lib/util/fault.m4)
@@ -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)
@@ -40,20 +41,20 @@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
        [
-               m4_include(lib/talloc/libtalloc.m4)
-               SMB_INCLUDE_MK(lib/talloc/config.mk)
+               m4_include(../talloc/libtalloc.m4)
+               SMB_INCLUDE_MK(../talloc/config.mk)
        ]
 )
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        [],
        [
-               m4_include(lib/tdb/libtdb.m4)
-               SMB_INCLUDE_MK(lib/tdb/config.mk)
+               m4_include(../tdb/libtdb.m4)
+               SMB_INCLUDE_MK(../tdb/config.mk)
        ]
 )
 
-SMB_INCLUDE_MK(lib/tdb/python.mk) 
+SMB_INCLUDE_MK(../tdb/python.mk) 
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
        [
@@ -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)
@@ -158,11 +159,11 @@ then
        builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
 fi
 
-CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
+CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
 
 SMB_WRITE_PERLVARS(build/smb_build/config.pm)
 
-../../source/echo "configure: creating config.mk"
+echo "configure: creating config.mk"
 cat >config.mk<<CEOF
 # config.mk - Autogenerated by configure, DO NOT EDIT!
 $SMB_INFO_EXT_LIBS
@@ -184,8 +185,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"