4 files changed, 11 insertions, 15 deletions
diff --git a/source4/build/smb_build/core.m4 b/source4/build/smb_build/core.m4
index a317a0eea3..1ef6eea3ad 100644
--- a/source4/build/smb_build/core.m4
+++ b/source4/build/smb_build/core.m4
@@ -58,6 +58,8 @@ $SMB_INFO_BINARIES
 ## End Binaries
 #########################################
 
+$SMB_INFO_ENABLES
+
 smb_build_main(\%INPUT);
 
 _SMB_ACEOF
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index ddeddc6ec1..3741ea89d4 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -51,6 +51,7 @@ sub check_subsystem($$)
 	my $subsys = shift;
 	if ($subsys->{ENABLE} ne "YES") {
 		printf("Subsystem: %s disabled!\n",$subsys->{NAME});
+		return;
 	}
 	
 	$subsys->{OUTPUT_TYPE} = $subsystem_output_type;
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 4329038221..97db91fc5f 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -61,6 +61,8 @@ sub smb_build_main($)
 		config_mk::import_file($SMB_BUILD_CTX{INPUT}, $mkfile);
 	}
 
+	print Data::Dumper::Dumper($SMB_BUILD_CTX{INPUT});
+
 	%{$SMB_BUILD_CTX{DEPEND}} = input::check(\%SMB_BUILD_CTX);
 	
 	%{$SMB_BUILD_CTX{OUTPUT}} = output::create_output($SMB_BUILD_CTX{DEPEND});
diff --git a/source4/build/smb_build/public.m4 b/source4/build/smb_build/public.m4
index b90b3acdd6..74f98b1c15 100644
--- a/source4/build/smb_build/public.m4
+++ b/source4/build/smb_build/public.m4
@@ -125,8 +125,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 	ADD_OBJ_FILES => ][STR2ARRAY([$3])][,
 	REQUIRED_LIBRARIES => ][STR2ARRAY([$4])][,
 	REQUIRED_SUBSYSTEMS => ][STR2ARRAY([$5])][,
-	ENABLE => \"$[SMB_SUBSYSTEM_ENABLE_][$1]\",
-	NOPROTO => \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\"
+	ENABLE => \"YES\"
 };
 # End Subsystem $1
 ###################################
@@ -139,9 +138,8 @@ dnl		2:default_build
 dnl		)
 AC_DEFUN([SMB_EXT_LIB_ENABLE],
 [
-	[SMB_EXT_LIB_ENABLE_][$1]="$2"
-
-SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
+[SMB_EXT_LIB_ENABLE_][$1]="$2"
+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
 \$INPUT{EXT_LIB_$1}{ENABLE} = \"$2\";"
 ])
 
@@ -209,10 +207,6 @@ dnl		)
 AC_DEFUN([SMB_EXT_LIB],
 [
 
-	if test -z "$[SMB_EXT_LIB_ENABLE_][$1]"; then
-		[SMB_EXT_LIB_ENABLE_][$1]="NO";
-	fi
-
 SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
 ###################################
 # Start Ext Lib $1
@@ -222,8 +216,7 @@ SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
 	LIBS => ][STR2ARRAY([$2])][,
 	CFLAGS => ][STR2ARRAY([$3])][,
 	CPPFLAGS => ][STR2ARRAY([$4])][,
-	LDFLAGS => ][STR2ARRAY([$5])][,
-	ENABLE => \"$[SMB_EXT_LIB_ENABLE_][$1]\"
+	LDFLAGS => ][STR2ARRAY([$5])][
 };
 # End Ext Lib $1
 ###################################
@@ -237,9 +230,7 @@ dnl		2:default_build
 dnl		)
 AC_DEFUN([SMB_LIBRARY_ENABLE],
 [
-	[SMB_LIBRARY_ENABLE_][$1]="$2"
-
-SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
 \$INPUT{$1}{ENABLE} = \"$2\";"
 ])
 
@@ -251,7 +242,7 @@ AC_DEFUN([SMB_BINARY_ENABLE],
 [
 	[SMB_BINARY_ENABLE_][$1]="$2";
 
-SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
+SMB_INFO_BINARIES="$SMB_INFO_BINARIES
 \$INPUT{$1}{ENABLE} = \"$2\";"
 ])