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

zlib/ChangeLog.gcj

+1999-05-10  Tom Tromey  <tromey@cygnus.com>
+
+	* configure, Makefile.in: Rebuilt.
+	* Makefile.am (EXTRA_LTLIBRARIES): New macro.
+	(toolexeclib_LTLIBRARIES): Use @target_all@.
+	* configure.in: Recognize --with-system-zlib.  Subst target_all.
+
 1999-05-04  Tom Tromey  <tromey@cygnus.com>
 
 	* Makefile.in: Replace with automake-generated file.

zlib/Makefile.am

@@ -15,7 +15,8 @@ toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
 
 ## We don't use `libz.la' because we don't want to conflict with a
 ## system library of that name.
-toolexeclib_LTLIBRARIES = libzgcj.la
+toolexeclib_LTLIBRARIES = @target_all@
+EXTRA_LTLIBRARIES = libzgcj.la
 
 libzgcj_la_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \
 gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \

zlib/Makefile.in

@@ -79,6 +79,7 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
+target_all = @target_all@
 zlib_basedir = @zlib_basedir@
 
 AUTOMAKE_OPTIONS = cygnus
@@ -94,7 +95,8 @@ MULTICLEAN = true
 toolexecdir = $(exec_prefix)/$(target_alias)
 toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
 
-toolexeclib_LTLIBRARIES = libzgcj.la
+toolexeclib_LTLIBRARIES = @target_all@
+EXTRA_LTLIBRARIES = libzgcj.la
 
 libzgcj_la_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \
 gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \
@@ -215,7 +217,7 @@ distclean-libtool:
 maintainer-clean-libtool:
 
 libzgcj.la: $(libzgcj_la_OBJECTS) $(libzgcj_la_DEPENDENCIES)
-	$(LINK) -rpath $(toolexeclibdir) $(libzgcj_la_LDFLAGS) $(libzgcj_la_OBJECTS) $(libzgcj_la_LIBADD) $(LIBS)
+	$(LINK)  $(libzgcj_la_LDFLAGS) $(libzgcj_la_OBJECTS) $(libzgcj_la_LIBADD) $(LIBS)
 
 tags: TAGS
 

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