From: Christian Thalinger <twisti@complang.tuwien.ac.at>
Date: Wed, 7 May 2008 08:08:41 +0000 (+0200)
Subject: * m4/cacaoh.m4 (AC_CHECK_WITH_CACAOH): Don't set ENABLE_CACAOH.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c94b518ded95a32cefdc1f3eb21b260835e199ed;p=cacao.git

* 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 5abf1275c..1c19667e8 100644
--- 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 19bd98346..b2cb8bf2a 100644
--- 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 \