moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

use pkg-config to check openssl deps if available 

Newer versions of these packages ship with pkg-config files, so if we can
detect it via those, do so.  If that fails, fall back to the old methods.
This commit is contained in:
Mike Frysinger 2014-10-27 14:55:24 -04:00 committed by Giuseppe Scrivano
parent 47d0d4c331
commit 5ae5d2eaeb
2 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,6 +9,9 @@
* configure.ac: Use pkg-config to check for pcre presence and
fallback to the previous code if that doesn't work.
* configure.ac: Use pkg-config to check for openssl presence and
fallback to the previous code if that doesn't work.
2014-07-28 Ángel González <keisial@gmail.com>
* contrib: Created contrib folder.
* contrib/tsocked-wget: Added wrapper for usage with socks proxy.

10
configure.ac
View File

@ -277,6 +277,14 @@ AS_IF([test x"$with_zlib" != xno], [
])
AS_IF([test x"$with_ssl" = xopenssl], [
PKG_CHECK_MODULES([OPENSSL], [openssl], [
AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
AC_LIBOBJ([openssl])
LIBS="$OPENSSL_LIBS $LIBS"
CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
LIBSSL=" " # ntlm check below wants this
AC_DEFINE([HAVE_LIBSSL], [1], [Define if using openssl.])
], [
dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
dnl doesn't record its dependency on libdl, so we need to make sure
dnl -ldl ends up in LIBS on systems that have it. Most OSes use
@ -332,7 +340,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
fi
])
])
], [
# --with-ssl is not openssl: check if it's no
AS_IF([test x"$with_ssl" != xno], [