summaryrefslogtreecommitdiff
path: root/zlib/configure.in
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-05-10 08:05:43 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-05-10 08:05:43 +0000
commita709977c3ba2d94677666bea18554e7a67a0cdf1 (patch)
tree68185f310c7cb9a81eafe26a3719076bb2979124 /zlib/configure.in
parent9958c680058442ed5c83c255bd79bfd94aa41596 (diff)
downloadgcc-a709977c3ba2d94677666bea18554e7a67a0cdf1.tar.gz
* configure, Makefile.in: Rebuilt.
* Makefile.am (EXTRA_LTLIBRARIES): New macro. (toolexeclib_LTLIBRARIES): Use @target_all@. * configure.in: Recognize --with-system-zlib. Subst target_all. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26854 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/configure.in')
-rw-r--r--zlib/configure.in14
1 files changed, 14 insertions, 0 deletions
diff --git a/zlib/configure.in b/zlib/configure.in
index 16fae3cbedf..4b63cb2ea72 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