diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-06-14 14:55:22 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 16:40:09 +0200 |
| commit | 0f16fa0fa58180a79aa5d27b44dbab4f9b6374b4 (patch) | |
| tree | a0be4bc4f6fa6788fd239acf8ef356794a26a81f /configure.ac | |
| parent | 8c325831b36394fa9217e30c706f36dc6ac7fafc (diff) | |
Build firebird 2.5 internally. Also adds libatomic_ops.
Change-Id: I44a45e781dfb3624cdebf4530ae44870bf39a82a
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dfe5b9c636b0..d15172f00ab7 100644 --- a/configure.ac +++ b/configure.ac @@ -7401,6 +7401,11 @@ dnl =================================================================== libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1]) dnl =================================================================== +dnl Check for system libatomic-ops +dnl =================================================================== +libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[libatomic_ops >= 0.7.2]) + +dnl =================================================================== dnl Check for system libwpd dnl =================================================================== libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 >= 0.9.5 libwpd-stream-0.9 >= 0.9.5],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"]) @@ -8129,11 +8134,13 @@ if test "x$enable_firebird_sdbc" != "xno"; then AC_MSG_RESULT([internal]) SYSTEM_FIREBIRD=NO FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include" - FIREBIRD_LIBS="-L${OUTDIR}/lib -lfbembed" + FIREBIRD_LIBS="-lfbembed" dnl FIREBIRD_LIBS="-L${OUTDIR}/lib -lfbclient" - AC_CHECK_HEADERS(atomic_ops.h, [], - [AC_MSG_ERROR(atomic_ops.h not found. install Libatomic-ops)], []) + if test "$SYSTEM_LIBATOMIC_OPS" = "YES"; then + AC_CHECK_HEADERS(atomic_ops.h, [], + [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], []) + fi dnl TODO: Checking to build IBPP in case we want to use it for the SDBC driver |