X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source4%2Fconfigure.in;h=752b7ad52f99ff772650ba61d7b53bce154b51c5;hp=78610dd9fdf63e1bf75f87c6594de80f5499b5ed;hb=f9447d2a17089178d311e03e398c25c749450f6d;hpb=8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71

diff --git a/source4/configure.in b/source4/configure.in
index 78610dd9fdf..752b7ad52f9 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -4,40 +4,44 @@ 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_INIT(include/includes.h)
+AC_INIT([samba],[],[samba-technical@samba.org])
+
+AC_CONFIG_SRCDIR([include/includes.h])
 AC_CONFIG_HEADER(include/config.h)
 
-sinclude(build/smb_build/env.m4)
-
-SMB_INCLUDE_M4(build/m4/rewrite.m4)
-
-SMB_INCLUDE_M4(lib/popt/config.m4)
-SMB_INCLUDE_M4(lib/iconv.m4)
-SMB_INCLUDE_M4(lib/socket/config.m4)
-SMB_INCLUDE_M4(lib/tdb/config.m4)
-SMB_INCLUDE_M4(lib/ldb/config.m4)
-SMB_INCLUDE_M4(lib/cmdline/config.m4)
-SMB_INCLUDE_M4(param/config.m4)
-SMB_INCLUDE_M4(libcli/auth/gensec.m4)
-SMB_INCLUDE_M4(libcli/config.m4)
-SMB_INCLUDE_M4(libcli/libsmb.m4)
-SMB_INCLUDE_M4(smbd/process_model.m4)
-SMB_INCLUDE_M4(lib/registry/config.m4)
-SMB_INCLUDE_M4(scripting/config.m4)
-SMB_INCLUDE_M4(gtk/config.m4)
-
-ALLLIBS_LIBS="$LIBS"
-ALLLIBS_CFLAGS="$CFLAGS"
-ALLLIBS_CPPFLAGS="$CPPFLAGS"
-ALLLIBS_LDFLAGS="$LDFLAGS"
-
-SMB_EXT_LIB_ENABLE(ALLLIBS,YES)
-
-SMB_EXT_LIB(ALLLIBS,
-		[${ALLLIBS_LIBS}],
-		[${ALLLIBS_CFLAGS}],
-		[${ALLLIBS_CPPFLAGS}],
-		[${ALLLIBS_LDFLAGS}])
+# Configuration rules.
+sinclude(build/m4/env.m4)
+sinclude(build/m4/rewrite.m4)
+sinclude(lib/replace/config.m4)
+sinclude(lib/replace/win32/config.m4)
+sinclude(lib/replace/repdir/config.m4)
+sinclude(heimdal_build/config.m4)
+sinclude(lib/popt/config.m4)
+sinclude(lib/charset/config.m4)
+sinclude(lib/socket/config.m4)
+sinclude(lib/netif/config.m4)
+sinclude(lib/talloc/config.m4)
+sinclude(lib/tdb/config.m4)
+sinclude(lib/ldb/sqlite3.m4)
+sinclude(lib/ldb/config.m4)
+sinclude(lib/tls/config.m4)
+sinclude(lib/events/config.m4)
+sinclude(lib/cmdline/config.m4)
+
+dnl disabled until we support external heimdal again
+dnl sinclude(auth/kerberos/config.m4)
+
+sinclude(auth/gensec/config.m4)
+sinclude(libcli/config.m4)
+sinclude(smbd/process_model.m4)
+sinclude(lib/registry/config.m4)
+sinclude(scripting/config.m4)
+sinclude(gtk/config.m4)
+sinclude(ntvfs/posix/config.m4)
+sinclude(lib/socket_wrapper/config.m4)
+sinclude(web_server/config.m4)
+sinclude(auth/config.m4)
+sinclude(kdc/config.m4)
 
 AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
 
@@ -64,6 +68,14 @@ AC_TRY_RUN([#include "${srcdir-.}/build/tests/summary.c"],
 builddir=`pwd`
 AC_SUBST(builddir)
 
+LIBS=`echo $LIBS | sed -e 's/ *//g'`
+if test x"$LIBS" != x""; then
+	echo "LIBS: $LIBS"
+	AC_MSG_WARN([the global \$LIBS variable contains some libraries!])
+	AC_MSG_WARN([this should not happen, please report to samba-technical@lists.samba.org!])
+	AC_MSG_ERROR([only _EXT macros from aclocal.m4 should be used!])
+fi
+
 dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 LIB_REMOVE_USR_LIB(LDFLAGS)
 LIB_REMOVE_USR_LIB(LIBS)
@@ -72,4 +84,32 @@ dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
 CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
 CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
 
-SMB_AC_OUTPUT(Makefile)
+echo "configure: creating config.pm"
+cat >config.pm<<CEOF
+# config.pm - Autogenerate by configure. DO NOT EDIT!
+
+package config;
+require Exporter;
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(%enabled %config);
+use strict;
+
+use vars qw(%enabled %config);
+
+%config = (AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [
+	AC_Var => '$AC_Var',])
+);
+
+$SMB_INFO_ENABLES
+1;
+CEOF
+
+echo "configure: creating config.mk"
+cat >config.mk<<CEOF
+# config.mk - Autogenerated by configure, DO NOT EDIT!
+$SMB_INFO_EXT_LIBS
+$SMB_INFO_SUBSYSTEMS
+$SMB_INFO_LIBRARIES
+CEOF
+
+AC_OUTPUT(Makefile,,[$PERL -Ibuild build/smb_build/main.pl])