src/vm/vm.c (vm_exit): only set JVMTI_PHASE_DEAD if a jvmti agent or a jvmti environm...

[cacao.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 77429da2c63616c6635706eab2c4fd6bb46bc955..db2f33a4c8794c5a26143a9b458ba022c32927fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -694,8 +694,15 @@ AS_AC_EXPAND([CLASSPATH_LIBDIR], ${CLASSPATH_LIBDIR})
 AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [GNU Classpath libraries installation directory])
 AC_SUBST(CLASSPATH_LIBDIR)
 
-AC_CHECK_HEADER([${CLASSPATH_PREFIX}/include/jni.h],
-                [AC_DEFINE_UNQUOTED([CLASSPATH_JNI_H], "${CLASSPATH_PREFIX}/include/jni.h", [GNU Classpath jni.h header])],
+AC_MSG_CHECKING(where GNU Classpath headers are installed)
+AC_ARG_WITH([classpath-includedir],
+            [AS_HELP_STRING(--with-classpath-includedir=<dir>,installation directory of GNU Classpath headers [[default=/usr/local/classpath/include]])],
+            [CLASSPATH_INCLUDEDIR=${withval}],
+            [CLASSPATH_INCLUDEDIR=${CLASSPATH_PREFIX}/include])
+AC_MSG_RESULT(${CLASSPATH_INCLUDEDIR})
+
+AC_CHECK_HEADER([${CLASSPATH_INCLUDEDIR}/jni.h],
+                [AC_DEFINE_UNQUOTED([CLASSPATH_JNI_H], "${CLASSPATH_INCLUDEDIR}/jni.h", [GNU Classpath jni.h header])],
                 [AC_MSG_ERROR(cannot find jni.h)])
 
 
@@ -737,7 +744,6 @@ AC_DEFINE_UNQUOTED(GLIBJ_ZIP_STRING, "$GLIBJ_ZIP_STRING", [define to the string
 
 
 dnl check for some programs we need
-export BOOTCLASSPATH=${CLASSPATH_PREFIX}/share/classpath/${GLIBJ_ZIP_STRING}
 AC_PROG_JAVAC
 AC_PROG_JAR