Skip to content

configure: simplify zlib check #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mistydemeo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

configure: simplify zlib check #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,28 +235,15 @@ dnl
if test "$MYZ" = "no"
then
AC_MSG_RESULT(Encoding: gzip/compress support disabled)
elif test "$MYZ" = ""; then
AC_CHECK_HEADERS(zlib.h, zfound=yes, zfound=locate)
if test $zfound = "yes"; then
AC_MSG_CHECKING([for ZLIB version])
AC_DEFINE([HAVE_ZLIB], 1, [Discovered ZLIB for gzip/compress encoding])
fi
else
AC_CHECK_HEADERS($MYZ/include/zlib.h, zfound=yes, zfound=locate)
if test $zfound = "locate"; then
dnl the user probably misunderstood the option....
for dir in /usr /usr/local /usr/local/ssl /usr/pkg /usr/lib/zlib /usr/include/zlib /usr/include; do
AC_CHECK_HEADERS($dir/include/zlib.h, zfound=yes, zfound=no)
if test $zfound = "yes" ; then
Z_CFLAGS=""
Z_LDFLAGS="-L$dir/lib"
Z_INCLUDE="-I$MYZ/include/zlib -I$MYZ/include"
Z_LIBS="-lz"
AC_MSG_CHECKING([for ZLIB version])
CPPFLAGS="$Z_INCLUDE"
AC_SUBST(Z_CFLAGS)
AC_SUBST(Z_INCLUDE)
AC_SUBST(Z_LDFLAGS)
AC_SUBST(Z_LIBS)
AC_DEFINE([HAVE_ZLIB], 1, [Discovered ZLIB for gzip/compress encoding])
break
fi
done
else
if test $zfound = "yes"; then
echo "found ssl in $MYZ"
Z_CFLAGS=""
Z_LDFLAGS="-L$MYZ/lib"
Expand Down