diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-07-13 16:02:23 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-07-13 16:02:23 +0000 |
| commit | 2b8d07bac00e66ac47afcfa178d1a2939206bdc2 (patch) | |
| tree | 43920a9d0c7e275182df983d029b9c1ab06bd8e5 | |
| parent | b6ee0fa3d62b1343e075b13e69ebe72c482ec145 (diff) | |
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:
* 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 there, and we
weren't actually _using_ the information for libcheck ourselves
anyway.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
4 files changed, 13 insertions, 9 deletions
@@ -1,5 +1,15 @@ 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 there, and we + weren't actually _using_ the information for libcheck ourselves + anyway. + +2007-07-13 Jan Schmidt <thaytan@mad.scientist.com> + * gst/ffmpegcolorspace/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_pixfmt): Fix the r_mask test for RGBA32 on little-endian. diff --git a/Makefile.am b/Makefile.am index 67105a60..8d088843 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,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 1546302d..3bf6d858 100644 --- a/configure.ac +++ b/configure.ac @@ -260,13 +260,7 @@ AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_GDP($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) - -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`" diff --git a/tests/Makefile.am b/tests/Makefile.am index 8155e1a3..b5c677c0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,7 @@ else SUBDIRS_EXAMPLES = endif -if HAVE_CHECK +if HAVE_GST_CHECK SUBDIRS_CHECK = check else SUBDIRS_CHECK = |