Kaydet (Commit) cb82c96f authored tarafından Rene Engelhard's avatar Rene Engelhard

libatomic-ops is only needed for internal firebird, so only check it then...

Change-Id: I8279b70df17071d46e97583a8b40209444c01928
üst 7be71336
...@@ -7389,16 +7389,6 @@ dnl Check for system libcmis ...@@ -7389,16 +7389,6 @@ dnl Check for system libcmis
dnl =================================================================== dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1]) 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],[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 ===================================================================
dnl Check for system libwpd dnl Check for system libwpd
dnl =================================================================== dnl ===================================================================
...@@ -8130,6 +8120,16 @@ if test "x$enable_firebird_sdbc" = "xyes"; then ...@@ -8130,6 +8120,16 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
fi fi
AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS]) AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS])
else 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)], [])
fi
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_FIREBIRD=NO SYSTEM_FIREBIRD=NO
FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include" FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment