GNU bug report logs - #5850
[PATCH 1/2] build: update gnulib submodule to latest

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 5850 in the body.
You can then email your comments to 5850 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jim Meyering <jim <at> meyering.net>
To: bug-coreutils <at> gnu.org
Subject: [PATCH 1/2] build: update gnulib submodule to latest
Date: Tue, 06 Apr 2010 17:42:18 +0200

You might think this is barely worth an email, but I copied this code
into grep's configure.ac, where it was no longer masked, so there
it provoked a syntax-check failure.

From 6f6f5998679771e04f096fcf0d5d2f2c63286af2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering <at> redhat.com>
Date: Mon, 5 Apr 2010 20:14:15 +0200
Subject: [PATCH 1/2] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index e995ac9..bfbf5db 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e995ac96ab3d7a78d2bfa4da08715038b3cbb662
+Subproject commit bfbf5dbc5ec0aa90ee2ac3c48f3708de1f428178
--
1.7.0.4.552.gc303


From f267926f2d3e51756a21b772b017f698c0a10f41 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering <at> redhat.com>
Date: Tue, 6 Apr 2010 16:01:32 +0200
Subject: [PATCH 2/2] maint: fix a masked syntax-check violation

* m4/jm-macros.m4 (ARGMATCH_DIE): Use usage(EXIT_FAILURE), not usage(1).
* .x-sc_prohibit_magic_number_exit: Remove *.m4 exemption that was
masking the above.
---
 .x-sc_prohibit_magic_number_exit |    1 -
 m4/jm-macros.m4                  |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.x-sc_prohibit_magic_number_exit b/.x-sc_prohibit_magic_number_exit
index 0067bc8..ffeb5ac 100644
--- a/.x-sc_prohibit_magic_number_exit
+++ b/.x-sc_prohibit_magic_number_exit
@@ -1,3 +1,2 @@
 configure.ac
-*.m4
 ChangeLog*
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index d4e20f9..62777c7 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -35,8 +35,8 @@ AC_DEFUN([coreutils_MACROS],

   AC_REQUIRE([AC_FUNC_FSEEKO])

-  # 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.])
--
1.7.0.4.552.gc303

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.