mirror of
https://github.com/nasa/trick.git
synced 2024-12-23 06:52:26 +00:00
Unable to configure Trick with Java 9 #486
Changed the java version extractor to look for an optional decimal and number past the decimal. Now it can properly find "9" as the version number.
This commit is contained in:
parent
8aa8f31e3d
commit
1f5be950e4
@ -140,7 +140,7 @@ AC_DEFUN([AX_JAVA],[
|
||||
AS_IF([test "$USE_JAVA" = "1"],[
|
||||
AC_PROG_AWK
|
||||
AX_PROG_JAVA_CC(javac)
|
||||
JAVA_VER=`$JAVA_CC -version 2>&1 | $ac_cv_path_PERL -ne 'print $& if /\d+\.\d+/'`
|
||||
JAVA_VER=`$JAVA_CC -version 2>&1 | $ac_cv_path_PERL -ne 'print $& if /\d+(\.\d+)?/'`
|
||||
AC_MSG_CHECKING([$JAVA_CC version >= 1.8])
|
||||
AX_COMPARE_VERSION([$JAVA_VER],[ge],[1.8], [AC_MSG_RESULT([yes])],
|
||||
[AC_MSG_RESULT([no])
|
||||
|
2
configure
vendored
2
configure
vendored
@ -5469,7 +5469,7 @@ if test "$JAVA_CC" = "gcj"; then
|
||||
fi
|
||||
test -z "$JAVA_CC" && as_fn_error $? "no acceptable java compiler found in \$PATH" "$LINENO" 5
|
||||
|
||||
JAVA_VER=`$JAVA_CC -version 2>&1 | $ac_cv_path_PERL -ne 'print $& if /\d+\.\d+/'`
|
||||
JAVA_VER=`$JAVA_CC -version 2>&1 | $ac_cv_path_PERL -ne 'print $& if /\d+(\.\d+)?/'`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $JAVA_CC version >= 1.8" >&5
|
||||
$as_echo_n "checking $JAVA_CC version >= 1.8... " >&6; }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user