X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=configure.ac;h=bfdafce5c0ef019e45ebe5e29e6fd41033aab2d0;hb=1d9bb1c7b05d877f7dc2f8b537feada3f2c373a3;hp=a755a9d42e3651f6f335004c20f21d345ba054c2;hpb=918be06e06ba5b712299355884107b1bb2b5865a;p=wget diff --git a/configure.ac b/configure.ac index a755a9d4..bfdafce5 100644 --- a/configure.ac +++ b/configure.ac @@ -220,8 +220,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 +254,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? ;; *)