From 1cb5d7b76a01c711674c752015089e70c394fa99 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 18 Oct 2005 09:07:12 +0000 Subject: [PATCH] m4/gst-check.m4: check for tools correctly Original commit message from CVS: * m4/gst-check.m4: check for tools correctly --- ChangeLog | 5 +++++ m4/gst-check.m4 | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d49c22..7e561dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-10-18 Thomas Vander Stichele + * m4/gst-check.m4: + check for tools correctly + +2005-10-18 Thomas Vander Stichele + * gtk-doc.mak: only enable breaking on new API when make distcheck passes, not before diff --git a/m4/gst-check.m4 b/m4/gst-check.m4 index 869927e..c0dcaab 100644 --- a/m4/gst-check.m4 +++ b/m4/gst-check.m4 @@ -15,7 +15,6 @@ dnl GST_CHECK_GST_PLUGINS_BASE([MAJMIN], [MINVER], [REQUIRED]) AC_DEFUN([GST_CHECK_MODULES], [ - AC_REQUIRE([PKG_CHECK_MODULES]) module=[$2] minver=[$3] name="[$4]" @@ -36,7 +35,7 @@ AC_DEFUN([GST_CHECK_MODULES], AC_DEFUN([GST_CHECK_GST], [ GST_CHECK_MODULES(GST, gstreamer-[$1], [$2], [GStreamer], [$3]) - GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer-$GST_MAJORMINOR` + GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer-[$1]` if test -z $GST_TOOLS_DIR; then AC_MSG_ERROR( [no tools dir set in GStreamer pkg-config file; core upgrade needed.]) @@ -45,7 +44,7 @@ AC_DEFUN([GST_CHECK_GST], dnl check for where core plug-ins got installed dnl this is used for unit tests - GST_PLUGINS_DIR=`pkg-config --variable=pluginsdir gstreamer-$GST_MAJORMINOR` + GST_PLUGINS_DIR=`pkg-config --variable=pluginsdir gstreamer-[$1]` if test -z $GST_PLUGINS_DIR; then AC_MSG_ERROR( [no pluginsdir set in GStreamer pkg-config file; core upgrade needed.]) -- 2.7.4