[cp-patches] FYI: Fastjar support

[Guilhem Lavaux]

Hi !

Here is a patch to add fastjar support to classpath. First, configure 
checks for zip, then fastjar if no --with-fastjar is supplied. If 
--with-fastjar is supplied it will use the given fastjar in any cases.

ChangeLog entry:

2006-01-21  Guilhem Lavaux  <address@hidden>

        * m4/acinclude.m4
        (CLASSPATH_WITH_GLIBJ): Add support for fastjar.

        * lib/Makefile.am: Likewise.

Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.9
diff -u -r1.9 acinclude.m4
--- m4/acinclude.m4     19 Jan 2006 18:39:19 -0000      1.9
+++ m4/acinclude.m4     21 Jan 2006 18:46:30 -0000
@@ -304,6 +304,19 @@
 AC_DEFUN([CLASSPATH_WITH_GLIBJ],
 [
   AC_PATH_PROG(ZIP, zip)
+  AC_ARG_WITH([fastjar],
+             [AS_HELP_STRING([--with-fastjar=PATH], [define to use a fastjar 
style tool])],
+             [
+               AC_MSG_CHECKING([for user supplied fastjar])
+               FASTJAR=${withval}
+               AC_MSG_RESULT([${FASTJAR}])
+             ],
+             [AC_PATH_PROG(FASTJAR, fastjar)])
+dnl We disable ZIP by default if we find fastjar.
+  if test x"${FASTJAR}" != x; then
+    ZIP=""
+  fi
+  
   AC_ARG_WITH([glibj],
               [AS_HELP_STRING([--with-glibj],[define what to install 
(zip|flat|both|none|build) [default=zip]])],
               [
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.109
diff -u -r1.109 Makefile.am
--- lib/Makefile.am     10 Jan 2006 10:39:54 -0000      1.109
+++ lib/Makefile.am     21 Jan 2006 18:46:30 -0000
@@ -72,6 +72,7 @@
 
 glibj.zip: classes compile-classes resources
        if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org 
META-INF > /dev/null; fi
+       if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax 
org META-INF; fi
 
 resources: copy-vmresources.sh
        if ! [ -e gnu ]; then mkdir gnu; fi