|
From: <sv...@va...> - 2008-07-30 09:19:13
|
Author: bart
Date: 2008-07-30 10:19:21 +0100 (Wed, 30 Jul 2008)
New Revision: 8482
Log:
Started using pkg-config macro's for Qt4 detection.
Modified:
branches/DRDDEV/configure.in
branches/DRDDEV/drd/tests/Makefile.am
branches/DRDDEV/drd/tests/qt4_mutex.cpp
branches/DRDDEV/drd/tests/qt4_rwlock.cpp
branches/DRDDEV/drd/tests/qt4_semaphore.cpp
Modified: branches/DRDDEV/configure.in
===================================================================
--- branches/DRDDEV/configure.in 2008-07-30 08:32:57 UTC (rev 8481)
+++ branches/DRDDEV/configure.in 2008-07-30 09:19:21 UTC (rev 8482)
@@ -50,6 +50,9 @@
# place.
AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], [--with-vex=$VEX_DIR])
+# pkg-config initialization.
+PKG_PROG_PKG_CONFIG()
+
# Checks for programs.
CFLAGS="-Wno-long-long"
@@ -1251,15 +1254,6 @@
sys/types.h \
])
-# Checks for C++ header files.
-AC_LANG(C++)
-AC_CHECK_HEADERS([ \
- QtCore/QMutex \
- QtCore/QSemaphore \
- QtCore/QThread \
- ])
-AC_LANG(C)
-
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_UID_T
AC_TYPE_OFF_T
@@ -1273,7 +1267,6 @@
AC_TYPE_SIGNAL
AC_CHECK_LIB([rt], [clock_gettime])
-AC_CHECK_LIB([QtCore], [_ZN6QMutex4lockEv]) # QMutex::lock()
AC_CHECK_FUNCS([ \
clock_gettime\
@@ -1401,25 +1394,16 @@
AM_CONDITIONAL(BUILD_MPIWRAP_SEC, test x$ac_have_mpi2_sec = xyes)
-# does this compiler have the include file <Qt/qmutex.h> and does it have
-# libQtCore.so ?
+# Has the QtCore package been installed ?
-AC_MSG_CHECKING([for Qt4 core library])
-
-AC_TRY_COMPILE([ ],
+PKG_CHECK_MODULES(
+[QTCORE],
+[QtCore],
[
-#if ! defined(HAVE_LIBQTCORE) || ! defined(HAVE_QTCORE_QMUTEX)
-#error Qt4 not supported.
-#endif
- return 0;
-],
-[
ac_have_qtcore=yes
- AC_MSG_RESULT([yes])
],
[
ac_have_qtcore=no
- AC_MSG_RESULT([no])
])
AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])
Modified: branches/DRDDEV/drd/tests/Makefile.am
===================================================================
--- branches/DRDDEV/drd/tests/Makefile.am 2008-07-30 08:32:57 UTC (rev 8481)
+++ branches/DRDDEV/drd/tests/Makefile.am 2008-07-30 09:19:21 UTC (rev 8482)
@@ -319,13 +319,16 @@
if HAVE_QTCORE
qt4_mutex_SOURCES = qt4_mutex.cpp
-qt4_mutex_LDADD = -lQtCore -lpthread
+qt4_mutex_CXXFLAGS = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
+qt4_mutex_LDADD = $(QTCORE_LIBS)
qt4_rwlock_SOURCES = qt4_rwlock.cpp
-qt4_rwlock_LDADD = -lQtCore -lpthread
+qt4_rwlock_CXXFLAGS = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
+qt4_rwlock_LDADD = $(QTCORE_LIBS)
qt4_semaphore_SOURCES = qt4_semaphore.cpp
-qt4_semaphore_LDADD = -lQtCore -lpthread
+qt4_semaphore_CXXFLAGS = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
+qt4_semaphore_LDADD = $(QTCORE_LIBS)
endif
recursive_mutex_SOURCES = recursive_mutex.c
Modified: branches/DRDDEV/drd/tests/qt4_mutex.cpp
===================================================================
--- branches/DRDDEV/drd/tests/qt4_mutex.cpp 2008-07-30 08:32:57 UTC (rev 8481)
+++ branches/DRDDEV/drd/tests/qt4_mutex.cpp 2008-07-30 09:19:21 UTC (rev 8482)
@@ -5,8 +5,8 @@
#endif
#include "config.h"
-#include <QtCore/QMutex> // class QMutex
-#include <QtCore/QThread> // class QThread
+#include <QMutex> // class QMutex
+#include <QThread> // class QThread
#include <cassert>
#include <cstdio> // fprintf()
#include <cstdlib> // atoi()
Modified: branches/DRDDEV/drd/tests/qt4_rwlock.cpp
===================================================================
--- branches/DRDDEV/drd/tests/qt4_rwlock.cpp 2008-07-30 08:32:57 UTC (rev 8481)
+++ branches/DRDDEV/drd/tests/qt4_rwlock.cpp 2008-07-30 09:19:21 UTC (rev 8482)
@@ -4,8 +4,8 @@
#define _GNU_SOURCE
#endif
-#include <QtCore/QThread> // class QThread
-#include <QtCore/QReadWriteLock> // class QReadWriteLock
+#include <QThread> // class QThread
+#include <QReadWriteLock> // class QReadWriteLock
#include <cstdio> // fprintf()
#include <cstdlib> // atoi()
#include <new>
Modified: branches/DRDDEV/drd/tests/qt4_semaphore.cpp
===================================================================
--- branches/DRDDEV/drd/tests/qt4_semaphore.cpp 2008-07-30 08:32:57 UTC (rev 8481)
+++ branches/DRDDEV/drd/tests/qt4_semaphore.cpp 2008-07-30 09:19:21 UTC (rev 8482)
@@ -4,8 +4,8 @@
#define _GNU_SOURCE
#endif
-#include <QtCore/QThread> // class QMutex
-#include <QtCore/QSemaphore> // class QSemaphore
+#include <QThread> // class QMutex
+#include <QSemaphore> // class QSemaphore
#include <cstdio> // fprintf()
#include <cstdlib> // atoi()
#include <new>
|