diff --git a/ChangeLog b/ChangeLog index 72b0ace3f5..90d906e83b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-01 Jan Schmidt + + * tests/check/Makefile.am: + Draw plugins in from the build tree sys/ dir, rather than + picking up the already installed versions. + 2007-02-28 Thomas Vander Stichele * configure.ac: diff --git a/common b/common index 54c2a701c2..9a56e28fc1 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 54c2a701c28dcddaf051abf09a360223acd096c9 +Subproject commit 9a56e28fc15440eb6852411321c46312e1d1bb73 diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index b086f35480..bb2540f92c 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -12,7 +12,7 @@ REGISTRY_ENVIRONMENT = \ TESTS_ENVIRONMENT = \ $(REGISTRY_ENVIRONMENT) \ GST_PLUGIN_SYSTEM_PATH= \ - GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) + GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@