[Libreoffice-commits] core.git: configure.ac

[Luboš Luňák (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46b5a714913d57105a82cff772f328107463a01d
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sun May 26 20:28:37 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon May 27 13:02:43 2019 +0200

    avoid error message from configure about integer expression expected
    
    Apparently test does not short-circuit evaluation.
    
    Change-Id: I0d9003735a43d0b5715b9d5fd9b5323efd6fdac1
    Reviewed-on: https://gerrit.libreoffice.org/72999
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/configure.ac b/configure.ac
index b5c499f7820e..b411ee9d92a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7533,7 +7533,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
 fi
 SOLARINC="$SOLARINC $JAVAINC"
 
-if test "$ENABLE_JAVA" != "" -a "x" != "x$JAVACOMPILER" -a "$_jdk_ver" -ge 10900; then
+if test "$ENABLE_JAVA" != "" -a "x" != "x$JAVACOMPILER" && test "$_jdk_ver" -ge 10900; then
     url_check_unknown=0
     java_base="testurlcheck"
     java_src="${java_base}.java"