gnutls.h is now an optional dependency.

Sebastiano Merlino · Sebastiano Merlino · commit 000979b6b535 · 2012-04-13T22:11:21.000+02:00
PKG_CHECK_MODULES is now used (instead of simple CHECK_LIB) to find out if libmicrohttpd is installed
diff --git a/configure.ac b/configure.ac
@@ -58,13 +58,14 @@ AC_CHECK_HEADER([regex.h],[],[AC_MSG_ERROR("regex.h not found")])
 AC_CHECK_HEADER([sys/stat.h],[],[AC_MSG_ERROR("sys/stat.h not found")])
 AC_CHECK_HEADER([sys/types.h],[],[AC_MSG_ERROR("sys/types.h not found")])
 AC_CHECK_HEADER([arpa/inet.h],[],[AC_MSG_ERROR("arpa/inet.h not found")])
-AC_CHECK_HEADER([gnutls/gnutls.h],[],[AC_MSG_ERROR("gnutls/gnutls.h not found")])
 AC_CHECK_HEADER([signal.h],[],[AC_MSG_ERROR("signal.h not found")])
 
+AC_CHECK_HEADER([gnutls/gnutls.h],[have_gnutls="yes"],[AC_MSG_WARN("gnutls/gnutls.h not found. TLS will be disabled"); have_gnutls="no"])
+
 # Checks for libmicrohttpd
-#PKG_CHECK_MODULES([LIBMICROHTTPD],[libmicrohttpd >= 0.9.9],[],[AC_MSG_ERROR("libmicrohttpd not present or too old - install libmicrohttpd >= 0.9.9")])
-AC_CHECK_HEADER([microhttpd.h],[],[AC_MSG_ERROR("Microhttpd header files not found. Please use a version >= 0.9.9.")])
-AC_CHECK_LIB([microhttpd],[MHD_start_daemon],[],[AC_MSG_ERROR("Microhttpd header files not found. Please use a version >= 0.9.9.")])
+PKG_CHECK_MODULES([LIBMICROHTTPD],[libmicrohttpd >= 0.9.9],[],[AC_MSG_ERROR("libmicrohttpd not present or too old - install libmicrohttpd >= 0.9.9")])
+#AC_CHECK_HEADER([microhttpd.h],[],[AC_MSG_ERROR("Microhttpd header files not found. Please use a version >= 0.9.9.")])
+#AC_CHECK_LIB([microhttpd],[MHD_start_daemon],[],[AC_MSG_ERROR("Microhttpd header files not found. Please use a version >= 0.9.9.")])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
@@ -138,6 +139,10 @@ else
     AM_CXXFLAGS="$AM_CXXFLAGS -O3"
 fi
 
+if test x"have_gnutls" = x"yes"; then
+    AM_CXXFLAGS="$AM_CXXFLAGS -DHAVE_GNUTLS"
+fi
+
 AC_MSG_CHECKING([whether to use c++0x std classes])
 AC_ARG_ENABLE([cpp0x],
               [AS_HELP_STRING([--enable-cpp0x],
@@ -378,5 +383,6 @@ AC_MSG_NOTICE([Configuration Summary:
   License         :  LGPL only
   Languages       :  ${LANGUAGES}
   Debug	          :  ${debugit}
+  TLS Enabled     :  ${have_gnutls}
   C++0x           :  ${cpp0x}
 ])
diff --git a/src/Webserver.cpp b/src/Webserver.cpp
@@ -328,8 +328,10 @@ bool Webserver::start(bool blocking)
 		iov.push_back(gen(MHD_OPTION_HTTPS_PRIORITIES, 0, (void*)httpsPriorities.c_str()));
 	if(digestAuthRandom != "")
 		iov.push_back(gen(MHD_OPTION_DIGEST_AUTH_RANDOM, digestAuthRandom.size(), (char*)digestAuthRandom.c_str()));
+#ifdef HAVE_GNUTLS
 	if(credType != HttpUtils::NONE)
 		iov.push_back(gen(MHD_OPTION_HTTPS_CRED_TYPE, credType));
+#endif
 
 	iov.push_back(gen(MHD_OPTION_END, 0, NULL ));
 
diff --git a/src/httpserver/HttpUtils.hpp b/src/httpserver/HttpUtils.hpp
@@ -27,7 +27,9 @@
 #include <vector>
 #include <algorithm>
 #include <exception>
+#ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
+#endif
 
 namespace httpserver {
 namespace http {
@@ -46,12 +48,14 @@ class HttpUtils
 
 	enum CredType_T 
 	{
-		NONE = -1,
-		CERTIFICATE = GNUTLS_CRD_CERTIFICATE,
+		NONE = -1
+#ifdef HAVE_GNUTLS
+		,CERTIFICATE = GNUTLS_CRD_CERTIFICATE,
 		ANON = GNUTLS_CRD_ANON,
 		SRP = GNUTLS_CRD_SRP,
 		PSK = GNUTLS_CRD_PSK,
 		IA = GNUTLS_CRD_IA
+#endif
 	};
 
     enum StartMethod_T
