X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=configure.ac;h=d47303a5c6ebecd3c4f6b69582d1d3220cedc848;hb=5eb9c28b3192bfe3d83c07beb062c4a2f782eaf2;hp=88d498ecc3996f879ac093fc10199fb577e3f9ea;hpb=1ad97cc7caba5fc68a7ddf667c24d41c0d6dc50c;p=wget

diff --git a/configure.ac b/configure.ac
index 88d498ec..d47303a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,8 @@ dnl Process features.
 dnl
 
 AC_ARG_WITH(ssl,
-[[  --without-ssl           disable SSL autodetection]])
+[[  --without-ssl           disable SSL autodetection
+  --with-ssl={gnutls,openssl} specify the SSL backend.  GNU TLS is the default.]])
 
 AC_ARG_ENABLE(opie,
 [  --disable-opie          disable support for opie or s/key FTP login],
@@ -254,22 +255,22 @@ AS_IF([test x"$with_ssl" = xopenssl], [
         then
           AC_CHECK_LIB(ssl32, SSL_connect,,
                     AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
-		      AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
-		    else
-
+          AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
+          
+        else
           LIBS+=' -lgdi32'
-
-	  	    dnl fallback and test static libs
+          dnl fallback and test static libs
+          
           AC_CHECK_LIB(crypto, EVP_MD_CTX_init,,,)
-		      if test x"$ac_cv_lib_crypto_EVP_MD_CTX_init" != xno
-		      then
-              AC_CHECK_LIB(ssl, SSL_connect,, AC_MSG_ERROR([openssl not found]))
-              AC_MSG_NOTICE([Enabling support for SSL via OpenSSL])
+          if test x"$ac_cv_lib_crypto_EVP_MD_CTX_init" != xno
+          then
+            AC_CHECK_LIB(ssl, SSL_connect,, AC_MSG_ERROR([openssl not found]))
+            AC_MSG_NOTICE([Enabling support for SSL via OpenSSL])
           else
-		          AC_MSG_ERROR([openssl not found: shared (eay32/ssl32) or static (crypto/ssl) libs needed])
-		      fi
-      fi
-		
+            AC_MSG_ERROR([openssl not found: shared (eay32/ssl32) or static (crypto/ssl) libs needed])
+          fi
+          
+        fi
         dnl add zdll lib as dep for above tests?
       ;;
       *)
@@ -298,6 +299,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
     else
       AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
     fi
+
+    AC_CHECK_FUNCS(gnutls_priority_set_direct)
   ]) # endif: --with-ssl == no?
 ]) # endif: --with-ssl == openssl?