[Libreoffice-commits] core.git: configure.ac dbaccess/qa

[Lionel Elie Mamane]

 configure.ac                  |   17 ++++-------------
 dbaccess/qa/unit/firebird.cxx |    4 ----
 2 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit 860ecb9e583627ab43097784ad98b41afd983ff6
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jan 5 12:58:26 2017 +0100

    require firebird 3.0 for build (don't allow 2.5)
    
    Keep firebird_integer_x64le.odb around for a future 3.x firebird that
    will allow opening Firebird 2.5 databases, so that we can test this
    capacity in our tests.
    
    Change-Id: I05dbef51284bdb25132ff6cb661659430eea6a92

diff --git a/configure.ac b/configure.ac
index 4e0d5cb..9f266a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8672,28 +8672,20 @@ if test "$enable_firebird_sdbc" = "yes" ; then
         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 "2" -a "$FIREBIRD_MINOR" -eq "5"; then
-                AC_MSG_RESULT([OK])
-            elif test "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then
-                AC_DEFINE(HAVE_FIREBIRD_30, 1)
+            if test "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then
                 AC_MSG_RESULT([OK])
             else
-                AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed])
+                AC_MSG_ERROR([Ensure firebird 3.0.x is installed])
             fi
         else
             __save_CFLAGS="${CFLAGS}"
             CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}"
             AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <ibase.h>
-#if defined(FB_API_VER) && FB_API_VER == 25
-int fb_api_is_25(void) { return 0; }
-#elif defined(FB_API_VER) && FB_API_VER == 30
+#if defined(FB_API_VER) && FB_API_VER == 30
 int fb_api_is_30(void) { return 0; }
 #else
 #error "Wrong Firebird API version"
-#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed]))
-            if nm conftest.$OBJEXT | grep fb_api_is_30; then
-                AC_DEFINE(HAVE_FIREBIRD_30, 1)
-            fi
+#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 3.0.x is installed]))
             CFLAGS="${__save_CFLAGS}"
         fi
         ENABLE_FIREBIRD_SDBC="TRUE"
@@ -8752,7 +8744,6 @@ AC_SUBST(LIBATOMIC_OPS_LIBS)
 AC_SUBST(SYSTEM_FIREBIRD)
 AC_SUBST(FIREBIRD_CFLAGS)
 AC_SUBST(FIREBIRD_LIBS)
-AC_SUBST(HAVE_FIREBIRD_30)
 AC_SUBST([TOMMATH_CFLAGS])
 AC_SUBST([TOMMATH_LIBS])
 
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index e031e16..16a4fb6 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -66,11 +66,7 @@ void FirebirdTest::testEmptyDBConnection()
 void FirebirdTest::testIntegerDatabase()
 {
     uno::Reference< XOfficeDatabaseDocument > xDocument =
-#if HAVE_FIREBIRD_30
         getDocumentForFileName("firebird_integer_x64le_ods12.odb");
-#else
-        getDocumentForFileName("firebird_integer_x64le.odb");
-#endif
 
     uno::Reference< XConnection > xConnection =
         getConnectionForDocument(xDocument);