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

Dennis Schridde (via logerrit) logerrit at kemper.freedesktop.org
Sun Oct 6 10:09:17 UTC 2019


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

New commits:
commit cb060c2fe9e03b49953f43ab605559c4542e2ae4
Author:     Dennis Schridde <devurandom at gmx.net>
AuthorDate: Fri Oct 4 16:55:47 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Oct 6 12:08:10 2019 +0200

    tdf#124456: Make Ant configure.ac check more robust
    
    Change-Id: Iee16dd23c7881756663e8b6a67e4391186a6e430
    See-Also: https://bugs.gentoo.org/682156
    Reviewed-on: https://gerrit.libreoffice.org/80233
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index 364efe36621a..ecb4c877b563 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11902,7 +11902,7 @@ EOF
     ant_minminor1=`echo $ant_minver | cut -d"." -f2`
 
     AC_MSG_CHECKING([whether Ant is >= $ant_minver])
-    ant_version=`"$ANT" -version | $AWK '{ print $4; }'`
+    ant_version=`"$ANT" -version | $AWK '$3 == "version" { print $4; }'`
     ant_version_major=`echo $ant_version | cut -d. -f1`
     ant_version_minor=`echo $ant_version | cut -d. -f2`
     echo "configure: ant_version $ant_version " >&5


More information about the Libreoffice-commits mailing list