From 2564e752f0d0faa9af2351704cc120ffe14e01cb Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Thu, 16 Sep 2010 12:32:43 +0200
Subject: [PATCH 1/2] New maintainer check, for typos in $required definition.

* Makefile.am (sc_tests_required_typos): New maintaner check.
(syntax_check_rules): Updated.
From a report by Peter Rosin.
---
 ChangeLog   |    7 +++++++
 Makefile.am |    9 +++++++++
 Makefile.in |    8 ++++++++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b64d55..950eafc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-16  Stefano Lattarini  <address@hidden>
+
+	New maintainer check, for typos in $required definition.
+	* Makefile.am (sc_tests_required_typos): New maintaner check.
+	(syntax_check_rules): Updated.
+	From a report by Peter Rosin.
+
 2010-09-13  Ralf Wildenhues  <address@hidden>
 
 	* HACKING: Hint at old commits with `git describe' output.
diff --git a/Makefile.am b/Makefile.am
index 3aead75..7921181 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,6 +136,7 @@ sc_tests_Exit_not_exit \
 sc_tests_automake_fails \
 sc_tests_plain_aclocal \
 sc_tests_plain_perl \
+sc_tests_required_typos \
 sc_tests_required_after_defs \
 sc_tests_overriding_macros_on_cmdline \
 sc_tests_plain_sleep \
@@ -358,6 +359,14 @@ sc_tests_plain_perl:
 	  exit 1; \
 	fi
 
+## Look for common typos in the definition of `$required'.
+sc_tests_required_typos:
+	@if grep -v '^#' $(srcdir)/tests/*.test | grep -E '\brequires?='; then \
+	  echo 'In the above tests, to declare required tools, you want' 1>&2; \
+	  echo 'to define $$required, not $$require or $$requires' 1>&2; \
+	  exit 1; \
+	fi
+
 ## Setting `required' after sourcing `./defs' is a bug.
 sc_tests_required_after_defs:
 	@for file in $(srcdir)/tests/*.test; do \
diff --git a/Makefile.in b/Makefile.in
index 528b80e..48fa893 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,6 +294,7 @@ sc_tests_Exit_not_exit \
 sc_tests_automake_fails \
 sc_tests_plain_aclocal \
 sc_tests_plain_perl \
+sc_tests_required_typos \
 sc_tests_required_after_defs \
 sc_tests_overriding_macros_on_cmdline \
 sc_tests_plain_sleep \
@@ -1048,6 +1049,13 @@ sc_tests_plain_perl:
 	  exit 1; \
 	fi
 
+sc_tests_required_typos:
+	@if grep -v '^#' $(srcdir)/tests/*.test | grep -E '\brequires?='; then \
+	  echo 'In the above tests, to declare required tools, you want' 1>&2; \
+	  echo 'to define $$required, not $$require or $$requires' 1>&2; \
+	  exit 1; \
+	fi
+
 sc_tests_required_after_defs:
 	@for file in $(srcdir)/tests/*.test; do \
 	  if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; then \
-- 
1.7.1