Imported zip 2.3

[Bryce McKinlay <bryce at albatross dot co dot nz>]

Tim Van Holder sent me a patch to update libgcj's zip to zip 2.3, as
well as configure stuff to allow it to build on DJGPP. I didn't actually
use that patch (for some reason it wouldn't apply, and it depended on an
unreleased autoconf version), but I did import zip 2.3 into libgcj, and
incorperated a subset of Tim's Makefile changes. I've only posted the
configure changes here, since the entire diff is huge.

Tim: If you still want the rest of the DJGPP changes, please make a new
diff against the current tree and send it to java-patches. Thanks.

regards

  [ bryce ]


2000-06-15  Bryce McKinlay  <bryce@albatross.co.nz>

	Imported zip 2.3.
	* configure.in: Support	OS'es other than unix. From Tim Van Holder  
	<zastai@hotmail.com>.
	* Makefile.am: Update to use OS configuration.
	* aclocal.m4, configure, Makefile.in: Rebuilt.

	* Where, algorith.doc, bits.c, history, infozip.who, install.doc,
	zip.doc, unix/zipgrep: Prune obsolete files.

Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/zip/configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.in
--- configure.in	1999/04/07 14:52:43	1.1.1.1
+++ configure.in	2000/06/15 03:14:29
@@ -1,15 +1,28 @@
 dnl Process this file with autoconf to create configure.
 
 AC_INIT(ziperr.h)
-AM_INIT_AUTOMAKE(zip, 2.1)
+AM_INIT_AUTOMAKE(zip, 2.3)
 AM_MAINTAINER_MODE
 
 AC_EXEEXT
 AC_PROG_CC
 
 AC_HEADER_DIRENT
-AC_DEFINE(UNIX)
 
-AC_LINK_FILES(unix/unix.c, unix.c)
+AC_CANONICAL_HOST
+
+AC_MSG_CHECKING([for the OS type])
+case "$host" in
+  i[[34567]]86-*-msdosdjgpp)
+    OS=msdos
+    AC_DEFINE(DOS, 1, [Define if you are running on a DOS-like system.])
+    ;;
+  *)
+    OS=unix
+    AC_DEFINE(UNIX, 1, [Define if you are running on a UNIX-like system.])
+    ;;
+esac
+AC_MSG_RESULT($OS)
+AC_SUBST(OS)
 
 AC_OUTPUT(Makefile)
Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/zip/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- Makefile.am	1999/04/07 14:52:43	1.1.1.1
+++ Makefile.am	2000/06/15 03:14:29
@@ -11,9 +11,14 @@
 
 bin_PROGRAMS = zip
 
-zip_SOURCES = zip.c zipfile.c zipup.c fileio.c util.c globals.c crypt.c \
-	ttyio.c unix.c crc32.c crctab.c deflate.c trees.c bits.c
+zip_SOURCES = zip.c crypt.c ttyio.c zipfile.c zipup.c fileio.c util.c \
+              crctab.c globals.c crc32.c deflate.c trees.c os.c
 
 ## This isn't really correct, but we don't care.
-$(zip_OBJECTS) : zip.h ziperr.h tailor.h unix/osdep.h crypt.h \
-		revision.h ttyio.h unix/zipup.h
+$(zip_OBJECTS) : zip.h ziperr.h tailor.h $(OS)/osdep.h crypt.h \
+		revision.h ttyio.h $(OS)/zipup.h
+
+## Since automake won't allow directly substituting in a source filename, we
+##  use this method to create a single file
+os.c: $(OS)/$(OS).c
+	cp $< $@