[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-726-g4cc93a9

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  4cc93a98f984d322e41f403169cfa4945b469935 (commit)
      from  3b9b396292077b2d3ff1fb1712462b767cc2bf81 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 4cc93a98f984d322e41f403169cfa4945b469935
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 14:39:21 2008 +0100

    Make data about what subsystems/libraries are enabled available in the mkconfig.mk file.

-----------------------------------------------------------------------

Summary of changes:
 source/build/m4/public.m4 |    7 +++++--
 source/lib/tls/config.m4  |    4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 467b630..e8fbe4b 100644
--- a/source/build/m4/public.m4
+++ b/source/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/source/lib/tls/config.m4 b/source/lib/tls/config.m4
index 00d4194..8b6ad7d 100644
--- a/source/lib/tls/config.m4
+++ b/source/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)


-- 
Samba Shared Repository