two syntax-check-repairing changes

[Jim Meyering]

I forgot to run "make syntax-check" before pushing
the argumatch change.  These make it pass again:

>From 6aaf073ddc8eced8cbde3f687b1a6464476c6be4 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 5 Apr 2010 11:58:57 +0200
Subject: [PATCH 1/2] maint: update cfg.mk to work with gnulib's newer "make 
syntax-check"

* cfg.mk: Update to use new _sc_search_regexp interface.  Run this:
perl -pi -e 's/\b_prohibit_regexp\b/_sc_search_regexp/;'
-e 's/\bmsg=/halt=/; s/\bre=/prohibit=/;' cfg.mk
and then adjust backslashes so they still line up.
---
 cfg.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 0adeb74..0e0e162 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -41,9 +41,9 @@ sc_prohibit_jm_in_m4:
              1>&2; exit 1; } || :

 sc_prohibit_echo_minus_en:
-       @re='\<echo -[en]'                                              \
-       msg='do not use echo ''-e or echo ''-n; use printf instead'     \
-         $(_prohibit_regexp)
+       @prohibit='\<echo -[en]'                                        \
+       halt='do not use echo ''-e or echo ''-n; use printf instead'    \
+         $(_sc_search_regexp)

 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=1 \
--
1.7.0.4.529.g78fb


>From f95776680cc4c150fa213f8d59218c2e44cf0e21 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 5 Apr 2010 11:56:17 +0200
Subject: [PATCH 2/2] maint: fix new argmatch-related syntax-check failures

* configure.ac (ARGMATCH_DIE): Use usage(EXIT_FAILURE), not exit(1).
* po/POTFILES.in: Add lib/argmatch.c.
---
 configure.ac   |    4 ++--
 po/POTFILES.in |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 820b459..7eaeed3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,8 +128,8 @@ if test "$gl_gcc_warnings" = yes; then
   AC_SUBST([GNULIB_WARN_CFLAGS])
 fi

-# By default, argmatch should fail calling usage (1).
-AC_DEFINE([ARGMATCH_DIE], [usage (1)],
+# By default, argmatch should fail calling usage (EXIT_FAILURE).
+AC_DEFINE([ARGMATCH_DIE], [usage (EXIT_FAILURE)],
           [Define to the function xargmatch calls on failures.])
 AC_DEFINE([ARGMATCH_DIE_DECL], [void usage (int _e)],
           [Define to the declaration of the xargmatch failure function.])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c0b9025..ff8b148 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

+lib/argmatch.c
 lib/closeout.c
 lib/error.c
 lib/getopt.c
--
1.7.0.4.529.g78fb