r8826: Make configure generate config.mk files (with the external libraries

that were found) and a config.pm file (with all substitution variables)
(This used to be commit 52bb1374bbcfc9b9a6d098687bafe9021a1ee858)

1 files changed, 35 insertions, 144 deletions

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 2a6b4e3893..c70514bdb6 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -1,104 +1,46 @@
 dnl SMB Build System
 dnl ----------------
 dnl Copyright (C) 2004 Stefan Metzmacher
-dnl Copyright (C) 2004 Jelmer Vernooij
+dnl Copyright (C) 2004-2005 Jelmer Vernooij
 dnl Published under the GPL
 dnl
-dnl SMB_MODULE_DEFAULT(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_MODULE_DEFAULT(name,default_build)
 dnl
-dnl SMB_SUBSYSTEM_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_SUBSYSTEM_ENABLE(name,default_build)
 dnl
-dnl SMB_SUBSYSTEM(
-dnl		1:name,
-dnl		2:init_obj_files,
-dnl		3:add_obj_files,
-dnl		4:required_libraries,
-dnl		5:required_subsystems
-dnl		)
+dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
 dnl
-dnl SMB_EXT_LIB_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_EXT_LIB_ENABLE(name,default_build)
 dnl
-dnl SMB_EXT_LIB_FROM_PKGCONFIG(
-dnl		1:name,
-dnl		2:pkg-config name
-dnl		)
+dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name)
 dnl
-dnl SMB_EXT_LIB(
-dnl		1:name,
-dnl		2:libs,
-dnl		3:cflags,
-dnl		4:cppflags,
-dnl		5:ldflags
-dnl		)
+dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags)
 dnl
-dnl SMB_LIBRARY_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_LIBRARY_ENABLE(name,default_build)
 dnl
-dnl SMB_BINARY_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_BINARY_ENABLE(name,default_build)
 dnl
-dnl SMB_MAKE_TARGET(
-dnl		1:name
-dnl		2:calledname
-dnl		)
-dnl
-dnl SMB_ENV_CHECK(
-dnl		1:dummy
-dnl		)
-dnl
-dnl SMB_AC_OUTPUT(
-dnl		1: outputfile
-dnl		)
-
 dnl #######################################################
 dnl ### And now the implementation			###
 dnl #######################################################
 
