By default use GNU TLS not OpenSSL.

diff --git a/ChangeLog b/ChangeLog
index da23aa82f6b803f4396e8e7de16022f8806f92dc..50f3d2d43ae86840cc8179c46db23405be94c845 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-22  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * configure.ac: By default use GNU TLS not OpenSSL.
+

 2010-06-17  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * windows: Remove directory.
 2010-06-17  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * windows: Remove directory.

diff --git a/configure.ac b/configure.ac
index 400cf989d53f848df38c8002c96519dd34481cf5..ffe55d35169e5cca2c895a2a507f6ee87f0ea244 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -232,21 +232,7 @@ dnl
 dnl Checks for libraries.
 dnl
 
 dnl Checks for libraries.
 dnl
 

-AS_IF([test x"$with_ssl" = xgnutls], [
-  dnl Now actually check for -lssl
-  AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
-#include <gnutls/gnutls.h>
-  ], [gnutls_global_init()])
-  if test x"$LIBGNUTLS" != x
-  then
-    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
-    AC_LIBOBJ([gnutls])
-  else
-    AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
-  fi
-], [
-  # --with-ssl is not gnutls: check if it's no
-  AS_IF([test x"$with_ssl" != xno], [
+AS_IF([test x"$with_ssl" = xopenssl], [

     dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
     dnl doesn't record its dependency on libdl, so we need to make sure
     dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
     dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
     dnl doesn't record its dependency on libdl, so we need to make sure
     dnl -ldl ends up in LIBS on systems that have it.  Most OSes use


@@ -271,10 +257,24 @@ AS_IF([test x"$with_ssl" = xgnutls], [
       AC_LIBOBJ([openssl])
     elif test x"$with_ssl" != x
     then
       AC_LIBOBJ([openssl])
     elif test x"$with_ssl" != x
     then

-      AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
+      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
+    fi
+], [
+  # --with-ssl is not gnutls: check if it's no
+  AS_IF([test x"$with_ssl" != xno], [
+    dnl Now actually check for -lssl
+    AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
+  #include <gnutls/gnutls.h>
+    ], [gnutls_global_init()])
+    if test x"$LIBGNUTLS" != x
+    then
+      AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
+      AC_LIBOBJ([gnutls])
+    else
+      AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])

     fi
   ]) # endif: --with-ssl == no?
     fi
   ]) # endif: --with-ssl == no?

-]) # endif: --with-ssl == gnutls?
+]) # endif: --with-ssl == openssl?

 
 
 dnl Enable NTLM if requested and if SSL is available.
 
 
 dnl Enable NTLM if requested and if SSL is available.