sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

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

Browse Source 
(This used to be commit c7757dd9ad)
This commit is contained in:
Jelmer Vernooij 2004-11-15 10:43:10 +00:00 committed by Gerald (Jerry) Carter
parent eac720f051
commit fd4c057f9f
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/build/smb_build/core.m4
View File

@ -58,6 +58,8 @@ $SMB_INFO_BINARIES
## End Binaries
#########################################
$SMB_INFO_ENABLES
smb_build_main(\%INPUT);
_SMB_ACEOF

1
source4/build/smb_build/input.pm
View File

@ -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;

2
source4/build/smb_build/main.pm
View File

@ -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});

21
source4/build/smb_build/public.m4
View File

@ -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\";"
])

2
source4/libcli/auth/gensec.m4
View File

@ -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)