configure.in: Add TARGET_LIBRARY conditional.

Sun Sep  3 12:37:12 2000  Anthony Green  <green@redhat.com>

	* configure.in: Add TARGET_LIBRARY conditional.
	* configure: Rebuilt.
	* Makefile.am: If we're building a build host library, call the
	library libz.a and don't use libtool.
	* Makefile.in: Rebuilt.

From-SVN: r36121

zlib/ChangeLog.gcj

+Sun Sep  3 12:37:12 2000  Anthony Green  <green@redhat.com>
+
+	* configure.in: Add TARGET_LIBRARY conditional.
+	* configure: Rebuilt.
+	* Makefile.am: If we're building a build host library, call the
+	library libz.a and don't use libtool.
+	* Makefile.in: Rebuilt.
+
 1999-10-04  Tom Tromey  <tromey@cygnus.com>
 
 	* configure: Rebuilt.

zlib/Makefile.am

@@ -19,17 +19,22 @@ toolexecdir = $(exec_prefix)/$(target_alias)
 toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
 endif
 
-## We don't use `libz.la' because we don't want to conflict with a
-## system library of that name.
-toolexeclib_LTLIBRARIES = @target_all@
-EXTRA_LTLIBRARIES = libzgcj.la
-
-libzgcj_la_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \
+ZLIB_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 \
 inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h trees.c \
 trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h
 
+if TARGET_LIBRARY
+## We don't use `libz.la' because we don't want to conflict with a
+## system library of that name.
+toolexeclib_LTLIBRARIES = @target_all@
+EXTRA_LTLIBRARIES = libzgcj.la
+libzgcj_la_SOURCES = $(ZLIB_SOURCES)
 libzgcj_la_LDFLAGS = -version-info 0:0:0 -rpath $(toolexeclibdir)
+else
+toolexeclib_LIBRARIES = libz.a
+libz_a_SOURCES = $(ZLIB_SOURCES)
+endif
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and

zlib/configure.in

@@ -90,6 +90,7 @@ AC_SUBST(target_all)
 AC_CHECK_HEADERS(unistd.h)
 
 AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
+AM_CONDITIONAL(TARGET_LIBRARY, test -n "$with_target_subdir")
 
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"