diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 18:26:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 18:26:28 +0100 |
| commit | 5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c (patch) | |
| tree | a4032b21532f29b956b1bd08c3b2647251939d64 /source4/build/m4/public.m4 | |
| parent | a19534d2072ca7dc4c70767d02db58503678cfaa (diff) | |
| parent | 98fdbb61260b19bc97675336993f3fcb5f470f90 (diff) | |
| download | samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.tar.gz samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.tar.bz2 samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/Makefile
source/rules.mk
(This used to be commit fc9b9853124c8d172172f88e1e4939db5970df25)
Diffstat (limited to 'source4/build/m4/public.m4')
| -rw-r--r-- | source4/build/m4/public.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 467b63055c..e8fbe4b286 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -24,6 +24,7 @@ AC_DEFUN([SMB_SUBSYSTEM], MAKE_SETTINGS="$MAKE_SETTINGS $1_OBJ_FILES = $2 $1_CFLAGS = $4 +$1_ENABLE = YES " SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS @@ -46,6 +47,7 @@ MAKE_SETTINGS="$MAKE_SETTINGS $1_OBJ_FILES = $2 $1_CFLAGS = $6 $1_LDFLAGS = $7 +$1_ENABLE = YES " SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES @@ -162,8 +164,9 @@ PC_NAME = $6 dnl SMB_ENABLE(name,default_build) AC_DEFUN([SMB_ENABLE], [ - [SMB_ENABLE_][$1]="$2"; - + MAKE_SETTINGS="$MAKE_SETTINGS +$1_ENABLE = $2 +" SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{$1} = \"$2\";" ]) |