From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 28 Jul 2008 11:36:11 +0000 (+0000)
Subject: Reverted commit 8448.
X-Git-Tag: svn/VALGRIND_3_4_0~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2abff40dcf607ec343df1a08e39275cbb0de3570;p=thirdparty%2Fvalgrind.git

Reverted commit 8448.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index c8d162e285..fb1bb22ab1 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -238,9 +238,9 @@ check_PROGRAMS =      \
   tc24_nonzero_sem    \
   trylock
 
-#if HAVE_QTCORE
-#check_PROGRAMS += qt4_mutex qt4_rwlock qt4_semaphore
-#endif
+if HAVE_QTCORE
+check_PROGRAMS += qt4_mutex qt4_rwlock qt4_semaphore
+endif
 
 if HAVE_OPENMP
 check_PROGRAMS += omp_matinv omp_prime
@@ -316,16 +316,16 @@ pth_inconsistent_cond_wait_LDADD   = -lpthread
 pth_spinlock_SOURCES        = pth_spinlock.c
 pth_spinlock_LDADD          = -lpthread
 
-#if HAVE_QTCORE
-#qt4_mutex_SOURCES           = qt4_mutex.cpp
-#qt4_mutex_LDADD             = -lQtCore -lpthread
-#
-#qt4_rwlock_SOURCES          = qt4_rwlock.cpp
-#qt4_rwlock_LDADD            = -lQtCore -lpthread
-#
-#qt4_semaphore_SOURCES       = qt4_semaphore.cpp
-#qt4_semaphore_LDADD         = -lQtCore -lpthread
-#endif
+if HAVE_QTCORE
+qt4_mutex_SOURCES           = qt4_mutex.cpp
+qt4_mutex_LDADD             = -lQtCore -lpthread
+
+qt4_rwlock_SOURCES          = qt4_rwlock.cpp
+qt4_rwlock_LDADD            = -lQtCore -lpthread
+
+qt4_semaphore_SOURCES       = qt4_semaphore.cpp
+qt4_semaphore_LDADD         = -lQtCore -lpthread
+endif
 
 recursive_mutex_SOURCES     = recursive_mutex.c
 recursive_mutex_LDADD       = -lpthread