Added configure test for QAtomicInt.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10933

diff --git a/configure.in b/configure.in
index fd5a4b57fc7848be82c2289add44ba43cf5ce57f..6e99423642bd2c6b3d4e3a8db986ddf2062848f7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1754,6 +1754,38 @@ if test x$ac_have_qtcore = xyes; then
 fi
 
 
+# Test for QAtomicInt, which has been introduced in Qt 4.4.
+# See also http://doc.trolltech.com/4.4/qatomicint.html.
+if test x$ac_have_qtcore = xyes; then
+  AC_MSG_CHECKING([for Qt4 QAtomicInt)])
+  AC_LANG(C++)
+  safe_CXXFLAGS="${CXXFLAGS}"
+  CXXFLAGS="${QTCORE_CFLAGS} $mflag_primary"
+  AC_TRY_COMPILE([
+    #include <QtCore/QAtomicInt>
+  ],
+  [
+    QAtomicInt I;
+    I.testAndSetOrdered(0, 1);
+    return 0;
+  ],
+  [
+    ac_have_qtcore_qatomicint=yes
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_QTCORE_QATOMICINT], [1], [Define to 1 if the installed version of Qt4 provides QAtomicInt.])
+  ],
+  [
+    ac_have_qtcore_qatomicint=no
+    AC_MSG_RESULT([no])
+  ])
+  CXXFLAGS="${safe_CXXFLAGS}"
+  AC_LANG(C)
+fi
+
+AM_CONDITIONAL([HAVE_QTCORE_QATOMICINT], [test x$ac_have_qtcore_qatomicint = xyes])
+
+
+
 # Check whether the boost library 1.35 or later has been installed.
 # The Boost.Threads library has undergone a major rewrite in version 1.35.0.
 

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index ccf80c81d3612a686fba1d0cb7de813df2c2f3be..a252ec0460313f856f42d8e52f57ff7e86b95ad9 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -302,7 +302,11 @@ check_PROGRAMS += pth_spinlock
 endif
 
 if HAVE_QTCORE
-check_PROGRAMS += qt4_atomic qt4_mutex qt4_rwlock qt4_semaphore
+check_PROGRAMS += qt4_mutex qt4_rwlock qt4_semaphore
+endif
+
+if HAVE_QTCORE_QATOMICINT
+check_PROGRAMS += qt4_atomic
 endif
 
 
@@ -354,10 +358,6 @@ matinv_LDADD                = $(LDADD) -lm
 endif
 
 if HAVE_QTCORE
-qt4_atomic_SOURCES          = qt4_atomic.cpp
-qt4_atomic_CXXFLAGS         = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
-qt4_atomic_LDADD            = $(LDADD) $(QTCORE_LIBS)
-
 qt4_mutex_SOURCES           = qt4_mutex.cpp
 qt4_mutex_CXXFLAGS          = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
 qt4_mutex_LDADD             = $(LDADD) $(QTCORE_LIBS)
@@ -370,3 +370,9 @@ qt4_semaphore_SOURCES       = qt4_semaphore.cpp
 qt4_semaphore_CXXFLAGS      = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
 qt4_semaphore_LDADD         = $(LDADD) $(QTCORE_LIBS)
 endif
+
+if HAVE_QTCORE_QATOMICINT
+qt4_atomic_SOURCES          = qt4_atomic.cpp
+qt4_atomic_CXXFLAGS         = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
+qt4_atomic_LDADD            = $(LDADD) $(QTCORE_LIBS)
+endif