diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-06-28 19:42:24 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-06-28 19:42:24 +0000 |
| commit | d475215a7b316fdc0744be752754b590bac22959 (patch) | |
| tree | 7c7c4db4da3af707f852f061b6e998712a9ed601 /fastjar/configure.in | |
| parent | fa2eec9a67a5134065176babcaddf3867fe47920 (diff) | |
| download | gcc-d475215a7b316fdc0744be752754b590bac22959.zip gcc-d475215a7b316fdc0744be752754b590bac22959.tar.gz gcc-d475215a7b316fdc0744be752754b590bac22959.tar.bz2 | |
re PR java/3441 (fastjar zlib)
* configure: Rebuilt.
* configure.in: Accept --with-system-zlib. Fixes PR java/3441.
From-SVN: r43644
Diffstat (limited to 'fastjar/configure.in')
| -rw-r--r-- | fastjar/configure.in | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/fastjar/configure.in b/fastjar/configure.in index 73eff88..c240be8 100644 --- a/fastjar/configure.in +++ b/fastjar/configure.in @@ -37,10 +37,25 @@ AC_CHECK_SIZEOF(long long) dnl Check byte order AC_C_BIGENDIAN -dnl Brain dead check for tree's zlib -ZDEPS='$(top_builddir)/../zlib/libz.a' -ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir" -ZINCS='-I$(top_srcdir)/../zlib' +AC_ARG_WITH(system-zlib, +[ --with-system-zlib use installed libz]) + +ZLIBS= +ZDEPS= +ZINCS= +use_zlib=maybe +if test "$with_system_zlib" = yes; then + AC_CHECK_LIB(z, deflate, ZLIBS=-lz, use_zlib=no) +else + use_zlib=no +fi + +if test "$use_zlib" = no; then + # Brain dead way to find tree's zlib. + ZDEPS='$(top_builddir)/../zlib/libz.a' + ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir" + ZINCS='-I$(top_srcdir)/../zlib' +fi AC_SUBST(ZLIBS) AC_SUBST(ZDEPS) AC_SUBST(ZINCS) |