From c8f8ef93906545bd6b0a70a4e6d64168334fb240 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 12 Jul 2007 11:21:23 +0000 Subject: [PATCH] configure.ac: Use pkg-config to locate check. Original commit message from CVS: * configure.ac: Use pkg-config to locate check. --- ChangeLog | 5 +++++ configure.ac | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c43e88f841..1a70e56e9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-12 Stefan Kost + + * configure.ac: + Use pkg-config to locate check. + 2007-07-12 Tim-Philipp Müller * configure.ac: diff --git a/configure.ac b/configure.ac index 11a9cd459e..c89219a082 100644 --- a/configure.ac +++ b/configure.ac @@ -199,9 +199,10 @@ AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ]) dnl FIXME: get rid of this by making sure gstreamer-check brings it in dnl check for "check", unit testing library/header -AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) -AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") - +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`"