* Removed all Id tags.

[cacao.git] / src / native / vm / nativevm.c

diff --git a/src/native/vm/nativevm.c b/src/native/vm/nativevm.c
index bc1f0b9b8ee21fa3afc569eb5e48a2a70e00195e..8fe1c47263f1b9ccc1b357b7536c88afb4e49a24 100644 (file)
--- a/src/native/vm/nativevm.c
+++ b/src/native/vm/nativevm.c
@@ -22,21 +22,27 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: native.c 7906 2007-05-14 17:25:33Z twisti $
-
 */
 
 
 #include "config.h"
-#include "vm/types.h"
+
+#include <stdint.h>
+
+#if defined(WITH_CLASSPATH_SUN)
+# include <string.h>
+#endif
 
 #include "native/vm/nativevm.h"
 
 #include "vmcore/method.h"
 
 #if defined(WITH_CLASSPATH_SUN)
+# include "mm/memory.h"
+
 # include "native/native.h"
 
+# include "vm/properties.h"
 # include "vm/vm.h"
 
 # include "vmcore/class.h"
@@ -87,10 +93,27 @@ bool nativevm_preinit(void)
 
 # elif defined(WITH_CLASSPATH_SUN)
 
+       char        *boot_library_path;
+       int          len;
+       char        *p;
        utf         *u;
        lt_dlhandle  handle;
 
-       u = utf_new_char(CLASSPATH_LIBDIR"/libjava.so");
+       boot_library_path = properties_get("sun.boot.library.path");
+
+       len =
+               strlen(boot_library_path) +
+               strlen("/libjava.so") +
+               strlen("0");
+
+       p = MNEW(char, len);
+
+       strcpy(p, boot_library_path);
+       strcat(p, "/libjava.so");
+
+       u = utf_new_char(p);
+
+       MFREE(p, char, len);
 
        handle = native_library_open(u);
        native_library_add(u, NULL, handle);