summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 4b5538eeab18..79b100c678ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7234,6 +7234,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 libwpd-stream-0.9],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"])
@@ -7958,11 +7963,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