[cp-patches] Patch: FYI: add --enable-core-jni option

[Tom Tromey]

I'm checking this in.

This patch adds a new configure option to make it possible to build
the Gtk peers but not the other core JNI code.  This is useful if your
VM wants to use the peers but has its own implementation of the core
native code.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * native/jni/Makefile.am (JNIDIRS): New macro.
        (SUBDIRS): Use it.
        * configure.ac (--enable-core-jni): New option.
        * NEWS: Document new option.

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.71
diff -u -r1.71 NEWS
--- NEWS 24 Apr 2005 19:28:29 -0000 1.71
+++ NEWS 24 Apr 2005 19:37:46 -0000
@@ -6,6 +6,9 @@
   the fully qualified class name of the default AWT toolkit to use.
   If not given, the old default of gnu.java.awt.peerk.gtk.GtkToolkit
   is used.
+* New --disable-core-jni option can be used to disable building the
+  "core" JNI libraries.  This is primarily useful if your VM can use the
+  Gtk peers but not the core JNI libraries.
 
 VM Interface changes:
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.81
diff -u -r1.81 configure.ac
--- configure.ac 24 Apr 2005 19:27:02 -0000 1.81
+++ configure.ac 24 Apr 2005 19:37:47 -0000
@@ -43,6 +43,20 @@
 AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test "x${COMPILE_JNI}" = xyes)
 
 dnl -----------------------------------------------------------
+dnl Enable core JNI libraries (enabled by default)
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([core-jni],
+              [AS_HELP_STRING(--enable-core-jni,
+                             compile JNI sources for core [default=yes])],
+              [case "${enableval}" in 
+                yes) COMPILE_CORE_JNI=yes; COMPILE_JAVA=yes ;;
+                no) COMPILE_CORE_JNI=no ;;
+                *) COMPILE_CORE_JNI=yes; COMPILE_JAVA=yes ;;
+              esac],
+              [COMPILE_CORE_JNI=yes])
+AM_CONDITIONAL(CREATE_CORE_JNI_LIBRARIES, test "x${COMPILE_CORE_JNI}" = xyes)
+
+dnl -----------------------------------------------------------
 dnl Whether to compile with -Werror or not (enabled by default)
 dnl -----------------------------------------------------------
 AC_ARG_ENABLE([Werror],
Index: native/jni/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- native/jni/Makefile.am 29 Dec 2004 21:39:36 -0000 1.12
+++ native/jni/Makefile.am 24 Apr 2005 19:37:47 -0000
@@ -1,5 +1,9 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
+if CREATE_CORE_JNI_LIBRARIES
+  JNIDIRS = java-io java-lang java-net java-nio java-util
+endif
+
 if CREATE_GTK_PEER_LIBRARIES
   GTKDIR = gtk-peer
 endif
@@ -8,8 +12,7 @@
   XMLJDIR = xmlj
 endif
 
-SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
-          $(GTKDIR) $(XMLJDIR)
+SUBDIRS = classpath $(JNIDIRS) $(GTKDIR) $(XMLJDIR)
 DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
                gtk-peer xmlj