acinclude.m4: Use ../libtool.m4.

* acinclude.m4: Use ../libtool.m4.
* configure.in: Use ${zlib_basedir}/.. for AC_CONFIG_AUX_DIR.
* acinclude.m4, configure, Makefile.in: Rebuilt.

From-SVN: r42052

zlib/ChangeLog.gcj

+2001-05-13  Alexandre Oliva  <aoliva@redhat.com>
+
+	* acinclude.m4: Use ../libtool.m4.
+	* configure.in: Use ${zlib_basedir}/.. for AC_CONFIG_AUX_DIR.
+	* acinclude.m4, configure, Makefile.in: Rebuilt.
+
 2000-10-24  Chris Demetriou  <cgd@sibyte.com>
 
 	* configure.in: Invoke AC_PROG_CPP unconditionally before

zlib/Makefile.in

@@ -67,17 +67,21 @@ AS = @AS@
 CC = @CC@
 COMPPATH = @COMPPATH@
 CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-LD = @LD@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-NM = @NM@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
+STRIP = @STRIP@
 VERSION = @VERSION@
 target_all = @target_all@
 zlib_basedir = @zlib_basedir@
@@ -160,10 +164,13 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libz_a_LIBADD = 
-@TARGET_LIBRARY_FALSE@libz_a_OBJECTS =  adler32.o compress.o crc32.o \
-@TARGET_LIBRARY_FALSE@deflate.o gzio.o infblock.o infcodes.o inffast.o \
-@TARGET_LIBRARY_FALSE@inflate.o inftrees.o infutil.o trees.o uncompr.o \
-@TARGET_LIBRARY_FALSE@zutil.o
+@TARGET_LIBRARY_FALSE@libz_a_OBJECTS =  adler32.$(OBJEXT) \
+@TARGET_LIBRARY_FALSE@compress.$(OBJEXT) crc32.$(OBJEXT) \
+@TARGET_LIBRARY_FALSE@deflate.$(OBJEXT) gzio.$(OBJEXT) \
+@TARGET_LIBRARY_FALSE@infblock.$(OBJEXT) infcodes.$(OBJEXT) \
+@TARGET_LIBRARY_FALSE@inffast.$(OBJEXT) inflate.$(OBJEXT) \
+@TARGET_LIBRARY_FALSE@inftrees.$(OBJEXT) infutil.$(OBJEXT) \
+@TARGET_LIBRARY_FALSE@trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT)
 AR = ar
 LTLIBRARIES =  $(toolexeclib_LTLIBRARIES)
 
@@ -190,7 +197,7 @@ OBJECTS = $(libz_a_OBJECTS) $(libzgcj_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .lo .o .obj .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -241,6 +248,11 @@ uninstall-toolexeclibLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
+# FIXME: We should only use cygpath when building on Windows,
+# and only if it is available.
+.c.obj:
+	$(COMPILE) -c `cygpath -w $<`
+
 .s.o:
 	$(COMPILE) -c $<
 
@@ -249,6 +261,7 @@ uninstall-toolexeclibLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
+	-rm -f *.$(OBJEXT)
 
 clean-compile:
 

zlib/acinclude.m4

@@ -37,3 +37,12 @@ else
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 ])
+
+sinclude(../libtool.m4)
+dnl The lines below arrange for aclocal not to bring libtool.m4
+dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
+dnl to add a definition of LIBTOOL to Makefile.in.
+ifelse(yes,no,[
+AC_DEFUN([AM_PROG_LIBTOOL],)
+AC_SUBST(LIBTOOL)
+])

zlib/configure.in

 dnl Process this with autoconf to create configure
 
 AC_INIT(zlib.h)
+
+dnl We may get other options which we dont document:
+dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
+
+if test "x[$]{with_target_subdir}" != x && \
+   test "[$]{srcdir}" = "."; then
+  if test "[$]{with_target_subdir}" != "."; then
+    zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../"
+  else
+    zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}"
+  fi
+else
+  zlib_basedir="[$]{srcdir}/"
+fi
+AC_SUBST(zlib_basedir)
+AC_CONFIG_AUX_DIR($zlib_basedir..)
+if :; then :; else
+  # This overrides the previous occurrence for automake, but not for
+  # autoconf, which is exactly what we want.
+  AC_CONFIG_AUX_DIR(..)
+fi
+
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(zlib, 1.1.3)
 
 AM_MAINTAINER_MODE
 
-AC_CONFIG_AUX_DIR(..)
-
 dnl We use these options to decide which functions to include.
 AC_ARG_WITH(target-subdir,
 [  --with-target-subdir=SUBDIR
@@ -24,21 +44,6 @@ AC_ARG_ENABLE(multilib,
   *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
  esac], [test -z "$with_target_subdir" && multilib=no || multilib=yes])dnl
 
-dnl We may get other options which we dont document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-if test "x[$]{with_target_subdir}" != x && \
-   test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../"
-  else
-    zlib_basedir="[$]{srcdir}/[$]{with_multisrctop}"
-  fi
-else
-  zlib_basedir="[$]{srcdir}/"
-fi
-AC_SUBST(zlib_basedir)
-
 AC_ARG_WITH(system-zlib,
 [  --with-system-zlib      use installed libz])