summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-11-02 10:52:42 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-11-02 14:01:21 +0100
commitd562ee86414c8946c3b650d6e917db3f729325d3 (patch)
treea4a8c0537246d4cd0f225df3f1f712253479d32e /configure.ac
parent1e251fd4e0dfc2774b684850aadd2409c1aa88c7 (diff)
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 5 insertions, 4 deletions
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)