From 90d006141a38ca0d9c719f22c49880cfc073016e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 22 Apr 2018 20:09:01 +0100 Subject: [PATCH] configure: check for -good and -bad plugins only in uninstalled setup Avoids confusing configure messages looking or a -good .pc file that doesn't exist. Also use plugindir variables that common macros set while at it. https://bugzilla.gnome.org/show_bug.cgi?id=795466 --- configure.ac | 17 +++++------------ tests/check/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index ac520a9e07..9d6790b517 100644 --- a/configure.ac +++ b/configure.ac @@ -176,19 +176,12 @@ AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], [yes]) AG_GST_CHECK_GST_NET($GST_API_VERSION, [$GST_REQ], yes) AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], [yes]) -GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_API_VERSION --variable pluginsdir` -AC_SUBST(GSTPB_PLUGINS_DIR) -AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR) -AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [$GSTPG_REQ], [yes]) -GSTPG_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-good-$GST_API_VERSION --variable pluginsdir` -AC_SUBST(GSTPG_PLUGINS_DIR) -AC_MSG_NOTICE(Using GStreamer Good Plugins in $GSTPG_PLUGINS_DIR) - -AG_GST_CHECK_GST_PLUGINS_BAD($GST_API_VERSION, [$GSTPD_REQ], [yes]) -GSTPD_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-bad-$GST_API_VERSION --variable pluginsdir` -AC_SUBST(GSTPD_PLUGINS_DIR) -AC_MSG_NOTICE(Using GStreamer Bad Plugins in $GSTPD_PLUGINS_DIR) +dnl check for uninstalled plugin directories for unit tests +AG_GST_CHECK_UNINSTALLED_SETUP([ + AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [$GSTPB_REQ]) + AG_GST_CHECK_GST_PLUGINS_BAD($GST_API_VERSION, [$GSTPB_REQ]) +]) AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no) AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_GST_CHECK" = "xyes") diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index d4bdf7227e..574297cfb4 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -10,7 +10,7 @@ AM_TESTS_ENVIRONMENT += \ GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \ $(REGISTRY_ENVIRONMENT) \ GST_PLUGIN_SYSTEM_PATH_1_0= \ - GST_PLUGIN_PATH_1_0=$(GST_PLUGINS_DIR):$(GSTPB_PLUGINS_DIR):$(GSTPG_PLUGINS_DIR):$(GSTPD_PLUGINS_DIR):$(top_builddir)/gst \ + GST_PLUGIN_PATH_1_0=$(GST_PLUGINS_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BAD_DIR):$(top_builddir)/gst \ GST_PLUGIN_LOADING_WHITELIST="gstreamer:gst-plugins-base:gst-plugins-good:gst-plugins-bad:gst-rtsp-server"