* src/vm/jit/arm/codegen.c: removed unused ICMD_GETSTATIC branch

[cacao.git] / m4 / annotations.m4

diff --git a/m4/annotations.m4 b/m4/annotations.m4
index 7560c30c86301a341c458c6f2408d6a65951412f..23045535e8552a1f34d7324d450708f096473e9e 100644 (file)
--- a/m4/annotations.m4
+++ b/m4/annotations.m4
@@ -1,9 +1,7 @@
 dnl m4/annotations.m4
 dnl
-dnl Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel,
-dnl C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-dnl E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-dnl J. Wenninger, Institut f. Computersprachen - TU Wien
+dnl Copyright (C) 2007, 2008
+dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 dnl 
 dnl This file is part of CACAO.
 dnl 
@@ -28,16 +26,19 @@ dnl check if annotations support should be built
 AC_DEFUN([AC_CHECK_ENABLE_ANNOTATIONS],[
 AC_MSG_CHECKING(wether to build annotations support)
 AC_ARG_ENABLE([annotations],
-              [AS_HELP_STRING(--enable-annotations,build annotations support [[default=no]])],
+              [AS_HELP_STRING(--enable-annotations,build annotations support [[default=(cldc1.1:no,javase:yes]])],
               [case "${enableval}" in
                    yes)
                        ENABLE_ANNOTATIONS=yes
                        ;;
-                   *)
+                   no)
                        ENABLE_ANNOTATIONS=no
                        ;;
+                   *)
+                       AC_CHECK_ENABLE_ANNOTATIONS_DEFAULT
+                       ;;
                esac],
-              [ENABLE_ANNOTATIONS=no])
+              [AC_CHECK_ENABLE_ANNOTATIONS_DEFAULT])
 AC_MSG_RESULT(${ENABLE_ANNOTATIONS})
 AM_CONDITIONAL([ENABLE_ANNOTATIONS], test x"${ENABLE_ANNOTATIONS}" = "xyes")
    
@@ -45,3 +46,14 @@ if test x"${ENABLE_ANNOTATIONS}" = "xyes"; then
     AC_DEFINE([ENABLE_ANNOTATIONS], 1, [enable annotations])
 fi
 ])
+
+
+dnl check for the default value for --enable-annotations
+
+AC_DEFUN([AC_CHECK_ENABLE_ANNOTATIONS_DEFAULT],[
+if test x"${ENABLE_JAVAME_CLDC1_1}" = "xyes"; then
+    ENABLE_ANNOTATIONS=no
+else
+    ENABLE_ANNOTATIONS=yes
+fi
+])