diff options
Diffstat (limited to 'libjava/classpath/configure.ac')
| -rw-r--r-- | libjava/classpath/configure.ac | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index d9e442c15e4..9315404487c 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -6,7 +6,7 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([GNU Classpath],[0.20],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.90],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) AC_CANONICAL_TARGET @@ -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], @@ -238,6 +252,14 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_CXX +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 @@ -359,12 +381,15 @@ if test "x${COMPILE_JNI}" = xyes; then PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0) fi + PKG_CHECK_MODULES(FREETYPE2, freetype2) PKG_CHECK_MODULES(PANGOFT2, pangoft2) - + AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(FREETYPE2_LIBS) + AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_CFLAGS) fi @@ -572,6 +597,7 @@ doc/api/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile +external/relaxngDatatype/Makefile gnu/classpath/Configuration.java include/Makefile native/Makefile @@ -598,6 +624,7 @@ scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh +tools/Makefile examples/Makefile examples/Makefile.jawt]) AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) |