configure.ac | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit d562ee86414c8946c3b650d6e917db3f729325d3
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Nov 2 10:52:42 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Nov 2 14:01:21 2018 +0100
ENABLE_FIREBIRD_SDBC no defined in system-firebird case
Change-Id: Ibfd5c7f0eb931faf00e40d349176237c12bfbdbf
Reviewed-on: https://gerrit.libreoffice.org/62777
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/configure.ac b/configure.ac
index aeaaa709135d..36d68bfe6393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8760,7 +8760,7 @@ AC_SUBST(POSTGRESQL_LIB)
dnl ===================================================================
dnl Check for Firebird stuff
dnl ===================================================================
-ENABLE_FIREBIRD_SDBC=""
+ENABLE_FIREBIRD_SDBC=
if test "$enable_firebird_sdbc" = "yes" ; then
SCPDEFS="$SCPDEFS -DWITH_FIREBIRD_SDBC"
@@ -8808,7 +8808,8 @@ int fb_api_is_30(void) { return 0; }
#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 3.0.x is
installed]))
CFLAGS="${__save_CFLAGS}"
fi
- ENABLE_FIREBIRD_SDBC="TRUE"
+ ENABLE_FIREBIRD_SDBC=TRUE
+ AC_DEFINE([ENABLE_FIREBIRD_SDBC],1)
elif test "$enable_database_connectivity" != yes; then
AC_MSG_RESULT([none])
elif test "$cross_compiling" = "yes"; then
@@ -8854,8 +8855,8 @@ int fb_api_is_30(void) { return 0; }
fi
BUILD_TYPE="$BUILD_TYPE FIREBIRD"
- ENABLE_FIREBIRD_SDBC="TRUE"
- AC_DEFINE(ENABLE_FIREBIRD_SDBC)
+ ENABLE_FIREBIRD_SDBC=TRUE
+ AC_DEFINE([ENABLE_FIREBIRD_SDBC],1)
fi
fi
AC_SUBST(ENABLE_FIREBIRD_SDBC)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
