Merging 7971:887db7d64bc9 with 7970:21b063622472.

[cacao.git] / m4 / classpath.m4

diff --git a/m4/classpath.m4 b/m4/classpath.m4
index e659187f4167224d80b9e110178bcb22a138f773..5091d7e3d6b11e8ea268893992092ca66bf26aea 100644 (file)
--- a/m4/classpath.m4
+++ b/m4/classpath.m4
@@ -92,6 +92,17 @@ AC_ARG_WITH([classpath-classes],
 AC_MSG_RESULT(${CLASSPATH_CLASSES})
 AC_DEFINE_UNQUOTED([CLASSPATH_CLASSES], "${CLASSPATH_CLASSES}", [Java core library classes])
 AC_SUBST(CLASSPATH_CLASSES)
+
+dnl define BOOTCLASSPATH for Makefiles
+case "${WITH_CLASSPATH}" in
+    cldc1.1 | gnu)
+        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(CLASSPATH_CLASSES)"
+        ;;
+    *)
+        BOOTCLASSPATH="\$(CLASSPATH_CLASSES)"
+        ;;
+esac
+AC_SUBST(BOOTCLASSPATH)
 ])