diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-03-03 17:40:43 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-03-03 17:40:43 +0000 |
| commit | 0c5acec995103361200f805acf839f09c7456183 (patch) | |
| tree | 97a060528b7fd2a4e4194bfffb35541e90c6a87c /configure.ac | |
| parent | 0134f9a8dfc2e2db93dc6301f723ccd82f89e9a1 (diff) | |
| download | classpath-0c5acec995103361200f805acf839f09c7456183.tar.gz | |
2006-03-03 Thomas Fitzsimmons <fitzsim@redhat.com>
* NEWS: Add entry for --enable-collections.
* configure.ac: Add --enable-collections option.
* lib/Makefile.am (collections.jar): New target.
(glibj_DATA): Add $(COLLECTIONS).
* lib/mkcollections.pl.in (destpath): Set from COLLECTION_PREFIX
configure substitution.
(classpath): Read from command line.
(javautilclasses): Remove BasicMapEntry. Add RandomAccess.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 95e049988..bd88839c6 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,20 @@ AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath) dnl ----------------------------------------------------------- +dnl Enable collections.jar (disabled by default) +dnl ----------------------------------------------------------- +AC_ARG_ENABLE([collections], + [AS_HELP_STRING(--enable-collections,create collections.jar [default=no])], + [case x"${enableval}" in + xyes) COMPILE_COLLECTIONS=yes; COLLECTIONS_PREFIX="\"gnu/java/util/collections\"" ;; + xno) COMPILE_COLLECTIONS=no ;; + x) COMPILE_COLLECTIONS=yes; COLLECTIONS_PREFIX="\"gnu/java/util/collections\"" ;; + *) COMPILE_COLLECTIONS=yes; COLLECTIONS_PREFIX="\"${enableval}\"" ;; + esac], + [COMPILE_COLLECTIONS=no]) +AM_CONDITIONAL(CREATE_COLLECTIONS, test "x${COMPILE_COLLECTIONS}" = xyes) + +dnl ----------------------------------------------------------- dnl Enable JNI libraries (enabled by default) dnl ----------------------------------------------------------- AC_ARG_ENABLE([jni], @@ -234,6 +248,14 @@ dnl AC_PROG_AWK AC_PROG_CC AC_PROG_CPP +if test "x${COMPILE_COLLECTIONS}" = xyes; then + AC_PATH_PROG(PERL, [perl]) + AC_SUBST(PERL) + AC_SUBST(COLLECTIONS_PREFIX) + AC_CONFIG_FILES([lib/mkcollections.pl]) + AC_CONFIG_COMMANDS([mkcollections.pl],[chmod 755 lib/mkcollections.pl]) +fi + if test "x${COMPILE_JNI}" = xyes; then AC_HEADER_STDC |