[cheese] Improve test and distcheck Makefile targets

[David King <davidk src gnome org>]

commit bd97dccc29e193d336e1cfd6ded0ae5fd314be8e
Author: David King <amigadave amigadave com>
Date:   Sat Dec 24 17:50:00 2011 +0100

    Improve test and distcheck Makefile targets
    
    Drop obsolete --disable-scrollkeeper from distcheck configure flags.
    Use the same environment for testing and test reporting.

 Makefile.am |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 29c96ab..9123537 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -391,9 +391,12 @@ tests_test_libcheese_LDADD = \
 	libcheese.la
 
 if CHEESE_ENABLE_TESTS
+# Not automake built-in TESTS_ENVIRONMENT!
+TEST_ENVIRONMENT = MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+
 # test: run all tests.
 test: $(check_PROGRAMS)
-	$(AM_V_at)test -z "$(check_PROGRAMS)" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) $(GTESTER) --verbose $(check_PROGRAMS)
+	$(AM_V_at)$(TEST_ENVIRONMENT) $(GTESTER) --verbose $(check_PROGRAMS)
 
 # test-report: run tests and generate report.
 # perf-report: run tests with -m perf and generate report.
@@ -405,7 +408,7 @@ test-report perf-report full-report: $(check_PROGRAMS)
 	  perf-report) test_options="-k -m=perf";; \
 	  full-report) test_options="-k -m=perf -m=slow";; \
 	  esac ; \
-	  $(GTESTER) --verbose $$test_options -o test-log.xml $(check_PROGRAMS) ; \
+	  $(TEST_ENVIRONMENT) $(GTESTER) --verbose $$test_options -o test-log.xml $(check_PROGRAMS) ; \
 	  if test -d "$(top_srcdir)/.git" ; then \
 	    REVISION=`git describe` ; \
 	  else \
@@ -514,7 +517,7 @@ MAINTAINERCLEANFILES = \
 	omf.make \
 	xmldocs.make
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --enable-introspection --enable-man
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --enable-man
 
 CHANGELOG_START = 2.26.0