diff options
| author | Wastack <btomi96@gmail.com> | 2016-07-28 17:16:19 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-17 13:05:40 +0000 |
| commit | 45f42681f4d1260c42140a313560534e605f81a4 (patch) | |
| tree | 1c51f2ba29261c38a3e771dc04968f2e9cb5957f /configure.ac | |
| parent | 0cb7d76bc5552245642ba423a87831cd9e0b2b92 (diff) | |
GSoC Upgrade firebird to 3.0
Embedded firebird is now version 3.0.
Supports MSVC 14.0.
Instead of fbembed, there are now two libraries: fbclient and
Engine12. fbclient is linked as fbembed before, Engine12 is loaded
at runtime from fbclient.
fb now needs system libtommath, which is supplied
as a new ExternalProject of LO.
Change-Id: I132939bdee745795b22f675e4265e9590079c45f
Reviewed-on: https://gerrit.libreoffice.org/27642
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5d072541519f..e71670e0eadf 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,6 +1776,11 @@ AC_ARG_WITH(system-firebird, driver. If fb_config is not in PATH, use FBCONFIG to point to it.]),, [with_system_firebird="$with_system_libs"]) +AC_ARG_WITH(system-libtommath, + AS_HELP_STRING([--with-system-libtommath], + [Use libtommath already on system]),, + [with_system_libtommath="$with_system_libs"]) + AC_ARG_WITH(system-hsqldb, AS_HELP_STRING([--with-system-hsqldb], [Use hsqldb already on system.])) @@ -8803,6 +8808,8 @@ int fb_api_is_30(void) { return 0; } elif test "$cross_compiling" = "yes"; then AC_MSG_RESULT([none]) else + dnl Embedded Firebird has version 3.0 + AC_DEFINE(HAVE_FIREBIRD_30, 1) dnl We need libatomic-ops for any non X86/X64 system if test "${CPUNAME}" != INTEL -a "${CPUNAME}" != X86_64; then dnl =================================================================== @@ -8823,8 +8830,22 @@ int fb_api_is_30(void) { return 0; } AC_MSG_RESULT([internal]) SYSTEM_FIREBIRD= - FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include" - FIREBIRD_LIBS="-lfbembed" + FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/gen/Release/firebird/include" + FIREBIRD_LIBS="-lfbclient" + + if test "$with_system_libtommath" = "yes"; then + SYSTEM_LIBTOMMATH=TRUE + dnl check for tommath presence + save_LIBS=$LIBS + AC_CHECK_HEADER(tommath.h,,AC_MSG_ERROR(Include file for tommath not found - please install development tommath package)) + AC_CHECK_LIB(tommath, mp_init, TOMMATH_LIBS=-ltommath, AC_MSG_ERROR(Library tommath not found - please install development tommath package)) + LIBS=$save_LIBS + else + SYSTEM_LIBTOMMATH= + LIBTOMMATH_CFLAGS="-I${WORKDIR}/UnpackedTarball/libtommath" + LIBTOMMATH_LIBS="-ltommath" + BUILD_TYPE="$BUILD_TYPE LIBTOMMATH" + fi BUILD_TYPE="$BUILD_TYPE FIREBIRD" ENABLE_FIREBIRD_SDBC="TRUE" @@ -8838,8 +8859,8 @@ AC_SUBST(SYSTEM_FIREBIRD) AC_SUBST(FIREBIRD_CFLAGS) AC_SUBST(FIREBIRD_LIBS) AC_SUBST(HAVE_FIREBIRD_30) -dnl AC_SUBST([TOMMATH_CFLAGS]) -dnl AC_SUBST([TOMMATH_LIBS]) +AC_SUBST([TOMMATH_CFLAGS]) +AC_SUBST([TOMMATH_LIBS]) dnl =================================================================== dnl Check for system curl |