From: Eric Blake <eblake@redhat.com>
Date: Wed, 31 Mar 2010 21:33:55 +0000 (-0600)
Subject: maint.mk: check for [ as well as test
X-Git-Tag: v0.1~4386
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=e01b458f40440e64ce6f59beb0b446219bb6302d;p=gnulib.git

maint.mk: check for [ as well as test

A word on the regex: \<\[ never matches, so the match instead
looks for a leading space in that case.  Although configure.ac
should generally use test instead of [ (because the latter has
to be spelled [[ because of m4 processing), libvirt had a case
of the latter that would have been detected with this rule.

* top/maint.mk (sc_prohibit_test_minus_ao): Extend test.
Based on a libvirt report by Matthias Bolte.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 03d99e7b9..82263a7c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-03-31  Eric Blake  <eblake@redhat.com>
 
+	maint.mk: check for [ as well as test
+	* top/maint.mk (sc_prohibit_test_minus_ao): Extend test.
+	Based on a libvirt report by Matthias Bolte.
+
 	gnumakefile: don't squelch _version output
 	* top/GNUmakefile (_version): Create one-shot dependency rather
 	than using $(shell) when version must be regenerated.
diff --git a/top/maint.mk b/top/maint.mk
index e121eb847..8253e8bc5 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -597,9 +597,10 @@ sc_prohibit_S_IS_definition:
 _ptm1 = use "test C1 && test C2", not "test C1 -''a C2"
 _ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
 # Using test's -a and -o operators is not portable.
+# We prefer test over [, since the latter is spelled [[ in configure.ac.
 sc_prohibit_test_minus_ao:
-	@re='\<test .+ -[ao] '						\
-	msg='$(_ptm1); $(_ptm2)'						\
+	@re='(\<test| \[+) .+ -[ao] '					\
+	msg='$(_ptm1); $(_ptm2)'					\
 	  $(_prohibit_regexp)
 
 # Each program that uses proper_name_utf8 must link with one of the