diff options
| author | Guilhem Lavaux <guilhem@kaffe.org> | 2006-01-21 20:57:09 +0000 |
|---|---|---|
| committer | Guilhem Lavaux <guilhem@kaffe.org> | 2006-01-21 20:57:09 +0000 |
| commit | 389128ad9e78d61b272a1c47d1fd48846aabe7ef (patch) | |
| tree | c406c40a549577d27175f90c86cdf6153392e190 | |
| parent | 6fe91fe63ab392f2047342a37bb40013718a630a (diff) | |
| download | classpath-389128ad9e78d61b272a1c47d1fd48846aabe7ef.tar.gz | |
2006-01-21 Guilhem Lavaux <guilhem@kaffe.org>
* m4/acinclude.m4
(CLASSPATH_WITH_GLIBJ): Add support for fastjar.
* lib/Makefile.am: Likewise.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 1 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 13 |
3 files changed, 21 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2006-01-21 Guilhem Lavaux <guilhem@kaffe.org> + + * m4/acinclude.m4 + (CLASSPATH_WITH_GLIBJ): Add support for fastjar. + + * lib/Makefile.am: Likewise. + 2006-01-21 Roman Kennke <kennke@aicas.com> * javax/swing/PopupFactory.java diff --git a/lib/Makefile.am b/lib/Makefile.am index 408d3ebe4..fa681b014 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -72,6 +72,7 @@ endif # INSTALL_CLASS_FILES 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 diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 4317844aa..1c5f9c70f 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -304,6 +304,19 @@ dnl ----------------------------------------------------------- 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]])], [ |