aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-05-07 13:31:20 +0200
committerHenrik Nord <[email protected]>2015-05-07 13:33:44 +0200
commit71a03b51143aa8fe0a3dcd0701ede5c087a9aa9b (patch)
tree4ff7aa4afde23414199020eee5ffe9d97c30c00e
parent3966c7fe9ecfcb984d196b3c8f01cfda53545381 (diff)
parent48c52c2fd67ea2579ce5f4b9dd0d491a54d0a5cb (diff)
downloadotp-71a03b51143aa8fe0a3dcd0701ede5c087a9aa9b.tar.gz
otp-71a03b51143aa8fe0a3dcd0701ede5c087a9aa9b.tar.bz2
otp-71a03b51143aa8fe0a3dcd0701ede5c087a9aa9b.zip
Merge branch 'henrik/update-javaversion'
* henrik/update-javaversion: update java version OTP-12715
-rw-r--r--erts/configure.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 2d234e5f66..91c06973ac 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4734,12 +4734,12 @@ fi
AC_CHECK_PROGS(JAVAC, $check_javac)
if test -n "$JAVAC"; then
- dnl Make sure it's at least JDK 1.5
- AC_CACHE_CHECK(for JDK version 1.5,
- ac_cv_prog_javac_ver_1_5,
+ dnl Make sure it's at least JDK 1.6
+ AC_CACHE_CHECK(for JDK version 1.6,
+ ac_cv_prog_javac_ver_1_6,
[ERL_TRY_LINK_JAVA([], [for (String i : args);],
- ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
- if test $ac_cv_prog_javac_ver_1_5 = no; then
+ ac_cv_prog_javac_ver_1_6=yes, ac_cv_prog_javac_ver_1_6=no)])
+ if test $ac_cv_prog_javac_ver_1_6 = no; then
unset -v JAVAC
fi
fi