diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-28 21:13:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:29 -0500 |
| commit | a4e7bf3a89a986f0055bb8b6c6890449ca405f39 (patch) | |
| tree | 7749f209fd32079a26abb237a2908dd4c6c51baf /source4/build/m4 | |
| parent | 5a67b508d8f8761f0a73c2f7a116be1693d73395 (diff) | |
| download | samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.gz samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.xz samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.zip | |
r11382: Require number of required M4 macros
Make MODULE handling a bit more like BINARY, LIBRARY and SUBSYSTEM
Add some more PUBLIC_HEADERS
(This used to be commit 875eb8f4cc658e6aebab070029fd499a726ad520)
Diffstat (limited to 'source4/build/m4')
| -rw-r--r-- | source4/build/m4/public.m4 | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 69bce86f4d6..89ea0f3853e 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -4,10 +4,6 @@ dnl Copyright (C) 2004 Stefan Metzmacher dnl Copyright (C) 2004-2005 Jelmer Vernooij dnl Published under the GPL dnl -dnl SMB_MODULE_DEFAULT(name,default_build) -dnl -dnl SMB_SUBSYSTEM_ENABLE(name,default_build) -dnl dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems) dnl dnl SMB_EXT_LIB_ENABLE(name,default_build) @@ -16,36 +12,15 @@ dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name) dnl dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) dnl -dnl SMB_BINARY_ENABLE(name,default_build) +dnl SMB_ENABLE(name,default_build) dnl dnl ####################################################### dnl ### And now the implementation ### dnl ####################################################### -dnl SMB_MODULE_DEFAULT(name,default_build) -AC_DEFUN([SMB_MODULE_DEFAULT], -[ - [SMB_MODULE_DEFAULT][$1]="$2" -SMB_INFO_ENABLES="$SMB_INFO_ENABLES -\$enabled{$1} = \"$2\";" -]) - -dnl SMB_SUBSYSTEM_ENABLE(name,default_build) -AC_DEFUN([SMB_SUBSYSTEM_ENABLE], -[ - [SMB_SUBSYSTEM_ENABLE_][$1]="$2" -SMB_INFO_ENABLES="$SMB_INFO_ENABLES -\$enabled{$1} = \"$2\";" -]) - dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems) AC_DEFUN([SMB_SUBSYSTEM], [ - - if test -z "$[SMB_SUBSYSTEM_ENABLE_][$1]"; then - [SMB_SUBSYSTEM_ENABLE_][$1]="YES"; - fi - if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then [SMB_SUBSYSTEM_NOPROTO_][$1]="NO"; fi @@ -148,10 +123,10 @@ LDFLAGS = $5 " ]) -dnl SMB_BINARY_ENABLE(name,default_build) -AC_DEFUN([SMB_BINARY_ENABLE], +dnl SMB_ENABLE(name,default_build) +AC_DEFUN([SMB_ENABLE], [ - [SMB_BINARY_ENABLE_][$1]="$2"; + [SMB_ENABLE_][$1]="$2"; SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{$1} = \"$2\";" |