X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=m4%2Fannotations.m4;h=23045535e8552a1f34d7324d450708f096473e9e;hb=48e1fa7fe2caaf6240d24e7bb85e1a3b1d23d2b5;hp=2cc59386d41a59fc0045bab58e6500a909b9e4b6;hpb=2507ee8783822ace9fa92af9acf662ee5db1cd81;p=cacao.git

diff --git a/m4/annotations.m4 b/m4/annotations.m4
index 2cc59386d..23045535e 100644
--- a/m4/annotations.m4
+++ b/m4/annotations.m4
@@ -1,9 +1,7 @@
-dnl m4/zlib.m4
+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 
@@ -21,8 +19,6 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 dnl 02110-1301, USA.
-dnl 
-dnl $Id: configure.ac 7228 2007-01-19 01:13:48Z edwin $
 
 
 dnl check if annotations support should be built
@@ -30,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")
    
@@ -47,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
+])