svn commit: samba r3751 - in branches/SAMBA_4_0/source: build/smb_build libcli/auth

[jelmer at samba.org]

Author: jelmer
Date: 2004-11-15 10:43:10 +0000 (Mon, 15 Nov 2004)
New Revision: 3751

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3751

Log:
Some fixes to using enable and disable for subsystems, ext libs and modules

Modified:
   branches/SAMBA_4_0/source/build/smb_build/core.m4
   branches/SAMBA_4_0/source/build/smb_build/input.pm
   branches/SAMBA_4_0/source/build/smb_build/main.pm
   branches/SAMBA_4_0/source/build/smb_build/public.m4
   branches/SAMBA_4_0/source/libcli/auth/gensec.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/core.m4
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/core.m4	2004-11-15 08:51:31 UTC (rev 3750)
+++ branches/SAMBA_4_0/source/build/smb_build/core.m4	2004-11-15 10:43:10 UTC (rev 3751)
@@ -58,6 +58,8 @@
 ## End Binaries
 #########################################
 
+$SMB_INFO_ENABLES
+
 smb_build_main(\%INPUT);
 
 _SMB_ACEOF

Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm	2004-11-15 08:51:31 UTC (rev 3750)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm	2004-11-15 10:43:10 UTC (rev 3751)
@@ -51,6 +51,7 @@
 	my $subsys = shift;
 	if ($subsys->{ENABLE} ne "YES") {
 		printf("Subsystem: %s disabled!\n",$subsys->{NAME});
+		return;
 	}
 	
 	$subsys->{OUTPUT_TYPE} = $subsystem_output_type;

Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pm	2004-11-15 08:51:31 UTC (rev 3750)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pm	2004-11-15 10:43:10 UTC (rev 3751)
@@ -61,6 +61,8 @@
 		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});

Modified: branches/SAMBA_4_0/source/build/smb_build/public.m4
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/public.m4	2004-11-15 08:51:31 UTC (rev 3750)
+++ branches/SAMBA_4_0/source/build/smb_build/public.m4	2004-11-15 10:43:10 UTC (rev 3751)
@@ -125,8 +125,7 @@
 	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		)
 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 @@
 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 @@
 	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		)
 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 @@
 [
 	[SMB_BINARY_ENABLE_][$1]="$2";
 
-SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
+SMB_INFO_BINARIES="$SMB_INFO_BINARIES
 \$INPUT{$1}{ENABLE} = \"$2\";"
 ])
 

Modified: branches/SAMBA_4_0/source/libcli/auth/gensec.m4
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec.m4	2004-11-15 08:51:31 UTC (rev 3750)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec.m4	2004-11-15 10:43:10 UTC (rev 3751)
@@ -1,3 +1,5 @@
+SMB_MODULE_DEFAULT(gensec_krb5, NOT)
+
 if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then
 	/* enable this when krb5 is fully working */
 	SMB_MODULE_DEFAULT(gensec_krb5, NOT)