-AC_DEFUN([STR2ARRAY], [@<:@ input::str2array(\"$1\") @:>@])
-
-
-dnl SMB_MODULE_DEFAULT(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_MODULE_DEFAULT(name,default_build)
 AC_DEFUN([SMB_MODULE_DEFAULT],
 [
 	[SMB_MODULE_DEFAULT][$1]="$2"
-SMB_INFO_MODULES="$SMB_INFO_MODULES
-\$INPUT{$1}{DEFAULT_BUILD} = \"$2\";"
+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+\$enabled{$1} = \"$2\";"
 ])
 
-dnl SMB_SUBSYSTEM_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_SUBSYSTEM_ENABLE(name,default_build)
 AC_DEFUN([SMB_SUBSYSTEM_ENABLE],
 [
 	[SMB_SUBSYSTEM_ENABLE_][$1]="$2"
-SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
-\$INPUT{$1}{ENABLE} = \"$2\";"
+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+\$enabled{$1} = \"$2\";"
 ])
 
-dnl SMB_SUBSYSTEM(
-dnl		1:name,
-dnl		2:init_obj_files,
-dnl		3:add_obj_files,
-dnl		4:required_libs,
-dnl		5:required_subsystems
-dnl		)
+dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
 AC_DEFUN([SMB_SUBSYSTEM],
 [
 
@@ -113,35 +55,25 @@ AC_DEFUN([SMB_SUBSYSTEM],
 SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1
-\$INPUT{$1} = {
-	TYPE => \"SUBSYSTEM\",
-	NAME => \"$1\",
-	INIT_OBJ_FILES => ][STR2ARRAY([$2])][,
-	ADD_OBJ_FILES => ][STR2ARRAY([$3])][,
-	REQUIRED_LIBRARIES => ][STR2ARRAY([$4])][,
-	REQUIRED_SUBSYSTEMS => ][STR2ARRAY([$5])][,
-	ENABLE => \"YES\"
-};
+@<:@SUBSYSTEM::$1@:>@
+INIT_OBJ_FILES = $2
+ADD_OBJ_FILES = $3
+REQUIRED_SUBSYSTEMS = $4
+ENABLE = YES
 # End Subsystem $1
 ###################################
 "
 ])
 
-dnl SMB_EXT_LIB_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_EXT_LIB_ENABLE(name,default_build)
 AC_DEFUN([SMB_EXT_LIB_ENABLE],
 [
 [SMB_EXT_LIB_ENABLE_][$1]="$2"
 SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-\$INPUT{EXT_LIB_$1}{ENABLE} = \"$2\";"
+\$enabled{EXT_LIB_$1} = \"$2\";"
 ])
 
-dnl SMB_EXT_LIB_FROM_PKGCONFIG(
-dnl		1:name,
-dnl		2:pkg-config name
-dnl )
+dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name)
 AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], 
 [
 	dnl Figure out the correct variables and call SMB_EXT_LIB()
@@ -201,76 +133,35 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
   	fi
 ])
 
-dnl SMB_EXT_LIB(
-dnl		1:name,
-dnl		2:libs,
-dnl		3:cflags,
-dnl		4:cppflags,
-dnl		5:ldflags
-dnl		)
+dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags)
 AC_DEFUN([SMB_EXT_LIB],
 [
 
 SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
 ###################################
 # Start Ext Lib $1
-\$INPUT{EXT_LIB_$1} = {
-	TYPE => \"EXT_LIB\",
-	NAME => \"EXT_LIB_$1\",
-	LIBS => ][STR2ARRAY([$2])][,
-	CFLAGS => ][STR2ARRAY([$3])][,
-	CPPFLAGS => ][STR2ARRAY([$4])][,
-	LDFLAGS => ][STR2ARRAY([$5])][
-};
+@<:@EXT_LIB::EXT_LIB_$1@:>@
+LIBS = $2
+CFLAGS = $3
+CPPFLAGS = $4
+LDFLAGS = $5
 # End Ext Lib $1
 ###################################
 "
 ])
 
-
-dnl SMB_LIBRARY_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_LIBRARY_ENABLE(name,default_build)
 AC_DEFUN([SMB_LIBRARY_ENABLE],
 [
 SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-\$INPUT{$1}{ENABLE} = \"$2\";"
+\$enabled{$1} = \"$2\";"
 ])
 
-dnl SMB_BINARY_ENABLE(
-dnl		1:name,
-dnl		2:default_build
-dnl		)
+dnl SMB_BINARY_ENABLE(name,default_build)
 AC_DEFUN([SMB_BINARY_ENABLE],
 [
 	[SMB_BINARY_ENABLE_][$1]="$2";
 
-SMB_INFO_BINARIES="$SMB_INFO_BINARIES
-\$INPUT{$1}{ENABLE} = \"$2\";"
-])
-
-dnl SMB_MAKE_TARGET(
-dnl		1:name
-dnl		2:calledname
-dnl		)
-AC_DEFUN([SMB_MAKE_TARGET],
-[
-	echo "#SMB_MAKE_TARGET TOTO"
-])
-
-dnl SMB_ENV_CHECK(
-dnl		1:dummy
-dnl		)
-AC_DEFUN([SMB_ENV_CHECK],
-[
-	_SMB_BUILD_ENV($1)
-])
-
-dnl SMB_AC_OUTPUT(
-dnl		1: outputfile
-dnl		)
-AC_DEFUN([SMB_AC_OUTPUT],
-[
-	AC_OUTPUT([$1],[],[_SMB_BUILD_CORE([[$1][.in]])])
+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+\$enabled{$1} = \"$2\";"
 ])