* m4/cacaoh.m4 (AC_CHECK_WITH_CACAOH): Don't set ENABLE_CACAOH.

* src/Makefile.am [ENABLE_CACAOH] (CACAOH_DIR): Removed.
(SUBDIRS): Always build cacaoh because it's required e.g. when running
make check on the target.

diff --git a/m4/cacaoh.m4 b/m4/cacaoh.m4
index 5abf1275ceb672aac4f9c088927908740b8ae4c0..1c19667e82f209d9ae3fd26aa029eba4aaf84826 100644 (file)
--- a/m4/cacaoh.m4
+++ b/m4/cacaoh.m4
@@ -1,9 +1,7 @@
 dnl m4/cacaoh.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 
@@ -29,13 +27,8 @@ AC_DEFUN([AC_CHECK_WITH_CACAOH],[
 AC_MSG_CHECKING(which cacaoh to use (for crosscompilation))
 AC_ARG_WITH([cacaoh],
             [AS_HELP_STRING(--with-cacaoh,which cacaoh to use [[default=$(top_builddir)/src/cacaoh/cacaoh]])],
-            [CACAOH="${withval}"
-             ENABLE_CACAOH=no
-            ],
-            [CACAOH=["\$(top_builddir)/src/cacaoh/cacaoh"
-             ENABLE_CACAOH=yes
-            ]])
+            [CACAOH="${withval}"],
+            [CACAOH=["\$(top_builddir)/src/cacaoh/cacaoh"]])
 AC_MSG_RESULT(${CACAOH})
 AC_SUBST(CACAOH)
-AM_CONDITIONAL([ENABLE_CACAOH], test x"${ENABLE_CACAOH}" = "xyes")
 ])

diff --git a/src/Makefile.am b/src/Makefile.am
index 19bd98346f808df7f1476451d60b8aebde798d6b..b2cb8bf2aec61d7f8be3544a1bc6438da5a63e88 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,17 +34,12 @@ DIST_SUBDIRS = \
        vm \
        vmcore
 
-if ENABLE_CACAOH
-CACAOH_DIR = \
-       cacaoh 
-endif
-
 # DON'T CHANGE THIS ORDER!!!
 
 SUBDIRS = \
        toolbox \
        vmcore \
-       $(CACAOH_DIR) \
+       cacaoh \
        classes \
        native \
        fdlibm \