Skip to content

Commit

Permalink
configure: make it work without PKG_CHECK_MODULES
Browse files Browse the repository at this point in the history
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 curl#972
  • Loading branch information
bagder committed Aug 21, 2016
1 parent fba9dec commit 95ded2c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -892,13 +892,16 @@ else
fi

if test -z "$OPT_ZLIB" ; then
PKG_CHECK_MODULES([ZLIB], [zlib],

m4_ifdef([PKG_CHECK_MODULES], [
PKG_CHECK_MODULES([ZLIB], [zlib],
[ LIBS="${ZLIB_LIBS} $LIBS"
CPPFLAGS="${ZLIB_CFLAGS} $CPPFLAGS"
HAVE_LIBZ="1"
],
[
])
])

if test -z "$HAVE_LIBZ"; then

Expand Down

0 comments on commit 95ded2c

Please sign in to comment.