* Merged in twisti-branch.

[cacao.git] / tests / regression / native / Makefile.am

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index 9fa65b16e1932d39a0760dda8e4773da6b2e67d6..6e56d06f3a0c746dbc688d66ff7c9fd3ea4a769f 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -26,15 +26,21 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## $Id: Makefile.am 6247 2006-12-27 22:31:52Z twisti $
+## $Id: Makefile.am 7360 2007-02-14 17:50:48Z tbfg $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)
 
 JAVA      = $(top_builddir)/src/cacao/cacao
+
+if WITH_CLASSPATH_GNU
 JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
-JAVAH     = $(top_builddir)/src/cacaoh/cacaoh
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
+
+JAVAH     = @CACAOH@
 
 SOURCE_FILES = \
        checkjni.java \