boehm-gc: revert all CACAO-specific modifications; this is now an exact copy of the...

[cacao.git] / m4 / java-runtime-library.m4

diff --git a/m4/java-runtime-library.m4 b/m4/java-runtime-library.m4
index d69cf7e07e3a5343a13994089da20bec65b341fa..587ddfaf954d4e804ce4514d7182ee5b2a6adb3a 100644 (file)
--- a/m4/java-runtime-library.m4
+++ b/m4/java-runtime-library.m4
@@ -92,14 +92,28 @@ AC_ARG_WITH([java-runtime-library-classes],
 AC_MSG_RESULT(${JAVA_RUNTIME_LIBRARY_CLASSES})
 AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
 AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
+])
+
+
+dnl where are Java core library classes located at compilation time
+
+AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[
+AC_MSG_CHECKING(where Java core library classes are located at compile time)
+AC_ARG_WITH([build-java-runtime-library-classes],
+            [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_CLASSES}]])],
+            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
+            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_CLASSES}])
+AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES})
+AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time])
+AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)
 
 dnl define BOOTCLASSPATH for Makefiles
 case "${WITH_JAVA_RUNTIME_LIBRARY}" in
     cldc1.1 | gnuclasspath)
-        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
+        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}"
         ;;
     *)
-        BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
+        BOOTCLASSPATH="${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}"
         ;;
 esac
 AC_SUBST(BOOTCLASSPATH)