mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I8279b70df17071d46e97583a8b40209444c01928
This commit is contained in:
Rene Engelhard
2013-07-16 21:28:31 +02:00
parent 7be7133686
commit cb82c96f85
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@@ -7389,16 +7389,6 @@ dnl Check for system libcmis
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],[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
dnl ===================================================================
@@ -8130,6 +8120,16 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
fi
AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS])
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])
SYSTEM_FIREBIRD=NO
FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include"