summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2014-04-14 14:19:20 -0400
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2014-04-15 09:59:33 +0200
commit3d576e040a6d0a1462b620972d223d4326f9246b (patch)
tree66a744e58aa10902551b11bbed65c72ae74c505b
parentce0065d9a524bca4f3548245071c5c963b93f0fe (diff)
downloadlasso-3d576e040a6d0a1462b620972d223d4326f9246b.tar.gz
lasso-3d576e040a6d0a1462b620972d223d4326f9246b.tar.xz
lasso-3d576e040a6d0a1462b620972d223d4326f9246b.zip
Fix java version detection
Signed-off-by: Simo Sorce <simo@redhat.com>
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 0f32ad31..5668e6f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,7 +220,7 @@ if test "x$JAVAC" = "xjavac"; then
dnl If we have a java compiler
dnl need to change quotes to allow square brackets
changequote(<<, >>)dnl
- JAVA_VERSION=`$JAVA -version 2>&1 | $SED -ne 's/java version "\([^"]*\)".*/\1/p' 2>/dev/null`
+ JAVA_VERSION=`$JAVA -version 2>&1 | $SED -ne 's/\(openjdk\|java\) \(full\)*version "\([^"]*\)".*/\3/p' 2>/dev/null`
changequote([, ])dnl
dnl If no java version found, perphas it is a kaffee environment...
if test "x$JAVA_VERSION" = x; then