* configure.ac (AC_CHECK_WITH_JASMIN_JAR): Added.

* m4/jasmin.m4: New file.
* tests/regression/jasmin/Makefile.am (build): Use JASMIN_JAR.

diff --git a/configure.ac b/configure.ac
index ab08042e65b6e41eca99ed6e28ea1aaf7823ce19..8eadbef6ad72dd83a4e9bcba3a8e9771f8f4e4ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -812,6 +812,7 @@ case "${WITH_JAVA_RUNTIME_LIBRARY}" in
         ;;
 esac
 
+AC_CHECK_WITH_JASMIN_JAR
 AC_CHECK_WITH_JUNIT_JAR
 
 AC_CHECK_HEADERS(

diff --git a/m4/jasmin.m4 b/m4/jasmin.m4
new file mode 100644 (file)
index 0000000..14e0cde
--- /dev/null
+++ b/m4/jasmin.m4
@@ -0,0 +1,34 @@
+dnl m4/jasmin.m4
+dnl
+dnl Copyright (C) 2008
+dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+dnl 
+dnl This file is part of CACAO.
+dnl 
+dnl This program is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU General Public License as
+dnl published by the Free Software Foundation; either version 2, or (at
+dnl your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
+dnl 
+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 Check location of Jasmin jar file.
+
+AC_DEFUN([AC_CHECK_WITH_JASMIN_JAR],[
+AC_MSG_CHECKING(location of Jasmin jar)
+AC_ARG_WITH([jasmin-jar],
+            [AS_HELP_STRING(--with-jasmin-jar=<path>,location of Jasmin jar file [[default=/usr/share/java/cup.jar:/usr/share/java/jasmin-sable.jar]])],
+            [JASMIN_JAR="${withval}"],
+            [JASMIN_JAR="/usr/share/java/cup.jar:/usr/share/java/jasmin-sable.jar"])
+AC_MSG_RESULT(${JASMIN_JAR})
+AC_SUBST(JASMIN_JAR)
+])

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index 7584b3be3bed807082edf1a0111f5cafa83f320e..25d689f6b66a17777e05503a2d6a3c22ae6f03c8 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -37,7 +37,7 @@ CLEANFILES = \
 check: build run
 
 build:
-       $(JAVACMD) -cp /usr/share/java/cup.jar:/usr/share/java/jasmin-sable.jar jasmin.Main $(srcdir)/*.j
+       $(JAVACMD) -cp $(JASMIN_JAR) jasmin.Main $(srcdir)/*.j
 
 run:
        @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs JAVA="$(top_builddir)/src/cacao/cacao -Xbootclasspath:$(BOOTCLASSPATH)" $(srcdir)/runtest $(srcdir)/*.j