* configure.ac: Check for jvmti.h header if JVMTI is enabled.

* m4/jvmti.m4 (AC_CHECK_WITH_JVMTI_H): Added function for above task.

diff --git a/configure.ac b/configure.ac
index 79441f89d03fcec1e91a15d26e86e8eda03a8aa8..5dcff4dde835a6037d9bbb303d9d81a173d30ac2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -594,6 +594,11 @@ dnl The check for jni_md.h must be before jni.h.
 AC_CHECK_WITH_JNI_MD_H
 AC_CHECK_WITH_JNI_H
 
+dnl The jvmti.h header is only required if JVMTI is enabled.
+if test x"${ENABLE_JVMTI}" = "xyes"; then
+    AC_CHECK_WITH_JVMTI_H
+fi
+
 dnl JVM, HPI, and JMM is only required for OpenJDK.
 case "${WITH_JAVA_RUNTIME_LIBRARY}" in
     openjdk)

diff --git a/m4/jvmti.m4 b/m4/jvmti.m4
index 7ee27ad7506cb90d3661bbc610e76841e1781f99..62e989948cd1930d5e132a4be77a226fa95d0f7e 100644 (file)
--- a/m4/jvmti.m4
+++ b/m4/jvmti.m4
@@ -1,6 +1,6 @@
 dnl m4/jvmti.m4
 dnl
-dnl Copyright (C) 2008
+dnl Copyright (C) 2008, 2009
 dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 dnl 
 dnl This file is part of CACAO.
@@ -39,3 +39,26 @@ if test x"${ENABLE_JVMTI}" = "xyes"; then
     AC_DEFINE([ENABLE_JVMTI], 1, [use JVMTI])
 fi
 ])
+
+
+dnl where jvmti.h is installed
+
+AC_DEFUN([AC_CHECK_WITH_JVMTI_H],[
+AC_MSG_CHECKING(where jvmti.h is installed)
+AC_ARG_WITH([jvmti_h],
+            [AS_HELP_STRING(--with-jvmti_h=<dir>,path to jvmti.h (only with --enable-jvmti) [[default=(openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/share/javavm/export,*:${JAVA_RUNTIME_LIBRARY_PREFIX}/include)]])],
+            [WITH_JVMTI_H=${withval}],
+            [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+                 openjdk)
+                     WITH_JVMTI_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/share/javavm/export
+                     ;;
+                 *)
+                     WITH_JVMTI_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/include
+                     ;;
+            esac])
+AC_MSG_RESULT(${WITH_JVMTI_H})
+
+AC_CHECK_HEADER([${WITH_JVMTI_H}/jvmti.h],
+                [AC_DEFINE_UNQUOTED([INCLUDE_JVMTI_H], "${WITH_JVMTI_H}/jvmti.h", [Java runtime library jvmti.h header])],
+                [AC_MSG_ERROR(cannot find jvmti.h)])
+])