|
From: <sv...@va...> - 2009-11-09 16:07:55
|
Author: bart Date: 2009-11-09 16:07:43 +0000 (Mon, 09 Nov 2009) New Revision: 10933 Log: Added configure test for QAtomicInt. Modified: trunk/configure.in trunk/drd/tests/Makefile.am Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2009-11-09 15:44:53 UTC (rev 10932) +++ trunk/configure.in 2009-11-09 16:07:43 UTC (rev 10933) @@ -1754,6 +1754,38 @@ 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. Modified: trunk/drd/tests/Makefile.am =================================================================== --- trunk/drd/tests/Makefile.am 2009-11-09 15:44:53 UTC (rev 10932) +++ trunk/drd/tests/Makefile.am 2009-11-09 16:07:43 UTC (rev 10933) @@ -302,10 +302,14 @@ 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 + AM_CFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter @@ -354,10 +358,6 @@ 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_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 |