Makefile.am: Define JAVA_EXT_DIRS.

2004-05-19  Anthony Green  <green@redhat.com>

	* Makefile.am: Define JAVA_EXT_DIRS.
	* Makefile.in: Rebuilt.
	* java/lang/natRuntime.cc (insertSystemProperties): Set
	java.ext.dirs property.

From-SVN: r82034

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4da17099d098358eddaa11287314851f1fbb3a86..aee11995901431c14ad3ee87ea0f68df41c50d67 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-19  Anthony Green  <green@redhat.com>
+
+       * Makefile.am: Define JAVA_EXT_DIRS.
+       * Makefile.in: Rebuilt.
+       * java/lang/natRuntime.cc (insertSystemProperties): Set
+       java.ext.dirs property.
+
 2004-05-16  Mark Wielaard  <mark@klomp.org>
 
        * java/io/Writer.java (Writer(Object)): Check for null lock object.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index b79d68bf59479d5296cbcd9c25abb7fdc0c9930e..7853ef3cc3080e1f546df43b95c04e4241a5bc14 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -113,7 +113,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
        -Wswitch-enum \
        @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
        -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
-       -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\""
+       -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
+       -DJAVA_EXT_DIRS="\"$(jardir)/ext\""
 if USING_GCC
 AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
 else

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index cf236f01a559e1a2f9df5346dac763dfaefc93e9..a2853c48d86d22942eedada107ac09d6a9a6ec7c 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -217,7 +217,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
        -Wswitch-enum \
        @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
        -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
-       -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\""
+       -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
+       -DJAVA_EXT_DIRS="\"$(jardir)/ext\""
 
 @USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
 @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@

diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index 9b54874c1c44163778ebea783adc2ad9df3e87cd..4f6aabd6f21875cdd953f13bc0abaa99f2c1dcaa 100644 (file)
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -592,6 +592,9 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
   // The name used to invoke this process (argv[0] in C).
   SET ("gnu.gcj.progname", _Jv_GetSafeArg (0));
 
+  // The the java extensions directory.
+  SET ("java.ext.dirs", JAVA_EXT_DIRS);
+
   // Allow platform specific settings and overrides.
   _Jv_platform_initProperties (newprops);