bzr-version-gen: consider only the last tag.

[wget] / configure.ac

diff --git a/configure.ac b/configure.ac
index a755a9d42e3651f6f335004c20f21d345ba054c2..d47303a5c6ebecd3c4f6b69582d1d3220cedc848 100644 (file)
--- 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],
@@ -220,8 +221,6 @@ WGET_NANOSLEEP
 WGET_POSIX_CLOCK
 WGET_NSL_SOCKET
 
-AM_CONDITIONAL(HAVE_WINDRES, env windres > /dev/null)
-
 dnl Deal with specific hosts
 case $host_os in
   *mingw32* )
@@ -256,26 +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
-
-        case $host_os in
-            *mingw32* )
-                LIBS+=' -lgdi32'
-            ;;
-        esac
-
-                   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_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
+          
+        else
+          LIBS+=' -lgdi32'
+          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])
-        else
-                       AC_MSG_ERROR([openssl not found: shared (eay32/ssl32) or static (crypto/ssl) libs needed])
-                   fi
-    fi
-               
+          else
+            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?
       ;;
       *)
@@ -304,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?