* m4/classpath.m4: Renamed --with-classpath* options to

[cacao.git] / src / native / include / Makefile.am

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 6e3c1279df22f54310ee7ea25f8d3bb9c82e49ee..bdecd1eef2815c7ba5229abb617756eb74931e8c 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -63,7 +63,7 @@ JAVASE_HEADER_FILES = \
        java_util_concurrent_atomic_AtomicLong.h \
        sun_misc_Unsafe.h
 
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
 JAVASE_HEADER_FILES += \
        java_lang_VMThread.h \
        java_lang_VMThrowable.h \
@@ -84,7 +84,7 @@ JAVASE_HEADER_FILES += \
 endif
 endif
 
-if WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
 JAVASE_HEADER_FILES += \
        java_lang_AssertionStatusDirectives.h \
        java_nio_ByteBuffer.h \
@@ -108,7 +108,7 @@ JVMTI_HEADER_FILES = \
        gnu_classpath_jdwp_event_EventRequest.h \
        gnu_classpath_jdwp_util_VariableTable.h
 
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
 ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
        gnu_classpath_VMStackWalker.h \
        gnu_classpath_VMSystemProperties.h \
@@ -150,11 +150,11 @@ DO_HEADER_FILES += \
        $(GEN_JVMTI_HEADER_FILES)
 endif
 
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
 VM_ZIP = $(top_builddir)/src/classes/vm.zip
 endif
 
-if WITH_CLASSPATH_CLDC1_1
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
 VM_ZIP = $(top_builddir)/src/classes/vm.zip
 endif