From f479f62c140bbab3869b8e2e783ee0c3f72dab3a Mon Sep 17 00:00:00 2001 From: "Andrzej J.R. Hunt" Date: Thu, 5 Sep 2013 16:27:50 +0100 Subject: Make libatomic_ops buildable and enable on non-X86. Change-Id: Iec1d329f143ab76de7e8b4acd3da66efb6e0220c Reviewed-on: https://gerrit.libreoffice.org/5812 Reviewed-by: Andrzej J.R. Hunt Tested-by: Andrzej J.R. Hunt Reviewed-on: https://gerrit.libreoffice.org/6600 --- configure.ac | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3fbfdcdb169e..b92cb4d22c16 100644 --- a/configure.ac +++ b/configure.ac @@ -8468,14 +8468,22 @@ if test "x$enable_firebird_sdbc" = "xyes"; then elif test "$cross_compiling" = "yes"; then AC_MSG_RESULT([none]) else - dnl =================================================================== - dnl Check for system libatomic-ops - dnl =================================================================== - 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)], []) + dnl We need libatomic-ops for any non X86/X64 system + if test "$CPU" != I -a "$CPU" != X; then + dnl =================================================================== + dnl Check for system libatomic-ops + dnl =================================================================== + 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)], []) + else + SYSTEM_LIBATOMIC_OPS=NO + LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include" + LIBATOMIC_OPS_LIBS="-latomic_ops" + BUILD_TYPE="$BUILD_TYPE LIBATOMIC_OPS" + fi fi AC_MSG_RESULT([internal]) @@ -8489,6 +8497,9 @@ if test "x$enable_firebird_sdbc" = "xyes"; then fi AC_SUBST(ENABLE_FIREBIRD_SDBC) +AC_SUBST(SYSTEM_LIBATOMIC_OPS) +AC_SUBST(LIBATOMIC_OPS_CFLAGS) +AC_SUBST(LIBATOMIC_OPS_LIBS) AC_SUBST(SYSTEM_FIREBIRD) AC_SUBST(FIREBIRD_CFLAGS) AC_SUBST(FIREBIRD_LIBS) -- cgit