Skip check for zlib if we have no zlib.h

This commit is contained in:
Harlan Stenn 2011-02-13 01:34:40 -05:00 committed by Nick Mathewson
parent 05a2c22fee
commit a317c068fe

View File

@ -60,6 +60,9 @@ AC_SEARCH_LIBS([inet_aton], [resolv])
AC_SEARCH_LIBS([clock_gettime], [rt]) AC_SEARCH_LIBS([clock_gettime], [rt])
AC_SEARCH_LIBS([sendfile], [sendfile]) AC_SEARCH_LIBS([sendfile], [sendfile])
AC_CHECK_HEADERS([zlib.h])
if test "x$ac_cv_header_zlib_h" = "xyes"; then
dnl Determine if we have zlib for regression tests dnl Determine if we have zlib for regression tests
dnl Don't put this one in LIBS dnl Don't put this one in LIBS
save_LIBS="$LIBS" save_LIBS="$LIBS"
@ -72,6 +75,7 @@ AC_SEARCH_LIBS([inflateEnd], [z],
AC_DEFINE(HAVE_LIBZ, 1, [Define if the system has zlib])]) AC_DEFINE(HAVE_LIBZ, 1, [Define if the system has zlib])])
LIBS="$save_LIBS" LIBS="$save_LIBS"
AC_SUBST(ZLIB_LIBS) AC_SUBST(ZLIB_LIBS)
fi
AM_CONDITIONAL(ZLIB_REGRESS, [test "$have_zlib" = "yes"]) AM_CONDITIONAL(ZLIB_REGRESS, [test "$have_zlib" = "yes"])
dnl See if we have openssl. This doesn't go in LIBS either. dnl See if we have openssl. This doesn't go in LIBS either.