From 16c10b11d9bf3f85414f3f01e429b9f3efa4f699 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 7 Jul 2008 18:37:30 +0000
Subject: [PATCH] Qt4 and GOMP intercepts are now always built, whether or not
 runtime support for these libraries is present on the build system.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8387
---
 drd/Makefile.am | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drd/Makefile.am b/drd/Makefile.am
index 3a84697a93..03bb33eaa2 100644
--- a/drd/Makefile.am
+++ b/drd/Makefile.am
@@ -21,16 +21,10 @@ if VGP_PPC64_AIX5
 endif
 
 
-VGPRELOAD_DRD_SOURCES = drd_strmem_intercepts.c drd_pthread_intercepts.c \
-	$(VGPRELOAD_DRD_SOURCES_QT4) $(VGPRELOAD_DRD_SOURCES_OPENMP)
-
-if HAVE_QTCORE
+VGPRELOAD_DRD_SOURCES = drd_strmem_intercepts.c drd_pthread_intercepts.c
 VGPRELOAD_DRD_SOURCES += drd_qtcore_intercepts.c
-endif
-
-if HAVE_OPENMP
 VGPRELOAD_DRD_SOURCES += drd_gomp_intercepts.c
-endif
+
 
 DRD_CFLAGS=@FLAG_W_EXTRA@ @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@ \
            -Wformat-nonliteral -Wno-inline -Wno-unused-parameter \
-- 
2.47.2