r3739: Remove a bunch of unused m4 macros

(This used to be commit 2a38b77a1d8674b46028214896e37747c4082f13)

6 files changed, 17 insertions, 171 deletions

diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 4d3a471bbf..928921f8fd 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -50,7 +50,10 @@ sub smb_build_main($)
 		"ntvfs/unixuid/config.mk",
 		"torture/config.mk",
 		"librpc/config.mk",
-		"client/config.mk");
+		"client/config.mk",
+		"libcli/libsmb.mk");
+
+	$| = 1;
 
 	for my $mkfile (@mkfiles) {
 		config_mk::import_file($SMB_BUILD_CTX{INPUT}, $mkfile);
diff --git a/source4/build/smb_build/public.m4 b/source4/build/smb_build/public.m4
index b271cd94fd..b90b3acdd6 100644
--- a/source4/build/smb_build/public.m4
+++ b/source4/build/smb_build/public.m4
@@ -9,25 +9,11 @@ dnl		1:name,
 dnl		2:default_build
 dnl		)
 dnl
-dnl SMB_MODULE	( 
-dnl		1:name,
-dnl		2:subsystem,
-dnl		3:default_build,
-dnl		4:init_obj_files,
-dnl		5:add_obj_files,
-dnl		6:required_libraries,
-dnl		7:required_subsystems
-dnl		)
-dnl
 dnl SMB_SUBSYSTEM_ENABLE(
 dnl		1:name,
 dnl		2:default_build
 dnl		)
 dnl
-dnl SMB_SUBSYSTEM_NOPROTO(
-dnl		1:name
-dnl		)
-dnl
 dnl SMB_SUBSYSTEM(
 dnl		1:name,
 dnl		2:init_obj_files,
@@ -59,30 +45,11 @@ dnl		1:name,
 dnl		2:default_build
 dnl		)
 dnl
-dnl SMB_LIBRARY(
-dnl		1:name,
-dnl		2:major_version
-dnl		3:minor_version
-dnl		4:release_version
-dnl		5:obj_files,
-dnl		6:required_libraries,
-dnl		7:required_subsystems
-dnl		)
-dnl
 dnl SMB_BINARY_ENABLE(
 dnl		1:name,
 dnl		2:default_build
 dnl		)
 dnl
-dnl SMB_BINARY(
-dnl		1:name,
-dnl		2:build_targets,
-dnl		3:install_path
-dnl		4:obj_files,
-dnl		5:required_libraries,
-dnl		6:required_subsystems
-dnl		)
-dnl
 dnl SMB_MAKE_TARGET(
 dnl		1:name
 dnl		2:calledname
@@ -119,52 +86,6 @@ SMB_INFO_MODULES="$SMB_INFO_MODULES
 \$INPUT{$1}{DEFAULT_BUILD} = \"$2\";"
 ])
 
-dnl SMB_MODULE	( 
-dnl		1:name,
-dnl		2:subsystem,
-dnl		3:default_build,
-dnl		4:init_obj_files,
-dnl		5:add_obj_files,
-dnl		6:required_libs,
-dnl		7:required_subsystems
-dnl		)
-AC_DEFUN([SMB_MODULE],
-[
-
-	if test -z "$[SMB_MODULE_DEFAULT_][$1]"; then
-		[SMB_MODULE_DEFAULT_][$1]=$3
-	fi
-	
-	if test "$[SMB_MODULE_][$1]"; then
-		[SMB_MODULE_][$1]=$[SMB_MODULE_][$1]
-	elif test "$[SMB_MODULE_]translit([$2], [A-Z], [a-z])" -a x"$[SMB_MODULE_DEFAULT_][$1]" != xNOT; then
-		[SMB_MODULE_][$1]=$[SMB_MODULE_]translit([$2], [A-Z], [a-z])
-	else
-		[SMB_MODULE_][$1]="DEFAULT";
-	fi
-
-SMB_INFO_MODULES="$SMB_INFO_MODULES
-###################################
-# Start MODULE $1
-
-\$INPUT{$1} = {
-	  TYPE => "MODULE",
-	  NAME => \"$1\",
-	  SUBSYSTEM => \"$2\",
-	  DEFAULT_BUILD => \"$[SMB_MODULE_DEFAULT_][$1]\",
-	  INIT_OBJ_FILES => ][STR2ARRAY([$4])][,
-	  ADD_OBJ_FILES => ][STR2ARRAY([$5])][,
-	  REQUIRED_LIBRARIES => ][STR2ARRAY([$6])][,
-	  REQUIRED_SUBSYSTEMS => ][STR2ARRAY([$7])][,
-	  CHOSEN_BUILD => \"$[SMB_MODULE_][$1]\"
-};
-
-#
-# End MODULE $1
-###################################
-"
-])
-
 dnl SMB_SUBSYSTEM_ENABLE(
 dnl		1:name,
 dnl		2:default_build
@@ -176,14 +97,6 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 \$INPUT{$1}{ENABLE} = \"$2\";"
 ])
 
