diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-11-02 07:15:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:17 -0500 |
| commit | 8867664ad2aea57d43a8547572af5de6db0968ba (patch) | |
| tree | 1e9303a88cc1da6a89d10a4215a705b2d202fe99 /source4/build/smb_build/public.m4 | |
| parent | a42142439aee9e75796e25cdf05e042174926abf (diff) | |
| download | samba-8867664ad2aea57d43a8547572af5de6db0968ba.tar.gz samba-8867664ad2aea57d43a8547572af5de6db0968ba.tar.bz2 samba-8867664ad2aea57d43a8547572af5de6db0968ba.zip | |
r3465: fix SMB_SUBSYSTEM_NOPROTO()
metze
(This used to be commit e12595a750ea3f5ccc1ca8e628b707c0753394d7)
Diffstat (limited to 'source4/build/smb_build/public.m4')
| -rw-r--r-- | source4/build/smb_build/public.m4 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source4/build/smb_build/public.m4 b/source4/build/smb_build/public.m4 index e3bbcf1eba..f45cf87cbb 100644 --- a/source4/build/smb_build/public.m4 +++ b/source4/build/smb_build/public.m4 @@ -276,7 +276,7 @@ dnl 1:name dnl ) AC_DEFUN([SMB_SUBSYSTEM_NOPROTO], [ - [SMB_SUBSYSTEM_NOPROTO_][$1]="1" + [SMB_SUBSYSTEM_NOPROTO_][$1]="YES" ]) dnl SMB_SUBSYSTEM( @@ -293,6 +293,10 @@ AC_DEFUN([SMB_SUBSYSTEM], [SMB_SUBSYSTEM_ENABLE_][$1]="YES"; fi + if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then + [SMB_SUBSYSTEM_NOPROTO_][$1]="NO"; + fi + SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS ################################### # Start Subsystem $1 @@ -303,7 +307,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS @{\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{REQUIRED_SUBSYSTEMS}} = str2array(\"$5\"); # \$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{ENABLE} = \"$[SMB_SUBSYSTEM_ENABLE_][$1]\"; -\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{NOPROTO}{$1} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\"; +\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{NOPROTO} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\"; # End Subsystem $1 ################################### " @@ -320,6 +324,10 @@ AC_DEFUN([SMB_SUBSYSTEM_MK], [SMB_SUBSYSTEM_ENABLE_][$1]="YES"; fi + if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then + [SMB_SUBSYSTEM_NOPROTO_][$1]="NO"; + fi + SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS ################################### # Start Subsystem $1 @@ -330,7 +338,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS @{\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{REQUIRED_SUBSYSTEMS}} = subsystem_get_array(\"$2\", \"$1\", \"REQUIRED_SUBSYSTEMS\"); # \$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{ENABLE} = \"$[SMB_SUBSYSTEM_ENABLE_][$1]\"; -\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{NOPROTO}{$1} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\"; +\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{NOPROTO} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\"; # End Subsystem $1 ################################### " |