Fix openssl detection under Windows.

[wget] / configure.ac

diff --git a/configure.ac b/configure.ac
index 205b6533853aca5c1c48da214b194c6b04d1a217..e16f2cb310419eefff1fabdbf1020990d7b93fad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -223,11 +223,12 @@ 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, '-lws2_32 -lgdi32')
+    LIBS+='-lws2_32 -lgdi32'

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

+

 dnl
 dnl Checks for libraries.
 dnl
 dnl
 dnl Checks for libraries.
 dnl


@@ -241,29 +242,17 @@ AS_IF([test x"$with_ssl" = xopenssl], [
       AC_CHECK_LIB(dl, shl_load)
     ])
 
       AC_CHECK_LIB(dl, shl_load)
     ])
 

-    dnl Now actually check for -lssl
-    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-  #include <openssl/ssl.h>
-  #include <openssl/x509.h>
-  #include <openssl/err.h>
-  #include <openssl/rand.h>
-  #include <openssl/des.h>
-  #include <openssl/md4.h>
-  #include <openssl/md5.h>
-    ], [SSL_library_init ()])
-    if test x"$LIBSSL" != x
-    then
-      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
-      AC_LIBOBJ([openssl])
-    elif test x"$with_ssl" != x
-    then
-      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
-    fi
+    AC_CHECK_LIB(z, compress)
+    AC_CHECK_LIB(crypto, EVP_MD_CTX_init)
+    AC_CHECK_LIB(ssl, ERR_func_error_string,,
+                AC_MSG_ERROR([openssl development libraries not found]))
+   AC_LIBOBJ([openssl])

 ], [
   # --with-ssl is not gnutls: check if it's no
   AS_IF([test x"$with_ssl" != xno], [
     dnl Now actually check for -lssl
 
 ], [
   # --with-ssl is not gnutls: check if it's no
   AS_IF([test x"$with_ssl" != xno], [
     dnl Now actually check for -lssl
 

+    AC_CHECK_LIB(z, compress)

     AC_CHECK_LIB(gpg-error, gpg_err_init)
     AC_CHECK_LIB(gcrypt, gcry_control)
     AC_CHECK_LIB(gnutls, main)
     AC_CHECK_LIB(gpg-error, gpg_err_init)
     AC_CHECK_LIB(gcrypt, gcry_control)
     AC_CHECK_LIB(gnutls, main)