Imported Upstream version 0.11.92upstream/0.11.92

4 files changed, 36 insertions, 2 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6679bbd..113a0cd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -50,6 +50,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+target_triplet = @target@
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -193,6 +194,10 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 GST_REVISION = @GST_REVISION@
 GST_TOOLS_DIR = @GST_TOOLS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_BZ2 = @HAVE_BZ2@
 HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@
 HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
@@ -332,7 +337,11 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 1e83e53..e6ca0e3 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -16,12 +16,16 @@ CLEANFILES = core.* test-registry.xml
 
 clean-local: clean-local-check
 
+if !GST_LIBAV_ENABLE_LGPL
+postproc_tests = elements/postproc
+endif
+
 check_PROGRAMS = \
 	generic/plugin-test \
 	generic/libavcodec-locking \
 	elements/avdec_adpcm \
 	elements/avdemux_ape \
-	elements/postproc
+	$(postproc_tests)
 
 VALGRIND_TO_FIX = \
 	generic/plugin-test \
diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in
index d15a09c..8548c74 100644
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -51,12 +51,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+target_triplet = @target@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/common/check.mak
 check_PROGRAMS = generic/plugin-test$(EXEEXT) \
 	generic/libavcodec-locking$(EXEEXT) \
 	elements/avdec_adpcm$(EXEEXT) elements/avdemux_ape$(EXEEXT) \
-	elements/postproc$(EXEEXT)
+	$(am__EXEEXT_1)
 noinst_PROGRAMS =
 subdir = tests/check
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -88,6 +89,8 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@GST_LIBAV_ENABLE_LGPL_FALSE@am__EXEEXT_1 =  \
+@GST_LIBAV_ENABLE_LGPL_FALSE@	elements/postproc$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 elements_avdec_adpcm_SOURCES = elements/avdec_adpcm.c
 elements_avdec_adpcm_OBJECTS = avdec_adpcm.$(OBJEXT)
@@ -215,6 +218,10 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 GST_REVISION = @GST_REVISION@
 GST_TOOLS_DIR = @GST_TOOLS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_BZ2 = @HAVE_BZ2@
 HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@
 HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
@@ -354,7 +361,11 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -375,6 +386,7 @@ TESTS_ENVIRONMENT = \
 
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.xml
+@GST_LIBAV_ENABLE_LGPL_FALSE@postproc_tests = elements/postproc
 VALGRIND_TO_FIX = \
 	generic/plugin-test \
 	generic/libavcodec-locking \
diff --git a/tests/files/Makefile.in b/tests/files/Makefile.in
index 99649f6..33c0044 100644
--- a/tests/files/Makefile.in
+++ b/tests/files/Makefile.in
@@ -50,6 +50,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+target_triplet = @target@
 subdir = tests/files
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -154,6 +155,10 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 GST_REVISION = @GST_REVISION@
 GST_TOOLS_DIR = @GST_TOOLS_DIR@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_BZ2 = @HAVE_BZ2@
 HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@
 HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
@@ -293,7 +298,11 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@