moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 20:15:03 -05:00
Code Issues Releases Wiki Activity

configure.ac: add zlib search with pkg-config

Browse Source 
Closes #956
This commit is contained in:
Dambaev Alexander 2016-08-11 23:49:48 +08:00 committed by Daniel Stenberg
parent 2c8ccdac14
commit c2f9b78afe
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -892,7 +892,17 @@ else
fi fi
if test -z "$OPT_ZLIB" ; then if test -z "$OPT_ZLIB" ; then
dnl check for the lib first without setting any new path, since many PKG_CHECK_MODULES(ZLIB, zlib,
[ LIBS="${ZLIB_LIBS} $LIBS"
CPPFLAGS="${ZLIB_CFLAGS} $CPPFLAGS"
HAVE_LIBZ="1"
],
[
])
if test -z "$HAVE_LIBZ"; then
dnl Check for the lib without setting any new path, since many
dnl people have it in the default path dnl people have it in the default path
AC_CHECK_LIB(z, inflateEnd, AC_CHECK_LIB(z, inflateEnd,
@ -901,7 +911,7 @@ else
LIBS="-lz $LIBS"], LIBS="-lz $LIBS"],
dnl if no lib found, try /usr/local dnl if no lib found, try /usr/local
[OPT_ZLIB="/usr/local"]) [OPT_ZLIB="/usr/local"])
fi
fi fi
dnl Add a nonempty path to the compiler flags dnl Add a nonempty path to the compiler flags