From ee0fc47447b8f4c4914925a930233608d1c917c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 20 Jan 2012 15:23:54 +0000 Subject: [PATCH] configure: only check for gst-plugins-{good,ugly,ffmpeg} in uninstalled setups We don't install .pc files for plugin modules, because we only need them in uninstalled setups, so we can find the plugins for unit tests (even when run a couple of directories deeper or out-of-tree during make distcheck). Try to avoid confusion, so only check for those if this is in fact an uninstalled setup. For installed setups there's no problem finding the plugins, we assume they are all in the plugindir specified by GStreamer core's .pc file. https://bugzilla.gnome.org/show_bug.cgi?id=668311 --- common | 2 +- configure.ac | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common b/common index 17fa4abf49..7604bab58b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 17fa4abf49d31cf5dcc2994bdbaa86e45a3fb69f +Subproject commit 7604bab58b5dfc9370d506952f0407fb75c00388 diff --git a/configure.ac b/configure.ac index 7bdd03e94e..9d5d9522c6 100644 --- a/configure.ac +++ b/configure.ac @@ -196,9 +196,12 @@ AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") 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]) -AG_GST_CHECK_GST_PLUGINS_UGLY($GST_MAJORMINOR, [0.10.16]) -AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.10.11]) +dnl skip these checks for normal installed setups to avoid confusion +AG_GST_CHECK_UNINSTALLED_SETUP([ + AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.10.25]) + AG_GST_CHECK_GST_PLUGINS_UGLY($GST_MAJORMINOR, [0.10.16]) + AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.10.11]) +]) dnl Check for documentation xrefs GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"