diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-15 10:43:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:51 -0500 |
| commit | fd4c057f9f69fae8f75c003412f163cc965508c6 (patch) | |
| tree | bbb250b410294e4f9444f837274a61de8b4d6465 /source4 | |
| parent | eac720f0518acb055ba3f8a8946f3c026c1bd4ae (diff) | |
| download | samba-fd4c057f9f69fae8f75c003412f163cc965508c6.tar.gz samba-fd4c057f9f69fae8f75c003412f163cc965508c6.tar.bz2 samba-fd4c057f9f69fae8f75c003412f163cc965508c6.zip | |
r3751: Some fixes to using enable and disable for subsystems, ext libs and modules
(This used to be commit c7757dd9adc18549fa3f908c2714624ec3f91394)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/core.m4 | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/input.pm | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pm | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/public.m4 | 21 | ||||
| -rw-r--r-- | source4/libcli/auth/gensec.m4 | 2 |
5 files changed, 13 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\";" ]) diff --git a/source4/libcli/auth/gensec.m4 b/source4/libcli/auth/gensec.m4 index 768a2fae57..dd72d967dd 100644 --- a/source4/libcli/auth/gensec.m4 +++ b/source4/libcli/auth/gensec.m4 @@ -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) |