By default use GNU TLS not OpenSSL.

[wget] / configure.ac

diff --git a/configure.ac b/configure.ac
index b4bd386dfed833cca5702328eb48eb7a92e6e6b6..ffe55d35169e5cca2c895a2a507f6ee87f0ea244 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_CONFIG_SRCDIR([src/wget.h])
 dnl
 dnl Automake setup
 dnl
 dnl
 dnl Automake setup
 dnl

-AM_INIT_AUTOMAKE(dist-bzip2 dist-lzma 1.9)
+AM_INIT_AUTOMAKE([1.9])

 
 dnl
 dnl Get cannonical host
 
 dnl
 dnl Get cannonical host


@@ -223,7 +223,7 @@ WGET_NSL_SOCKET
 dnl Deal with specific hosts
 case $host_os in
   *mingw32* )
 dnl Deal with specific hosts
 case $host_os in
   *mingw32* )

-    AC_SUBST(W32LIBS, '-lwsock32 -lws2_32')
+    AC_SUBST(W32LIBS, '-lws2_32')

     AC_LIBOBJ([mswindows])
     ;;
 esac
     AC_LIBOBJ([mswindows])
     ;;
 esac


@@ -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.


@@ -301,9 +301,9 @@ dnl **********************************************************************
 
 dnl
 dnl We test for IPv6 by checking, in turn, for availability of
 
 dnl
 dnl We test for IPv6 by checking, in turn, for availability of

-dnl getaddrinfo, presence of the INET6 address/protocol family, and
-dnl the existence of struct sockaddr_in6.  If any of them is missing,
-dnl IPv6 is disabled, and the code reverts to old-style gethostbyname.
+dnl presence of the INET6 address/protocol family and the existence of
+dnl struct sockaddr_in6.  If any of them is missing, IPv6 is disabled,
+dnl and the code reverts to old-style gethostbyname.

 dnl
 dnl If --enable-ipv6 is explicitly specified on the configure command
 dnl line, we check for IPv6 and abort if not found.  If --disable-ipv6
 dnl
 dnl If --enable-ipv6 is explicitly specified on the configure command
 dnl line, we check for IPv6 and abort if not found.  If --disable-ipv6


@@ -338,13 +338,6 @@ AC_ARG_ENABLE(ipv6,
   ]
 )
 
   ]
 )
 

-if test "X$ipv6" = "Xyes"; then
-  AC_CHECK_FUNCS(getaddrinfo, [], [
-    AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)])
-    ipv6=no
-  ])
-fi
-

 if test "X$ipv6" = "Xyes"; then
   PROTO_INET6([], [
     AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family])
 if test "X$ipv6" = "Xyes"; then
   PROTO_INET6([], [
     AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family])


@@ -485,6 +478,6 @@ dnl Create output
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
                  po/Makefile.in tests/Makefile tests/WgetTest.pm
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
                  po/Makefile.in tests/Makefile tests/WgetTest.pm

-                 lib/Makefile windows/Makefile])
+                 lib/Makefile])

 AC_CONFIG_HEADERS([src/config.h])
 AC_OUTPUT
 AC_CONFIG_HEADERS([src/config.h])
 AC_OUTPUT