[Libreoffice-commits] core.git: configure.ac

[Rene Engelhard]

 configure.ac |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit cb82c96f859d6cfc5567b63d17c732fdd6c249b4
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jul 16 21:28:31 2013 +0200

    libatomic-ops is only needed for internal firebird, so only check it then...
    
    Change-Id: I8279b70df17071d46e97583a8b40209444c01928

diff --git a/configure.ac b/configure.ac
index b8c5db8..4ee8955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7390,16 +7390,6 @@ 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 ===================================================================
 libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 >= 0.9.5 libwpd-stream-0.9 >= 0.9.5],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"])
@@ -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"