[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  f346079... s4:tls: fix the build on Solaris
      from  4deaa84... Fixed a problem with duplicate values of allowedAttributesEffective.

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


- Log -----------------------------------------------------------------
commit f34607908367cce84fa9d8331c924135583359e6
Author: Brian Lu <brian.lu at sun.com>
Date:   Tue Dec 15 12:56:23 2009 +0100

    s4:tls: fix the build on Solaris
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 709a095..8a5b996 100644
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -41,5 +41,8 @@ if test x$use_gnutls = xyes; then
 	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)
+	# On Solaris libgcrypt.so has a bug and seems to be not linked
+	# to libgpg-error.so, so we need to manually add them...
+	AC_CHECK_LIB_EXT(gpg-error, GCRYPT_LIBS, gpg_err_code_from_errno)
 	SMB_EXT_LIB(GCRYPT, $GCRYPT_LIBS)
 fi


-- 
Samba Shared Repository