Commit 0f22079e by Anthony Green Committed by Anthony Green

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
parent e916e1d0
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> 2004-05-16 Mark Wielaard <mark@klomp.org>
* java/io/Writer.java (Writer(Object)): Check for null lock object. * java/io/Writer.java (Writer(Object)): Check for null lock object.
......
...@@ -113,7 +113,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \ ...@@ -113,7 +113,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
-Wswitch-enum \ -Wswitch-enum \
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \ @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \ -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
-DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
-DJAVA_EXT_DIRS="\"$(jardir)/ext\""
if USING_GCC if USING_GCC
AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS) AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
else else
......
...@@ -217,7 +217,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \ ...@@ -217,7 +217,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
-Wswitch-enum \ -Wswitch-enum \
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \ @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \ -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_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@
......
...@@ -592,6 +592,9 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops) ...@@ -592,6 +592,9 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
// The name used to invoke this process (argv[0] in C). // The name used to invoke this process (argv[0] in C).
SET ("gnu.gcj.progname", _Jv_GetSafeArg (0)); 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. // Allow platform specific settings and overrides.
_Jv_platform_initProperties (newprops); _Jv_platform_initProperties (newprops);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment