diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-04-23 11:56:13 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-04-23 11:56:13 +0000 |
| commit | b8304263bd28ff653f502f0831b111a313938f9c (patch) | |
| tree | 22c68e76a5a52790858f73fd4d366987b9cb34e9 /configure.ac | |
| parent | 717d4ba44f2412ec441593a033b0da0e5f494219 (diff) | |
| download | lasso-b8304263bd28ff653f502f0831b111a313938f9c.tar.gz lasso-b8304263bd28ff653f502f0831b111a313938f9c.tar.xz lasso-b8304263bd28ff653f502f0831b111a313938f9c.zip | |
* search gzread in zlib1 after trying in libz (win32)
* remove critical exit from java macros
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ff6e41a0..d19640b8 100644 --- a/configure.ac +++ b/configure.ac @@ -671,21 +671,23 @@ AC_ARG_WITH(zlib, LDFLAGS="${LDFLAGS} -L$withval/lib" fi ]) +saved_LIB=$LIBS +LIBS= AC_CHECK_HEADERS(zlib.h, - AC_CHECK_LIB(z, gzread,[ + AC_SEARCH_LIBS(gzread, [z zlib1],[ AC_DEFINE([HAVE_LIBZ], [], [Have compression library]) if test "x${Z_DIR}" != "x"; then Z_CFLAGS="-I${Z_DIR}/include" - Z_LIBS="-L${Z_DIR}/lib -lz" + Z_LIBS="-L${Z_DIR}/lib $LIBS" [case ${host} in *-*-solaris*) - Z_LIBS="-L${Z_DIR}/lib -R${Z_DIR}/lib -lz" + Z_LIBS="-L${Z_DIR}/lib -R${Z_DIR}/lib $LIBS" ;; esac] else - Z_LIBS="-lz" + Z_LIBS="$LIBS" fi])) - +LIBS=$saved_LIB test "z$Z_LIBS" != "z" || AC_MSG_ERROR(missing zlib) AC_SUBST(Z_CFLAGS) |