Don't assume that <valgrind/valgrind.h> exists just because the binary is there.

Original commit message from CVS:
* configure.ac:
* gst/gstinfo.c:
Don't assume that <valgrind/valgrind.h> exists just because
the binary is there.

diff --git a/ChangeLog b/ChangeLog
index cf54a6f..70043b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * configure.ac:
+       * gst/gstinfo.c:
+         Don't assume that <valgrind/valgrind.h> exists just because
+         the binary is there.
+
 2008-06-20  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * tests/check/Makefile.am:

diff --git a/configure.ac b/configure.ac
index 4085199..c3d4fb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,11 @@ AC_CHECK_HEADERS([sys/utsname.h])
 dnl Check for stdio_ext.f for __fbufsize
 AC_CHECK_HEADERS([stdio_ext.h])
 
+dnl Check for valgrind.h
+dnl separate from HAVE_VALGRIND because you can have the program, but not
+dnl the dev package
+AC_CHECK_HEADERS([valgrind/valgrind.h], HAVE_VALGRIND_H=yes)
+
 dnl *** checks for types/defines ***
 
 dnl *** checks for structures ***

diff --git a/gst/gstinfo.c b/gst/gstinfo.c
index 71c4664..438b162 100644 (file)
--- a/gst/gstinfo.c
+++ b/gst/gstinfo.c
@@ -108,7 +108,7 @@
 #include "gst_private.h"
 #include "gstutils.h"
 #include "gstsegment.h"
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_H
 #  include <valgrind/valgrind.h>
 #endif
 #include <glib/gprintf.h>       /* g_sprintf */
@@ -248,7 +248,7 @@ _priv_gst_in_valgrind (void)
   in_valgrind = GST_VG_UNCHECKED;
 
   if (in_valgrind == GST_VG_UNCHECKED) {
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_H
     if (RUNNING_ON_VALGRIND) {
       GST_CAT_INFO (GST_CAT_GST_INIT, "we're running inside valgrind");
       printf ("GStreamer has detected that it is running inside valgrind.\n");