[beast] BUILD: allow BEAST_BUILD=no-distcheck-tests to speed up lengthy distcheck

[Tim Janik <timj src gnome org>]

commit a156110c7bc581f536979935d2b50d88c737fe2a
Author: Tim Janik <timj gtk org>
Date:   Wed Sep 8 20:18:00 2010 +0200

    BUILD: allow BEAST_BUILD=no-distcheck-tests to speed up lengthy distcheck

 Makefile.am  |   11 +++++++++--
 configure.in |    8 ++++----
 2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7053206..6de3900 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,12 +64,19 @@ clean_filter = $(strip		\
 #distcleancheck_listfiles     = find . -type f -print	# original automake-1.11 setting
 distcleancheck_listfiles      = find . -type f $(patsubst ./%, ! -path \*/%, $(clean_filter)) -print
 
-# run 'make report' after installcheck from distcheck
+# (test_option, INPUTSTRING, YESOPT, [NOOPT]) :- true if YESOPT is present
+test_option = test `echo ":$(strip $(1)):" | sed 's/.*:$(strip $(2))://g' | wc -c` -lt \
+      `echo ":$(strip $(1)):" | sed 's/.*:$(or $(strip $(3)), no-$(strip $(2)))://g' | wc -c`
+
+# by default, run 'make report' after installcheck from inside distcheck
 DISTCHECK_CONFIGURE_FLAGS = --enable-distcheck-tests
 INSTALLCHECK_HOOK = installcheck # use indirection to emulate installcheck-hook
 $(INSTALLCHECK_HOOK): costly-distcheck-tests
+# --enable-distcheck-tests causes BEAST_BUILD_DEFAULTS=distcheck-tests which can
+# be overridden by the user with BEAST_BUILD=no-distcheck-tests
 costly-distcheck-tests:
-	@case "$(BEAST_BUILD)" in *:distcheck-tests:*) $(MAKE) report ;; esac
+	@! $(call test_option, $(BEAST_BUILD_DEFAULTS):$(BEAST_BUILD), distcheck-tests) \
+	|| $(MAKE) report
 .PHONY: costly-distcheck-tests
 
 # remove non-distributed po files from distributed po/POTSCAN
diff --git a/configure.in b/configure.in
index 83d039a..af2bea4 100644
--- a/configure.in
+++ b/configure.in
@@ -91,10 +91,10 @@ AC_ARG_ENABLE(distcheck-tests, [  --enable-distcheck-tests       turn on resourc
 AC_ARG_WITH(doxer,             [  --with-doxer=[no/yes]          build documentation with doxer documentation tool], [DOXRULE=''], [DOXRULE='#'])
 AC_SUBST(DOXRULE)
 
-# BEAST_BUILD configuration
-BEAST_BUILD="$BEAST_BUILD"
-test "$enable_distcheck_tests" = yes && BEAST_BUILD=":distcheck-tests:$BEAST_BUILD"
-AC_SUBST(BEAST_BUILD)
+# set BEAST_BUILD_DEFAULTS from configure's BEAST_BUILD env
+BEAST_BUILD_DEFAULTS="$BEAST_BUILD_DEFAULTS"
+test "$enable_distcheck_tests" = yes && BEAST_BUILD_DEFAULTS="$BEAST_BUILD_DEFAULTS:distcheck-tests:"
+AC_SUBST(BEAST_BUILD_DEFAULTS)
 
 dnl # setup DEBUG defaults
 if test "x$enable_debug" = "xyes"; then