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

use pkg-config to check zlib deps if available

Browse Source 
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:21 -04:00 committed by Giuseppe Scrivano
parent ea97693b54
commit 297d040ce1
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-01 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Use pkg-config to check for zlib presence and
fallback to the previous code if that doesn't work.
2014-07-28 Ángel González <keisial@gmail.com> 2014-07-28 Ángel González <keisial@gmail.com>
* contrib: Created contrib folder. * contrib: Created contrib folder.
* contrib/tsocked-wget: Added wrapper for usage with socks proxy. * contrib/tsocked-wget: Added wrapper for usage with socks proxy.

8
configure.ac
View File

@ -263,9 +263,17 @@ dnl
dnl Checks for libraries. dnl Checks for libraries.
dnl dnl
PKG_PROG_PKG_CONFIG
AS_IF([test x"$with_zlib" != xno], [ AS_IF([test x"$with_zlib" != xno], [
with_zlib=yes with_zlib=yes
PKG_CHECK_MODULES([ZLIB], zlib, [
LIBS="$ZLIB_LIBS $LIBS"
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
AC_DEFINE([HAVE_LIBZ], [1], [Define if using zlib.])
], [
AC_CHECK_LIB(z, compress) AC_CHECK_LIB(z, compress)
])
]) ])
AS_IF([test x"$with_ssl" = xopenssl], [ AS_IF([test x"$with_ssl" = xopenssl], [