From 489e66f5d5d08c7a0651eec325cc69b0aaab0164 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 13 Jul 2007 16:35:45 +0000 Subject: [PATCH] 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. --- ChangeLog | 9 +++++++++ configure.ac | 7 +------ tests/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39c6ac2..83a8486 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-07-13 Jan Schmidt + + * 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 * configure.ac: diff --git a/configure.ac b/configure.ac index b2c1753..906f0b8 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,7 @@ AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GST_REQ]) AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) +AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR) AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR) @@ -169,12 +170,6 @@ dnl whatevertarget_LIBS and -L flags here affect the rest of the linking GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" AC_SUBST(GST_PLUGIN_LDFLAGS) -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 Add MacOSX specific flags AC_CANONICAL_HOST case $host_os in diff --git a/tests/Makefile.am b/tests/Makefile.am index d458f18..48686c0 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 = -- 2.7.4