fix build error - bug #6

[cacao.git] / configure.in

diff --git a/configure.in b/configure.in
index a3f28faa37b17fb0ed98438779df82dd57d92045..2a32e75fdeed9628ddfe3ef7a4dd9d32ecd116b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(cacao, 0.92cvs, cacao@cacaojvm.org)
+AC_INIT(cacao, 0.92+cvs, cacao@cacaojvm.org)
 AC_CONFIG_SRCDIR(src/cacao/cacao.c)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
@@ -27,7 +27,7 @@ arm )
 
 i386 | i486 | i586 | i686 )
        ARCH_DIR="i386"
-       CFLAGS="-D__I386__ $CFLAGS"
+       CFLAGS="-D__I386__"
        ;;
 
 mips )
@@ -125,6 +125,7 @@ AC_CHECK_HEADERS([sys/ioctl.h])
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
+AC_C_ATTRIBUTE
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
@@ -248,6 +249,19 @@ else
        AM_CONDITIONAL([STATISTICS], [true])
 fi
 
+dnl check for JVMTI
+AC_ARG_ENABLE([jvmti], [AS_HELP_STRING(--enable-jvmti,enable JVMTI [[default=no]])])
+
+AC_MSG_CHECKING(whether to compile JVMTI support)
+if test x"$enable_jvmti" = "xyes"; then
+       AC_MSG_RESULT(yes)
+       AC_DEFINE([ENABLE_JVMTI], 1, [use JVMTI])
+       AM_CONDITIONAL([ENABLE_JVMTI], [true])
+else
+       AC_MSG_RESULT(no)
+       AM_CONDITIONAL([ENABLE_JVMTI], [false])
+fi
+
 
 dnl threads
 AC_ARG_ENABLE([threads], [AS_HELP_STRING(--enable-threads,enable threads support (none,green,native) [[default=native]])])
@@ -495,6 +509,7 @@ AC_CONFIG_FILES([Makefile]
                [src/mm/Makefile]
                [src/native/Makefile]
                [src/native/include/Makefile]
+               [src/native/jvmti/Makefile]
                [src/native/tools/Makefile]
                [src/native/vm/Makefile]
                [src/scripts/Makefile]
@@ -526,7 +541,8 @@ AC_CONFIG_FILES([Makefile]
                [src/vm/jit/x86_64/Makefile]
                [tests/Makefile]
                [tests/codepatching/Makefile]
-               [tests/native/Makefile])
+               [tests/native/Makefile]
+               [tests/regression/Makefile])
 
 AC_OUTPUT