From 0a7fe9557bf3e684b03ecd585e7a81938ab5904e Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Fri, 13 Jul 2007 16:46:35 +0000
Subject: [PATCH] Remove bogus check for libcheck, since we check for
 gstreamer-check and it pulls in the required info from and we wer...

Original commit message from CVS:
* Makefile.am:
* configure.ac:
* tests/Makefile.am:
Remove bogus check for libcheck, since we check for
gstreamer-check and it pulls in the required info from
and we weren't actually _using_ the information for
libcheck ourselves anyway.
---
 ChangeLog         | 10 ++++++++++
 Makefile.am       |  2 +-
 configure.ac      |  7 +------
 tests/Makefile.am |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00d180567d..725d421924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-13  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* Makefile.am:
+	* configure.ac:
+	* tests/Makefile.am:
+	Remove bogus check for libcheck, since we check for
+	gstreamer-check and it pulls in the required info from
+	and we weren't actually _using_ the information for
+	libcheck ourselves anyway.
+
 2007-07-13  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_reset),
diff --git a/Makefile.am b/Makefile.am
index 2ac85be1ef..7bb7d31e46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ include $(top_srcdir)/common/po.mak
 check-valgrind:
 	cd tests/check && make check-valgrind
 
-if HAVE_CHECK
+if HAVE_GST_CHECK
 check-torture:
 	cd tests/check && make torture
 else
diff --git a/configure.ac b/configure.ac
index c89219a082..964be365e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,13 +196,8 @@ AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ])
 AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ])
 AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
 AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ])
+AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
-dnl FIXME: get rid of this by making sure gstreamer-check brings it in
-dnl check for "check", unit testing library/header
-PKG_CHECK_MODULES(CHECK, check >= 0.9.2,
-  AM_CONDITIONAL(HAVE_CHECK, true),
-  AM_CONDITIONAL(HAVE_CHECK, false)
-)
 dnl Check for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 356e397e5b..dfe3b5a150 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-if HAVE_CHECK
+if HAVE_GST_CHECK
 SUBDIRS_CHECK = check
 else
 SUBDIRS_CHECK =