moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Do not check the host_os twice and if windres is available.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-04-17 12:11:33 +02:00
parent 918be06e06
commit 1ad97cc7ca
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-04-17 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Do not check the host_os twice and if windres is
available.
Reported by: Ray Satiro <raysatiro@yahoo.com>
2011-04-16 Ray Satiro <raysatiro@yahoo.com> 2011-04-16 Ray Satiro <raysatiro@yahoo.com>
2011-04-16 Giuseppe Scrivano <gscrivano@gnu.org> 2011-04-16 Giuseppe Scrivano <gscrivano@gnu.org>

32
configure.ac
View File

@ -220,8 +220,6 @@ WGET_NANOSLEEP
WGET_POSIX_CLOCK WGET_POSIX_CLOCK
WGET_NSL_SOCKET WGET_NSL_SOCKET
AM_CONDITIONAL(HAVE_WINDRES, env windres > /dev/null)
dnl Deal with specific hosts dnl Deal with specific hosts
case $host_os in case $host_os in
*mingw32* ) *mingw32* )
@ -256,25 +254,21 @@ AS_IF([test x"$with_ssl" = xopenssl], [
then then
AC_CHECK_LIB(ssl32, SSL_connect,, AC_CHECK_LIB(ssl32, SSL_connect,,
AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found])) 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_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
else else
case $host_os in LIBS+=' -lgdi32'
*mingw32* )
LIBS+=' -lgdi32'
;;
esac
dnl fallback and test static libs dnl fallback and test static libs
AC_CHECK_LIB(crypto, EVP_MD_CTX_init,,,) AC_CHECK_LIB(crypto, EVP_MD_CTX_init,,,)
if test x"$ac_cv_lib_crypto_EVP_MD_CTX_init" != xno if test x"$ac_cv_lib_crypto_EVP_MD_CTX_init" != xno
then then
AC_CHECK_LIB(ssl, SSL_connect,, AC_MSG_ERROR([openssl not found])) AC_CHECK_LIB(ssl, SSL_connect,, AC_MSG_ERROR([openssl not found]))
AC_MSG_NOTICE([Enabling support for SSL via OpenSSL]) AC_MSG_NOTICE([Enabling support for SSL via OpenSSL])
else else
AC_MSG_ERROR([openssl not found: shared (eay32/ssl32) or static (crypto/ssl) libs needed]) AC_MSG_ERROR([openssl not found: shared (eay32/ssl32) or static (crypto/ssl) libs needed])
fi fi
fi fi
dnl add zdll lib as dep for above tests? dnl add zdll lib as dep for above tests?
;; ;;