X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=configure.ac;h=76c6fa28a61a483871101e4ab64f78bb9ae6f95a;hb=2223ac8ce31ecd80112a023d0d56229bfc026b01;hp=45445fa3ad28935be2abe5098aea754f2ab5b1b1;hpb=f3c2686ef7b1c772a125813a64515c8ef0bf5f28;p=wget

diff --git a/configure.ac b/configure.ac
index 45445fa3..76c6fa28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,7 +197,7 @@ AC_FUNC_MMAP
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(strptime timegm vsnprintf vasprintf drand48)
 AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr wcwidth mbtowc)
-AC_CHECK_FUNCS(sleep symlink)
+AC_CHECK_FUNCS(sleep symlink utime)
 
 if test x"$ENABLE_OPIE" = xyes; then
   AC_LIBOBJ([ftp-opie])
@@ -246,6 +246,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
       AC_CHECK_LIB(dl, shl_load)
     ])
 
+    ssl_found=no
     case $host_os in
       *mingw32* )
         dnl prefer link to openssl dlls if possible. if not then fallback on static libs. if not then error
@@ -253,9 +254,11 @@ AS_IF([test x"$with_ssl" = xopenssl], [
         AC_CHECK_LIB(eay32, EVP_MD_CTX_init)
         if test x"$ac_cv_lib_eay32_EVP_MD_CTX_init" != xno
         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)])
+          AC_CHECK_LIB(ssl32, SSL_connect, [
+            ssl_found=yes
+            AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
+          ],
+          AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
           
         else
           LIBS+=' -lgdi32'
@@ -265,8 +268,10 @@ AS_IF([test x"$with_ssl" = xopenssl], [
       ;;
     esac
 
-    dnl Now actually check for -lssl
-    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+AS_IF([test x$ssl_found != xyes],
+[
+  dnl Now actually check for -lssl if it wasn't already found
+    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
   #include <openssl/ssl.h>
   #include <openssl/x509.h>
   #include <openssl/err.h>
@@ -279,13 +284,16 @@ AS_IF([test x"$with_ssl" = xopenssl], [
     then
       AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
       AC_LIBOBJ([openssl])
-      LIBS="-lopenssl $LIBS"
+      LIBS="$LIBSSL $LIBS"
     elif test x"$with_ssl" != x
     then
       AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
     fi
 
     AC_LIBOBJ([openssl])
+
+])
+
 ], [
   # --with-ssl is not gnutls: check if it's no
   AS_IF([test x"$with_ssl" != xno], [
@@ -303,7 +311,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
   then
     AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
     AC_LIBOBJ([gnutls])
-    LIBS="-lgnutls $LIBS"
+    LIBS="$LIBGNUTLS $LIBS"
   else
     AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
   fi
@@ -312,7 +320,6 @@ AS_IF([test x"$with_ssl" = xopenssl], [
   ]) # endif: --with-ssl == no?
 ]) # endif: --with-ssl == openssl?
 
-
 dnl Enable NTLM if requested and if SSL is available.
 if test x"$LIBSSL" != x
 then