From 4a0582438f79347a6233e3e2a30dae692cae655f Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 8 Jun 2008 19:16:26 -0400
Subject: Make it possible to disable gnutls at configure time, until someone
 will finally decide to fix it. (This used to be commit
 0671dce355432a2a4c08ab010831eadd73e4561e)

---
 source4/lib/tls/config.m4 | 61 ++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 8b6ad7dcbc..2af9192cca 100644
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -1,33 +1,44 @@
 ###############################
 # start SMB_EXT_LIB_GNUTLS
 # check for gnutls/gnutls.h and -lgnutls
-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)
-	AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
-	AC_CHECK_DECL(gnutls_x509_crt_set_version,  
-	              [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
-	#include <gnutls/gnutls.h>
-	#include <gnutls/x509.h>
-	])
-	if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
-		SMB_ENABLE(GNUTLS,YES)
-		AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,  
-		              [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
-	#include <gnutls/gnutls.h>
-	#include <gnutls/x509.h>
-	])
+use_gnutls=yes
+AC_ARG_ENABLE(gnutls,
+[  --enable-gnutls          Turn on gnutls support (default=yes)],
+    [if test x$enable_gnutls = xno; then
+        use_gnutls=no
+    fi])
+
+
+if test x$use_gnutls = xyes; then
+	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)
+		AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
+		AC_CHECK_DECL(gnutls_x509_crt_set_version,  
+		              [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
+		#include <gnutls/gnutls.h>
+		#include <gnutls/x509.h>
+		])
+		if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
+			SMB_ENABLE(GNUTLS,YES)
+			AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,  
+			              [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
+		#include <gnutls/gnutls.h>
+		#include <gnutls/x509.h>
+		])
+		fi
+		SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
+	fi
+	if test x$SMB_ENABLE_GNUTLS = xYES; then
+		#Some older versions have a different type name
+		AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"])
+		AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
+		AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
 	fi
-	SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
-fi
-if test x$SMB_ENABLE_GNUTLS = xYES; then
-	#Some older versions have a different type name
-	AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"])
-	AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
-	AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
 fi
 # end SMB_EXT_LIB_GNUTLS
 ###############################
-- 
cgit