* m4/java-runtime-library.m4

(AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES): Don't escape
variable for BOOTCLASSPATH. This should get javac working during
configure.

diff --git a/m4/java-runtime-library.m4 b/m4/java-runtime-library.m4
index 41ec709fdf310af5b51dca985d04f70c1be1eabf..587ddfaf954d4e804ce4514d7182ee5b2a6adb3a 100644 (file)
--- a/m4/java-runtime-library.m4
+++ b/m4/java-runtime-library.m4
@@ -110,10 +110,10 @@ 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:\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}"
         ;;
     *)
-        BOOTCLASSPATH="\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+        BOOTCLASSPATH="${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}"
         ;;
 esac
 AC_SUBST(BOOTCLASSPATH)