diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 14:39:21 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 14:41:28 +0100 |
| commit | b4c81c0c18d2354513600668d7980b0c7cdd94b8 (patch) | |
| tree | e4dd1820d2da0fcea3ce6b24352ee3953b4f61f5 /source4 | |
| parent | f890d1daea13b282c7cb655bd91709d9207a00c2 (diff) | |
| download | samba-b4c81c0c18d2354513600668d7980b0c7cdd94b8.tar.gz samba-b4c81c0c18d2354513600668d7980b0c7cdd94b8.tar.bz2 samba-b4c81c0c18d2354513600668d7980b0c7cdd94b8.zip | |
Make data about what subsystems/libraries are enabled available in the mkconfig.mk file.
(This used to be commit 4cc93a98f984d322e41f403169cfa4945b469935)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/m4/public.m4 | 7 | ||||
| -rw-r--r-- | source4/lib/tls/config.m4 | 4 |
2 files changed, 8 insertions, 3 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\";" ]) diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4 index 00d4194b3a..8b6ad7dcbc 100644 --- a/source4/lib/tls/config.m4 +++ b/source4/lib/tls/config.m4 @@ -1,7 +1,9 @@ ############################### # start SMB_EXT_LIB_GNUTLS # check for gnutls/gnutls.h and -lgnutls -SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls) +SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls, + [SMB_ENABLE_GNUTLS=YES], + [SMB_ENABLE_GNUTLS=NO]) if test x$SMB_ENABLE_GNUTLS = xNO; then AC_CHECK_HEADERS(gnutls/gnutls.h) |