[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1169-gca1653e

[Jeremy Allison]

The branch, master has been updated
       via  ca1653e830f8340f6188bbfa9fb2cb00e9e84fca (commit)
       via  a028e9640b54554f4ae036f46cc16ae73f00884e (commit)
      from  28fb708ba0bf3c81e54b1f99a8f56d671e62a047 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ca1653e830f8340f6188bbfa9fb2cb00e9e84fca
Merge: a028e9640b54554f4ae036f46cc16ae73f00884e 28fb708ba0bf3c81e54b1f99a8f56d671e62a047
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 24 15:28:06 2009 -0800

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit a028e9640b54554f4ae036f46cc16ae73f00884e
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 24 15:27:47 2009 -0800

    Make S4 build on OpenSolaris.
    Jeremy.

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

Summary of changes:
 source4/lib/tls/config.m4 |    2 ++
 source4/lib/tls/config.mk |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 0bafc5d..c46a009 100644
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -40,4 +40,6 @@ if test x$use_gnutls = xyes; then
 	AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
 	AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
 	AC_CHECK_HEADERS(gcrypt.h)
+	AC_CHECK_LIB_EXT(gcrypt, GCRYPT_LIBS, gcry_control)
+	SMB_EXT_LIB(GCRYPT, $GCRYPT_LIBS)
 fi
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
index ff1eedf..0e1978c 100644
--- a/source4/lib/tls/config.mk
+++ b/source4/lib/tls/config.mk
@@ -1,5 +1,5 @@
 [SUBSYSTEM::LIBTLS]
 PUBLIC_DEPENDENCIES = \
-		LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba_socket
+		LIBTALLOC GNUTLS GCRYPT LIBSAMBA-HOSTCONFIG samba_socket
 
 LIBTLS_OBJ_FILES = $(addprefix $(libtlssrcdir)/, tls.o tlscert.o)


-- 
Samba Shared Repository