mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: make it work without PKG_CHECK_MODULES

Browse Source 
With commit c2f9b78 we added a new dependency on pkg-config for
developers which may be unwanted. This change make the configure script
still work as before if pkg-config isn't installed, it'll just use the
old zlib detection logic without pkg-config.

Reported-by: Marc Hörsken

Fixes #972
This commit is contained in:
Daniel Stenberg 2016-08-21 23:34:48 +02:00
parent fba9dec5c5
commit 95ded2c569
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -892,6 +892,8 @@ else
fi fi
if test -z "$OPT_ZLIB" ; then if test -z "$OPT_ZLIB" ; then
m4_ifdef([PKG_CHECK_MODULES], [
PKG_CHECK_MODULES([ZLIB], [zlib], PKG_CHECK_MODULES([ZLIB], [zlib],
[ LIBS="${ZLIB_LIBS} $LIBS" [ LIBS="${ZLIB_LIBS} $LIBS"
CPPFLAGS="${ZLIB_CFLAGS} $CPPFLAGS" CPPFLAGS="${ZLIB_CFLAGS} $CPPFLAGS"
@ -899,6 +901,7 @@ else
], ],
[ [
]) ])
])
if test -z "$HAVE_LIBZ"; then if test -z "$HAVE_LIBZ"; then