maint.mk: fix some fallout

Also rearrange ChangeLog to match commit order.

* NEWS: Document the incompatible change, and its effect on cfg.mk.
* top/maint.mk (sc_prohibit_test_minus_ao): Update.

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

diff --git a/ChangeLog b/ChangeLog
index 716d815abcfc78036e348cf41b3b8d9c3081586e..f463e41069cd83565c00135fd0f5ea6ccba13801 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,8 @@
-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.
-       (_autoreconf): Run verbosely, by default.
+2010-04-02  Eric Blake  <eblake@redhat.com>
 
-       sys_time: avoid compiler warnings
-       * lib/sys_time.in.h (includes): Ensure gcc pragma is
-       unconditional, fixing regression from 2010-03-29.
-       Reported by Simon Josefsson.
+       maint.mk: fix some fallout
+       * NEWS: Document the incompatible change, and its effect on cfg.mk.
+       * top/maint.mk (sc_prohibit_test_minus_ao): Update.
 
 2010-03-28  Jose E. Marchesi  <jemarch@gnu.org>
 
@@ -58,6 +48,24 @@
        (sc_error_message_uppercase): Likewise.
        (sc_error_message_period): Likewise.
 
+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.
+       (_autoreconf): Run verbosely, by default.
+
+       sys_time: avoid compiler warnings
+       * lib/sys_time.in.h (includes): Ensure gcc pragma is
+       unconditional, fixing regression from 2010-03-29.
+       Reported by Simon Josefsson.
+
+2010-03-28  Jose E. Marchesi  <jemarch@gnu.org>
+
        maint.mk: s/_header_without_use/_sc_header_without_use/
        * top/maint.mk (_sc_header_without_use): Rename from _header_without_use.
        (sc_prohibit_assert_without_use): Use the new name.

diff --git a/NEWS b/NEWS
index 778e3b965d138b14b8954d2bc42496ae16b79930..bb94b033bafa11b0c09e133af819a70827c692c8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2010-04-02  maintainer-makefile
+                            The macro _prohibit_regexp has been revamped into
+                            a new macro _sc_search_regexp; custom syntax
+                            checks in your cfg.mk will need to be rewritten.
+
 2010-03-28  lib-ignore      This module now provides a variable
                             IGNORE_UNUSED_LIBRARIES_CFLAGS that you should
                             add to LDFLAGS (when linking C programs only) or

diff --git a/top/maint.mk b/top/maint.mk
index 9cfe1726ced536fbf377d1a5eb2bc71fc561c938..13a0438f90d9a175bb4a14221d1659ed8aa22d09 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -670,9 +670,9 @@ _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)'                                        \
-         $(_prohibit_regexp)
+       @prohibit='(\<test| \[+) .+ -[ao] '                             \
+       halt='$(_ptm1); $(_ptm2)'                                       \
+         $(_sc_search_regexp)
 
 # Each program that uses proper_name_utf8 must link with one of the
 # ICONV libraries.  Otherwise, some ICONV library must appear in LDADD.