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

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 1 14:08:59 UTC 2020


 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1f5d68ff96476ec3cbe6f0b7bfa8a6498c52f79b
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon Jun 1 14:22:55 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Jun 1 16:08:20 2020 +0200

    neon: update configure.ac to require 0.31.1
    
    And also report the internal version as 0.31.1.
    
    Change-Id: Ic4fb56d5aee75595205bb5fb0542b1aec859b2bb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95283
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/configure.ac b/configure.ac
index 87603c19c941..cafd9ce86779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10003,11 +10003,11 @@ serf)
 neon)
     AC_MSG_RESULT([neon])
     # Check for system neon
-    libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.26.0])
+    libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.1])
     if test "$with_system_neon" = "yes"; then
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
     else
-        NEON_VERSION=0295
+        NEON_VERSION=0311
     fi
     AC_SUBST(NEON_VERSION)
     ;;


More information about the Libreoffice-commits mailing list