diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-08 00:40:41 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-08 10:17:41 +0100 |
| commit | fb4f6df48885ebbd907a8b73ebac3b8f0ab95de6 (patch) | |
| tree | 0018187eba0af75689476121832ef2f7a0e3544b /configure.ac | |
| parent | ac22700cc3b890ec386ad58bd53b9e9f2bcd2b47 (diff) | |
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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | 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]) |