]>
Commit | Line | Data |
---|---|---|
a104f05c JK |
1 | diff -dur otp_src_R9C-2.orig/erts/configure.in otp_src_R9C-2/erts/configure.in |
2 | --- otp_src_R9C-2.orig/erts/configure.in 2004-05-24 08:05:38.000000000 +0200 | |
3 | +++ otp_src_R9C-2/erts/configure.in 2004-10-10 23:11:12.516218543 +0200 | |
4 | @@ -1262,7 +1262,13 @@ | |
5 | /bin/rm -f $ERL_TOP/lib/$a/SKIP | |
6 | done | |
7 | ||
8 | -AC_CHECK_PROGS(JAVAC, javac.sh javac guavac gcj jikes bock) | |
9 | +JAVAC="" | |
10 | +AC_ARG_WITH([java],AS_HELP_STRING([--with-java],[use Java (default is auto)]), | |
11 | + [],[with_java=auto]) | |
12 | + | |
13 | +if test "x$with_java" != "xno" ; then | |
14 | + AC_CHECK_PROGS(JAVAC, javac.sh javac guavac gcj jikes bock) | |
15 | +fi | |
16 | if test -n "$JAVAC"; then | |
17 | dnl Make sure it's at least JDK 1.2 | |
18 | AC_CACHE_CHECK(for JDK version 1.2, | |
19 | @@ -1274,7 +1280,13 @@ | |
20 | fi | |
21 | fi | |
22 | if test -z "$JAVAC"; then | |
23 | - AC_MSG_WARN([Could not find any usable java compiler, will skip: jinterface]) | |
24 | + if test "x$with_java" = "xyes" ; then | |
25 | + AC_MSG_ERROR([could not find any usable java compiler]) | |
26 | + elif test "x$with_java" != "xno" ; then | |
27 | + AC_MSG_WARN([Could not find any usable java compiler, will skip: jinterface]) | |
28 | + else | |
29 | + AC_MSG_WARN([Java support disabled, will skip: jinterface]) | |
30 | + fi | |
31 | ||
32 | for a in $need_java ; do | |
33 | echo "No Java compiler found" > $ERL_TOP/lib/$a/SKIP | |
34 | Only in otp_src_R9C-2/erts: configure.in~ |