r665: merge over the new build system from my tmp branch

to the main SAMBA_4_0 tree.

NOTE: that it's not completely ready, but it's functional:-)

metze
(This used to be commit c78a2ddb28ec50d6570a83b1f66f18a5c3621731)

1 files changed, 58 insertions, 4 deletions

diff --git a/source4/configure.in b/source4/configure.in
index 3b5640112ca..4bc3bea1d15 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -170,7 +170,7 @@ AC_ARG_WITH(exclude-modules,
 [ if test $withval; then
 	for i in `echo $withval | sed -e's/,/ /g'`
 	do
-		eval MODULE_$i=NOT
+		eval SMB_MODULE_$i=NOT
 	done
 fi ])
 
@@ -180,7 +180,7 @@ AC_ARG_WITH(shared-modules,
 [ if test $withval; then
 	for i in `echo $withval | sed -e's/,/ /g'`
 	do
-		eval MODULE_$i=SHARED
+		eval SMB_MODULE_$i=SHARED
 	done
 fi ])
 
@@ -190,7 +190,7 @@ AC_ARG_WITH(static-modules,
 [ if test $withval; then
 	for i in `echo $withval | sed -e's/,/ /g'`
 	do
-		eval MODULE_$i=STATIC
+		eval SMB_MODULE_$i=STATIC
 	done
 fi ])
 
@@ -214,6 +214,60 @@ sinclude(lib/registry/config.m4)
 sinclude(torture/config.m4)
 sinclude(scripting/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}])
+
+SMB_BINARY(smbd, [ALL], [SBIN],
+	[smbd/server.o
+	smbd/process.o
+	lib/server_mutex.o
+	smbd/build_options.o
+	smbd/rewrite.o],
+	[],
+	[PROCESS_MODEL SMB AUTH PASSDB NTVFS DCERPC LIBBASIC CONFIG LIBCMDLINE LIBSMB REGISTRY])
+
+SMB_BINARY(smbclient, [ALL], [BIN], 
+	[client/client.o
+	client/clitar.o
+	libcli/raw/clirewrite.o],
+	[],
+	[LIBSMB CONFIG LIBBASIC LIBCMDLINE])
+
+SMB_BINARY(ndrdump, [ALL], [BIN],
+	[utils/ndrdump.o
+	utils/rewrite.o],
+	[],
+	[LIBSMB CONFIG LIBBASIC LIBCMDLINE])
+
+SMB_BINARY(gentest, [ALL], [BIN],
+	[torture/gentest.o
+	torture/torture_util.o
+	libcli/raw/clirewrite.o],
+	[],
+	[LIBSMB CONFIG LIBBASIC LIBCMDLINE])
+
+SMB_BINARY(masktest, [ALL], [BIN], 
+	[torture/masktest.o
+	libcli/raw/clirewrite.o],
+	[],
+	[LIBSMB CONFIG LIBBASIC LIBCMDLINE])
+
+SMB_BINARY(locktest, [ALL], [BIN],
+	[torture/locktest.o
+	libcli/raw/clirewrite.o],
+	[],
+	[LIBSMB CONFIG LIBBASIC LIBCMDLINE])
+
 AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
 
 #################################################
@@ -243,4 +297,4 @@ dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
 CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
 CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
 
-AC_OUTPUT(Makefile)
+SMB_AC_OUTPUT(Makefile)