diff options
author | Tom Tromey <tromey@cygnus.com> | 1999-05-10 08:05:43 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-05-10 08:05:43 +0000 |
commit | 79a9a529a68bfdf7e84212bc579a6a8972d08683 (patch) | |
tree | 68185f310c7cb9a81eafe26a3719076bb2979124 /zlib/configure.in | |
parent | c6a1d2ffbb89b3c5c9b11aa032985a28cb360556 (diff) | |
download | gcc-79a9a529a68bfdf7e84212bc579a6a8972d08683.zip gcc-79a9a529a68bfdf7e84212bc579a6a8972d08683.tar.gz gcc-79a9a529a68bfdf7e84212bc579a6a8972d08683.tar.bz2 |
configure, [...]: Rebuilt.
* configure, Makefile.in: Rebuilt.
* Makefile.am (EXTRA_LTLIBRARIES): New macro.
(toolexeclib_LTLIBRARIES): Use @target_all@.
* configure.in: Recognize --with-system-zlib. Subst target_all.
From-SVN: r26854
Diffstat (limited to 'zlib/configure.in')
-rw-r--r-- | zlib/configure.in | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/zlib/configure.in b/zlib/configure.in index 16fae3c..4b63cb2 100644 --- a/zlib/configure.in +++ b/zlib/configure.in @@ -38,6 +38,9 @@ else fi AC_SUBST(zlib_basedir) +AC_ARG_WITH(system-zlib, +[ --with-system-zlib Use installed libz]) + LIB_AC_PROG_CC AM_PROG_LIBTOOL @@ -58,11 +61,22 @@ if test -n "$with_cross_host"; then # we'll have. AC_DEFINE(HAVE_MEMCPY) AC_DEFINE(HAVE_STRERROR) + + # We ignore --with-system-zlib in this case. + target_all=libzgcj.la else AC_FUNC_MMAP AC_CHECK_FUNCS(memcpy strerror) + + if test "$with_system_zlib" = yes; then + AC_CHECK_LIB(z, deflate, target_all=, target_all=libzgcj.la) + else + target_all=libzgcj.la + fi fi +AC_SUBST(target_all) + AC_CHECK_HEADERS(unistd.h) if test "${multilib}" = "yes"; then |