I'm checking this in.
This adds a new configure option to let the user pick the fully
qualified class name of the default AWT toolkit. If not given, things
continue to work as they do now.
I'm slowly working on changing how libgcj is built, so that we can
drop a complete Classpath tree into the libgcj tree and build against
it. As a first step I'm trying to get the needed options and build
changes into the Classpath tree so that this is practical. For the
most part these shouldn't affect anyone else.
Tom
Index: ChangeLog
from Tom Tromey <[EMAIL PROTECTED]>
* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
Now set by configure.
* configure.ac (--enable-default-toolkit): New option.
* NEWS: Document new option.
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.80
diff -u -r1.80 configure.ac
--- configure.ac 24 Apr 2005 18:50:14 -0000 1.80
+++ configure.ac 24 Apr 2005 19:18:14 -0000
@@ -55,6 +55,18 @@
[ENABLE_WERROR=no])
dnl -----------------------------------------------------------
+dnl Default AWT toolkit
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE(default-toolkit,
+ AS_HELP_STRING([--enable-default-toolkit],
+ [fully qualified class name of default AWT toolkit]))
+default_toolkit=$enable_default_tookit
+if test "$default_toolkit" = ""; then
+ default_toolkit=gnu.java.awt.peer.gtk.GtkToolkit
+fi
+AC_SUBST(default_toolkit)
+
+dnl -----------------------------------------------------------
dnl Native libxml/xslt library (disabled by default)
dnl -----------------------------------------------------------
AC_ARG_ENABLE([xmlj],
Index: gnu/classpath/Configuration.java.in
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/Configuration.java.in,v
retrieving revision 1.14
diff -u -r1.14 Configuration.java.in
--- gnu/classpath/Configuration.java.in 8 Feb 2005 18:59:07 -0000 1.14
+++ gnu/classpath/Configuration.java.in 24 Apr 2005 19:18:14 -0000
@@ -109,7 +109,7 @@
/**
* Name of default AWT peer library.
*/
- String default_awt_peer_toolkit = "gnu.java.awt.peer.gtk.GtkToolkit";
+ String default_awt_peer_toolkit = "@default_toolkit@";
/**
* Whether to automatically run the init* methods in java.lang.System
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
