diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-07-13 16:46:00 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-07-13 16:46:00 +0000 |
| commit | 4eb0f04d5e88fcf72808274414094325144fc45c (patch) | |
| tree | 398b91ba68ff510c7d33931528174857b847947a | |
| parent | e0fce0535d3f26f5c04b1ccce8110d36e8aa31f0 (diff) | |
| download | gst-plugins-bad-4eb0f04d5e88fcf72808274414094325144fc45c.tar.gz gst-plugins-bad-4eb0f04d5e88fcf72808274414094325144fc45c.tar.bz2 gst-plugins-bad-4eb0f04d5e88fcf72808274414094325144fc45c.zip | |
Remove bogus check for libcheck, since we check for gstreamer-check and it pulls in the required info from there, and...
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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 12 insertions, 7 deletions
@@ -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 892634df..becd8015 100644 --- a/configure.ac +++ b/configure.ac @@ -187,16 +187,12 @@ AG_GST_CHECK_GST_GDP($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], no) +AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") + GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_MAJORMINOR --variable pluginsdir` AC_SUBST(GSTPB_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) -) 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 6ba48806..fb07e8e9 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 = |