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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 33b4198735af8d9398e63887187b86b4176cac82
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 9 13:41:30 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 9 17:07:56 2021 +0200

    allow system firebird 4
    
    Change-Id: I330065f61d2d0fdfeeaeba4ee2e739e222d1c665
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116918
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 077684be36b4..e860d4a5f199 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10103,11 +10103,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then
         AC_MSG_CHECKING([Firebird version])
         if test -n "${FIREBIRD_VERSION}"; then
             FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
-            FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
-            if test "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then
+            if test "$FIREBIRD_MAJOR" -ge "3"; then
                 AC_MSG_RESULT([OK])
             else
-                AC_MSG_ERROR([Ensure firebird 3.0.x is installed])
+                AC_MSG_ERROR([Ensure firebird >= 3 is installed])
             fi
         else
             save_CFLAGS="${CFLAGS}"