re PR libgcj/23761 (java.library.path doesn't affect module loading path)

2005-09-08  Thomas Fitzsimmons  <fitzsim@redhat.com>

	PR libgcj/23761
	* include/java-props.h (_Jv_Module_Load_Path): Declare variable.
	* java/lang/natRuntime.cc (init): Call lt_dlsetsearchpath after
	lt_dlinit.
	* gnu/classpath/natSystemProperties.cc (_Jv_Module_Load_Path):
	Define variable.
	(_Jv_SetDLLSearchPath): Do not call lt_dlsetsearchpath.  Set
	_Jv_Module_Load_Path.

From-SVN: r104044

libjava/ChangeLog

+2005-09-08  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	PR libgcj/23761
+	* include/java-props.h (_Jv_Module_Load_Path): Declare variable.
+	* java/lang/natRuntime.cc (init): Call lt_dlsetsearchpath after
+	lt_dlinit.
+	* gnu/classpath/natSystemProperties.cc (_Jv_Module_Load_Path):
+	Define variable.
+	(_Jv_SetDLLSearchPath): Do not call lt_dlsetsearchpath.  Set
+	_Jv_Module_Load_Path.
+
 2005-09-06  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/23739:

libjava/gnu/classpath/natSystemProperties.cc

@@ -38,13 +38,15 @@ details.  */
 #include <java/lang/String.h>
 #include <jni.h>
 
+char *_Jv_Module_Load_Path = NULL;
+
 #ifdef USE_LTDL
 #include <ltdl.h>
 
 void
 _Jv_SetDLLSearchPath (const char *path)
 {
-  lt_dlsetsearchpath (path);
+  _Jv_Module_Load_Path = strdup (path);
 }
 
 #else

libjava/include/java-props.h

@@ -26,5 +26,8 @@ extern int _Jv_Properties_Count;
 // Properties taken from the user's environment.
 extern property_pair *_Jv_Environment_Properties;
 
+// Module load path.
+extern char *_Jv_Module_Load_Path;
+
 #endif
 

libjava/java/lang/natRuntime.cc

@@ -242,6 +242,8 @@ java::lang::Runtime::init (void)
 {
 #ifdef USE_LTDL
   lt_dlinit ();
+  // Set module load path.
+  lt_dlsetsearchpath (_Jv_Module_Load_Path);
   // Make sure self is opened.
   lt_dlopen (NULL);
 #endif