From 1ad97cc7caba5fc68a7ddf667c24d41c0d6dc50c Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 17 Apr 2011 12:11:33 +0200 Subject: [PATCH] Do not check the host_os twice and if windres is available. --- ChangeLog | 6 ++++++ configure.ac | 36 +++++++++++++++--------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ad5c4a4..1eeb82c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-17 Giuseppe Scrivano + + * configure.ac: Do not check the host_os twice and if windres is + available. + Reported by: Ray Satiro + 2011-04-16 Ray Satiro 2011-04-16 Giuseppe Scrivano diff --git a/configure.ac b/configure.ac index a755a9d4..88d498ec 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,25 +254,21 @@ 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_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 + 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 dnl add zdll lib as dep for above tests? ;; -- 2.39.2