2006-08-14 Mark Wielaard <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116139 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 31 insertions, 9 deletions

diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index cabe77d2274..01364f2411d 100755
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -26,8 +26,9 @@ endif
 ## gcc/libjava/Makefile.am.
 # if CREATE_WRAPPERS
 # bin_SCRIPTS =
-# bin_PROGRAMS = gappletviewer gjarsigner gkeytool
-
+# bin_PROGRAMS = gappletviewer gjarsigner gkeytool \
+# 	gjar gnative2ascii gserialver
+# 
 # if FOUND_GCJ
 # LIBJVM = -lgcj
 # else
@@ -37,34 +38,55 @@ endif
 # LIBJVM =
 # endif
 # endif
-
+# 
 # AM_CPPFLAGS = -Wall \
 # 	-I$(top_srcdir)/include \
 # 	-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\""
-
+# 
 # gappletviewer_SOURCES = toolwrapper.c
 # gappletviewer_CFLAGS = \
 # 	-DTOOLPACKAGE="\"appletviewer\"" \
 # 	-DTOOLNAME="\"gappletviewer\""
 # gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
-
+# 
 # gjarsigner_SOURCES = toolwrapper.c
 # gjarsigner_CFLAGS = \
 # 	-DTOOLPACKAGE="\"jarsigner\"" \
 # 	-DTOOLNAME="\"gjarsigner\""
 # gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
-
+# 
 # gkeytool_SOURCES = toolwrapper.c
 # gkeytool_CFLAGS = \
 # 	-DTOOLPACKAGE="\"keytool\"" \
 # 	-DTOOLNAME="\"gkeytool\""
 # gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM)
-
+# 
+# gjar_SOURCES = toolwrapper.c
+# gjar_CFLAGS = \
+# 	-DTOOLPACKAGE="\"jar\"" \
+# 	-DTOOLNAME="\"gjar\""
+# gjar_LDFLAGS = -L$(libdir) $(LIBJVM)
+# 
+# gnative2ascii_SOURCES = toolwrapper.c
+# gnative2ascii_CFLAGS = \
+# 	-DTOOLPACKAGE="\"native2ascii\"" \
+# 	-DTOOLNAME="\"gnative2ascii\""
+# gnative2ascii_LDFLAGS = -L$(libdir) $(LIBJVM)
+# 
+# gserialver_SOURCES = toolwrapper.c
+# gserialver_CFLAGS = \
+# 	-DTOOLPACKAGE="\"serialver\"" \
+# 	-DTOOLNAME="\"gserialver\""
+# gserialver_LDFLAGS = -L$(libdir) $(LIBJVM)
+# 
 # else
-# bin_SCRIPTS = gappletviewer gjarsigner gkeytool
+# bin_SCRIPTS = gappletviewer gjarsigner gkeytool \
+# 	gjar gnative2ascii gserialver
 # bin_PROGRAMS =
 # endif
-EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in
+## END GCJ LOCAL
+EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \
+	gjar.in gnative2ascii.in gserialver.in
 
 # All our example java source files
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java