Remove bogus check for libcheck, since we check for gstreamer-check and it pulls...

Original commit message from CVS:
* configure.ac:
* tests/Makefile.am:
Remove bogus check for libcheck, since we check for
gstreamer-check and it pulls in the required info from there,
and we weren't actually _using_ the information for libcheck
ourselves anyway.

diff --git a/ChangeLog b/ChangeLog
index 22565dd..3d1a76f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-13  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * configure.ac:
+       * tests/Makefile.am:
+       Remove bogus check for libcheck, since we check for
+       gstreamer-check and it pulls in the required info from there,
+       and we weren't actually _using_ the information for libcheck
+       ourselves anyway.
+
 2007-07-12  Stefan Kost  <ensonic@users.sf.net>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index 69d1ff5..86e6c1d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -276,12 +276,8 @@ AC_SUBST(GST_TOOLS_DIR)
 AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR)
 AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
 
-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)
-)
+AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
+
 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 5b098b9..c949e2d 100644 (file)
--- 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 =