-dnl SMB_SUBSYSTEM_NOPROTO(
-dnl		1:name
-dnl		)
-AC_DEFUN([SMB_SUBSYSTEM_NOPROTO],
-[
-	[SMB_SUBSYSTEM_NOPROTO_][$1]="YES"
-])
-
 dnl SMB_SUBSYSTEM(
 dnl		1:name,
 dnl		2:init_obj_files,
@@ -330,41 +243,6 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 \$INPUT{$1}{ENABLE} = \"$2\";"
 ])
 
-dnl SMB_LIBRARY(
-dnl		1:name,
-dnl		2:major_version
-dnl		3:minor_version
-dnl		4:release_version
-dnl		5:obj_files,
-dnl		6:required_libs,
-dnl		7:required_subsystems
-dnl		)
-AC_DEFUN([SMB_LIBRARY],
-[
-
-	if test -z "$[SMB_LIBRARY_ENABLE_][$1]"; then
-		[SMB_LIBRARY_ENABLE_][$1]="NO";
-	fi
-
-SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
-###################################
-# Start Library $1
-\$INPUT{$1} = {
-	TYPE => \"LIBRARY\",
-	NAME => \"$1\",
-	MAJOR_VERSION => \"$2\",
-	MINOR_VERSION => \"$3\",
-	RELEASE_VERSION => \"$4\",
-	OBJ_FILES => ][STR2ARRAY([$5])][,
-	REQUIRED_LIBRARIES => ][STR2ARRAY([$6])][,
-	REQUIRED_SUBSYSTEMS => ][STR2ARRAY([$7])][,
-	ENABLE => \"$[SMB_LIBRARY_ENABLE_][$1]\"
-};
-# End Library $1
-###################################
-"
-])
-
 dnl SMB_BINARY_ENABLE(
 dnl		1:name,
 dnl		2:default_build
@@ -377,39 +255,6 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 \$INPUT{$1}{ENABLE} = \"$2\";"
 ])
 
-dnl SMB_BINARY(
-dnl		1:name,
-dnl		2:build_targets,
-dnl		3:install_path
-dnl		4:objfiles,
-dnl		5:required_libs,
-dnl		6:required_subsystems
-dnl		)
-AC_DEFUN([SMB_BINARY],
-[
-
-	if test -z "$[SMB_BINARY_ENABLE_][$1]"; then
-		[SMB_BINARY_ENABLE_][$1]="YES";
-	fi
-
-SMB_INFO_BINARIES="$SMB_INFO_BINARIES
-###################################
-# Start Binary $1
-\$INPUT{$1} = {
-	TYPE => \"BINARY\",
-	NAME => \"$1\",
-	BUILD_TARGETS => ][STR2ARRAY([$2])][,
-	INSTALL_PATH => ][STR2ARRAY([$3])][,
-	OBJ_FILES => ][STR2ARRAY([$4])][,
-	REQUIRED_LIBRARIES => ][STR2ARRAY([$5])][,
-	REQUIRED_SUBSYSTEMS => ][STR2ARRAY([$6])][,
-	ENABLE => \"$[SMB_BINARY_ENABLE_][$1]\"
-};
-# End Binary $1
-###################################
-"
-])
-
 dnl SMB_MAKE_TARGET(
 dnl		1:name
 dnl		2:calledname
diff --git a/source4/configure.in b/source4/configure.in
index 78610dd9fd..c0552a194b 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -20,7 +20,6 @@ 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)
diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index feb78a016b..97025fa6c4 100644
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -772,14 +772,14 @@ NTSTATUS gensec_krb5_init(void)
 {
 	NTSTATUS ret;
 
-	ret = register_backend("gensec", &gensec_krb5_security_ops);
+	ret = gensec_register(&gensec_krb5_security_ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' gensec backend!\n",
 			gensec_krb5_security_ops.name));
 		return ret;
 	}
 
-	ret = register_backend("gensec", &gensec_ms_krb5_security_ops);
+	ret = gensec_register(&gensec_ms_krb5_security_ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' gensec backend!\n",
 			gensec_krb5_security_ops.name));
diff --git a/source4/libcli/libsmb.m4 b/source4/libcli/libsmb.m4
deleted file mode 100644
index 9293ea2038..0000000000
--- a/source4/libcli/libsmb.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl # LIBSMB subsystem
-
-SMB_SUBSYSTEM(LIBSMB,[],
-		[libcli/clireadwrite.o
-		libcli/cliconnect.o
-		libcli/clifile.o
-		libcli/clilist.o
-		libcli/clitrans2.o
-		libcli/climessage.o
-		libcli/clideltree.o],
-		[],
-		[LIBCLI LIBRPC SOCKET])
diff --git a/source4/libcli/libsmb.mk b/source4/libcli/libsmb.mk
new file mode 100644
index 0000000000..8d70888d5e
--- /dev/null
+++ b/source4/libcli/libsmb.mk
@@ -0,0 +1,11 @@
+dnl # LIBSMB subsystem
+
+[SUBSYSTEM::LIBSMB]
+REQUIRED_SUBSYSTEMS = LIBCLI LIBRPC SOCKET
+ADD_OBJ_LIST = libcli/clireadwrite.o \
+		libcli/cliconnect.o \
+		libcli/clifile.o \
+		libcli/clilist.o \
+		libcli/clitrans2.o \
+		libcli/climessage.o \
+		libcli/clideltree.o