[gtk-engines/gtk-engines-2-22] Work around bug in automake

[Alexander Larsson <alexl src gnome org>]

commit 52a07050ad3c6d23976d08470bbed60bd752ab89
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Sep 23 13:48:43 2014 +0200

    Work around bug in automake
    
    There is an issue with later automakes and path substitution that
    breaks test/Makefile. See e.g. http://debbugs.gnu.org/db/14/14561.html
    
    This patch is from the debian package and works around this by doing
    the expansion in configure instead.

 configure.ac     |    2 ++
 test/Makefile.am |   12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8570250..652a2b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,8 @@ AC_SUBST(LIBM)
 AC_SUBST(BUILD_ENGINES)
 AC_SUBST(BUILD_THEMES)
 AC_SUBST(BUILD_SCHEMAS)
+AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst 
%,torture_%,$(TORTURE_TEST_ENGINES))'])
+
 
 if test $animation = "yes"; then
        AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
diff --git a/test/Makefile.am b/test/Makefile.am
index ea366f9..a082217 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -64,9 +64,10 @@ VALGRIND_ENV=G_SLICE=always-malloc G_DEBUG=gc-friendly,resident-modules
 # Exported Symbols Test - Tests all engines unconditionally
 #############################################################
 # Prefix with exported_
-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
+# disabled to work around automake bug #14561
+# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
 
-TESTS += $(EXPORTED_SYMBOLS_TESTS)
+#TESTS += $(EXPORTED_SYMBOLS_TESTS)
 
 
 #############################################################
@@ -85,10 +86,13 @@ SUPPORTED_TORTURE_TEST_ENGINES = \
 # Filter engines that are not build from the set of engines
 TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
 # Prefix with torture_
-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
+# disabled to work around automake bug #14561
+# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
 
 # Add TORTURE_TEST_ENGINES to list of tests
-TESTS += $(TORTURE_TEST_TESTS)
+# disabled to work around automake bug #14561
+#TESTS += $(TORTURE_TEST_TESTS)
+TESTS += @auto_find_tests@
 
 # Possible other tests:
 #  - An extensive theme switch tests that loads/unloads the engine