From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 8 Jul 2008 08:53:15 +0000 (+0000)
Subject: Added /usr/include/qt4 to search path for C++ header files. Made Qt4 detection test... 
X-Git-Tag: svn/VALGRIND_3_4_0~343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6038e81684067b34a1e7970c46887d8da2716428;p=thirdparty%2Fvalgrind.git

Added /usr/include/qt4 to search path for C++ header files. Made Qt4 detection test portable.

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

diff --git a/configure.in b/configure.in
index 257ff933f3..dfbcc900ab 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,8 @@ AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], [--with-vex=$VEX_DIR])
 
 # Checks for programs.
 CFLAGS="-Wno-long-long"
+CXXFLAGS="-I/usr/include/qt4"
+CPPFLAGS="-I/usr/include/qt4"
 
 AC_PROG_LN_S
 AC_PROG_CC
@@ -1388,17 +1390,21 @@ AM_CONDITIONAL(BUILD_MPIWRAP_SEC, test x$ac_have_mpi2_sec = xyes)
 
 AC_MSG_CHECKING([for Qt4 core library])
 
-# The test below looks up some symbol definitions in the temporary file generated by the
-# configure script, namely confdefs.h.
-if grep -q -w '^#define HAVE_LIBQTCORE 1$' confdefs.h \
-   && grep -q -w '^#define HAVE_QTCORE_QMUTEX 1$' confdefs.h
-then
+AC_TRY_COMPILE([ ],
+[
+#if ! defined(HAVE_LIBQTCORE) || ! defined(HAVE_QTCORE_QMUTEX)
+#error Qt4 not supported.
+#endif
+  return 0;
+],
+[
   ac_have_qtcore=yes
   AC_MSG_RESULT([yes])
-else
+],
+[
   ac_have_qtcore=no
   AC_MSG_RESULT([no])
-fi
+])
 
 AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])