[gst-cvs] gnonlin: configure: another small clean-up

Tim Müller tpm at kemper.freedesktop.org
Wed Sep 8 02:33:55 PDT 2010


Module: gnonlin
Branch: master
Commit: fb4f6df48885ebbd907a8b73ebac3b8f0ab95de6
URL:    http://cgit.freedesktop.org/gstreamer/gnonlin/commit/?id=fb4f6df48885ebbd907a8b73ebac3b8f0ab95de6

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Wed Sep  8 00:40:41 2010 +0100

configure: another small clean-up

AG_GST_CHECK_GST already sets GST_TOOLS_DIR and GST_PLUGINS_DIR,
no need to do it a second time.

---

 configure.ac |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 73c9d4c..f733a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,21 +106,10 @@ AG_GST_GLIB_CHECK([2.6])
 
 dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ])
+AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], [yes])
+AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], [yes])
 
-GST_TOOLS_DIR=`$PKG_CONFIG --variable=toolsdir gstreamer-$GST_MAJORMINOR`
-if test -z $GST_TOOLS_DIR; then
-  AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.])
-fi
-AC_SUBST(GST_TOOLS_DIR)
-
-GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_MAJORMINOR --variable pluginsdir`
-AC_SUBST(GST_PLUGINS_DIR)
-AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR)
-
-AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ])
-
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ])
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], [yes])
 
 dnl check for uninstalled plugin directories for unit tests
 AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.10.25])





More information about the Gstreamer-commits mailing list