grep branch, master, updated. v2.6.3-19-gf957766

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  f95776680cc4c150fa213f8d59218c2e44cf0e21 (commit)
       via  6aaf073ddc8eced8cbde3f687b1a6464476c6be4 (commit)
      from  93f29b5d7dbe74004fc6943d9b34a45b1a1dbfad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=f95776680cc4c150fa213f8d59218c2e44cf0e21


commit f95776680cc4c150fa213f8d59218c2e44cf0e21
Author: Jim Meyering <address@hidden>
Date:   Mon Apr 5 11:56:17 2010 +0200

    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.

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

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=6aaf073ddc8eced8cbde3f687b1a6464476c6be4


commit f95776680cc4c150fa213f8d59218c2e44cf0e21
Author: Jim Meyering <address@hidden>
Date:   Mon Apr 5 11:56:17 2010 +0200

    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.

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

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk         |    6 +++---
 configure.ac   |    4 ++--
 po/POTFILES.in |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
grep