Configuration.java.in (INIT_LOAD_LIBRARY): New constant.

	* gnu/classpath/Configuration.java.in (INIT_LOAD_LIBRARY): New
	constant.
	* java/io/StreamTokenizer.java, java/util/ResourceBundle.java:
	Re-merged with Classpath.

From-SVN: r45835

4 files changed, 47 insertions, 4 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6914337..eae4599 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 2001-09-26  Tom Tromey  <tromey@redhat.com>
 
+	* gnu/classpath/Configuration.java.in (INIT_LOAD_LIBRARY): New
+	constant.
+	* java/io/StreamTokenizer.java, java/util/ResourceBundle.java:
+	Re-merged with Classpath.
+
 	* java/io/DataInputStream.java (readChar): Use readFully.
 	(readInt): Likewise.
 	(readLong): Likewise.
diff --git a/libjava/gnu/classpath/Configuration.java.in b/libjava/gnu/classpath/Configuration.java.in
index 7f4a90e..7359444 100644
--- a/libjava/gnu/classpath/Configuration.java.in
+++ b/libjava/gnu/classpath/Configuration.java.in
@@ -1,14 +1,43 @@
-// This file defines compile-time constants that can be accessed by java code.
-// It is pre-processed by configure. 
+/* gnu.classpath.Configuration
+   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
 package gnu.classpath;
 
+/**
+ * This file defines compile-time constants that can be accessed by
+ * java code. It is pre-processed by configure.  
+ */
 public interface Configuration
 {
   // The value of DEBUG is substituted according to whether the
   // "--enable-libgcj-debug" argument was passed to configure. Code
   // which is made conditional based on the value of this flag will
   // be removed by the optimizer in a non-debug build.
-    
   boolean DEBUG = @LIBGCJDEBUG@;
+
+  // For libgcj we never load the JNI libraries.
+  boolean INIT_LOAD_LIBRARY = false;
 }
diff --git a/libjava/java/io/StreamTokenizer.java b/libjava/java/io/StreamTokenizer.java
index 7f4790b..dfb20f2 100644
--- a/libjava/java/io/StreamTokenizer.java
+++ b/libjava/java/io/StreamTokenizer.java
@@ -407,7 +407,7 @@ public class StreamTokenizer
 	ttype = TT_WORD;
 	sval = tokbuf.toString();
 	if (lowerCase)
-	  sval.toLowerCase();
+	  sval = sval.toLowerCase();
       }
     else if (isComment(ch))
       {
diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 30f28a6..f2fa776 100644
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -28,6 +28,7 @@ executable file might be covered by the GNU General Public License. */
 package java.util;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
+import gnu.classpath.Configuration;
 
 /**
  * A resource bundle contains locale-specific data.  If you need
@@ -73,6 +74,14 @@ import java.lang.ref.SoftReference;
  * @author Jochen Hoenicke */
 public abstract class ResourceBundle
 {
+  static 
+  {
+    if (Configuration.INIT_LOAD_LIBRARY)
+      {
+	System.loadLibrary ("javautil");
+      }
+  }
+
   /**
    * The parent bundle.  This is consulted when you call getObject
    * and there is no such resource in the current bundle.  This