summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-06-16 20:44:50 +0100
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-06-16 20:54:11 +0100
commit4ab7b35a65caf0cc177fa18bdcad5003e4975446 (patch)
treede89b2b00aa86adfe4a37e4b91fb5b0e5c2120ad
parenta2a5539bfaf0170d9298495dc88896ffe801248a (diff)
Fix checks for system libatomic_ops.
Change-Id: Idb31e6be567e8530062517e7842cdfd8b84c7276
-rw-r--r--configure.ac12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 79b100c678ef..8aa11da2b6e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7236,7 +7236,12 @@ 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])
+libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2])
+if test "$with_system_libatomic_ops" = "yes"; then
+ SYSTEM_LIBATOMIC_OPS=YES
+ AC_CHECK_HEADERS(atomic_ops.h, [],
+ [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
+fi
dnl ===================================================================
dnl Check for system libwpd
@@ -7966,11 +7971,6 @@ if test "x$enable_firebird_sdbc" != "xno"; then
FIREBIRD_LIBS="-lfbembed"
dnl FIREBIRD_LIBS="-L${OUTDIR}/lib -lfbclient"
- 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
dnl dnl HP-UX atomic routines are in atomic library, not standard C library.