diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2008-06-20 15:54:43 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2008-06-20 15:54:43 +0000 |
| commit | def24f00efb08af3ae4bba772ee94335178f9460 (patch) | |
| tree | d9a9d67eaa4a9d90b71ca2efdf8453f485e25337 | |
| parent | 90629e72a2db861eea75acf5eb60e514113e10c9 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | gst/gstinfo.c | 4 |
3 files changed, 14 insertions, 2 deletions
@@ -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 40851991e..c3d4fb20c 100644 --- 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 71c466464..438b162ac 100644 --- 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"); |