summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorChristian Thalinger <twisti@complang.tuwien.ac.at>2006-12-15 22:09:28 +0000
committerChristian Thalinger <twisti@complang.tuwien.ac.at>2006-12-15 22:09:28 +0000
commitd8d222724fcb81a7aa8e1c6d5a4337c179a0ae01 (patch)
tree37bd908ab3012c54dee11048c01ae2d5e77f89f6 /m4
parent413dee3ced2f6f4c653e36a49103706c4f14f255 (diff)
downloadclasspath-d8d222724fcb81a7aa8e1c6d5a4337c179a0ae01.tar.gz
2006-12-15 Christian Thalinger <twisti@complang.tuwien.ac.at>
* m4/acinclude.m4 (CLASSPATH_FIND_JAVAC): Added support for Sun's javac. (CLASSPATH_WITH_JAVAC): Added. (CLASSPATH_CHECK_JAVAC): Likewise. * lib/Makefile.am (JAVAC): Renamed to JCOMPILER. (FOUND_JAVAC): Added support for Sun's javac. * examples/Makefile.am: Likewise. * tools/Makefile.am: Likewise.
Diffstat (limited to 'm4')
-rw-r--r--m4/acinclude.m438
1 files changed, 38 insertions, 0 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 9404b4283..17dad2fd5 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -9,15 +9,18 @@ dnl CLASSPATH_WITH_GCJ
dnl CLASSPATH_WITH_JIKES
dnl CLASSPATH_WITH_KJC
CLASSPATH_WITH_ECJ
+ CLASSPATH_WITH_JAVAC
if test "x${user_specified_javac}" = x; then
dnl AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x)
dnl AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x)
AM_CONDITIONAL(FOUND_ECJ, test "x${ECJ}" != x)
+ AM_CONDITIONAL(FOUND_JAVAC, test "x${JAVAC}" != x)
else
dnl AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj)
dnl AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)
AM_CONDITIONAL(FOUND_ECJ, test "x${user_specified_javac}" = xecj)
+ AM_CONDITIONAL(FOUND_JAVAC, test "x${user_specified_javac}" = xjavac)
fi
dnl AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
@@ -422,3 +425,38 @@ AC_DEFUN([CLASSPATH_CHECK_ECJ],
AC_PATH_PROG(ECJ, "ecj")
fi
])
+
+dnl -----------------------------------------------------------
+AC_DEFUN([CLASSPATH_WITH_JAVAC],
+[
+ AC_ARG_WITH([javac],
+ [AS_HELP_STRING(--with-javac,bytecode compilation with javac)],
+ [
+ if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
+ CLASSPATH_CHECK_JAVAC(${withval})
+ else
+ if test "x${withval}" != xno; then
+ CLASSPATH_CHECK_JAVAC
+ fi
+ fi
+ user_specified_javac=javac
+ ],
+ [
+ CLASSPATH_CHECK_JAVAC
+ ])
+ AC_SUBST(JAVAC)
+])
+
+dnl -----------------------------------------------------------
+AC_DEFUN([CLASSPATH_CHECK_JAVAC],
+[
+ if test "x$1" != x; then
+ if test -f "$1"; then
+ JAVAC="$1"
+ else
+ AC_PATH_PROG(JAVAC, "$1")
+ fi
+ else
+ AC_PATH_PROG(JAVAC, "javac")
+ fi
+])