From: Jim Meyering <meyering@redhat.com>
Date: Mon, 5 Apr 2010 18:56:19 +0000 (+0200)
Subject: build: update gnulib submodule to latest, and adapt
X-Git-Tag: v1.5~92
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=edfad78619d52479e02228a5789a2e98d7b0f9f6;p=debian%2Fgzip

build: update gnulib submodule to latest, and adapt

* 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 (local-checks-to-skip): Add new sc_texinfo_acronym, to skip it.
* msdos/tailor.c (fcalloc): Mark a diagnostic for translation, to
placate stricter syntax-check, even though no one uses this file.
---

diff --git a/cfg.mk b/cfg.mk
index 61e8cfe..879637b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -28,6 +28,7 @@ local-checks-to-skip =		\
   sc_prohibit_atoi_atof		\
   sc_prohibit_stat_st_blocks	\
   sc_space_tab			\
+  sc_texinfo_acronym		\
   sc_useless_cpp_parens
 
 
@@ -42,9 +43,9 @@ old_NEWS_hash = e35901d8427a032d2b88a3195ed24a8f
 sc_obs_header_regex = \
   \<(STDC_HEADERS|HAVE_(LIMITS|STRING|UNISTD|STDLIB)_H)\>
 sc_prohibit_obsolete_HAVE_HEADER_H:
-	@re='^[	 ]*#[	 ]*(el)?if.*$(sc_obs_header_regex)' \
-	msg='remove the above obsolete #if...HAVE_HEADER_H test(s)' \
-	  $(_prohibit_regexp)
+	@prohibit='^[	 ]*#[	 ]*(el)?if.*$(sc_obs_header_regex)' \
+	halt='remove the above obsolete #if...HAVE_HEADER_H test(s)' \
+	  $(_sc_search_regexp)
 
 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=1 \
@@ -52,14 +53,14 @@ update-copyright-env = \
 
 # Indent only with spaces.
 sc_prohibit_tab_based_indentation:
-	@re='^ *	'						\
-	msg='TAB in indentation; use only spaces'			\
-	  $(_prohibit_regexp)
+	@prohibit='^ *	'						\
+	halt='TAB in indentation; use only spaces'			\
+	  $(_sc_search_regexp)
 
 # Don't use "indent-tabs-mode: nil" anymore.  No longer needed.
 sc_prohibit_emacs__indent_tabs_mode__setting:
-	@re='^( *[*#] *)?indent-tabs-mode:'				\
-	msg='use of emacs indent-tabs-mode: setting'			\
-	  $(_prohibit_regexp)
+	@prohibit='^( *[*#] *)?indent-tabs-mode:'			\
+	halt='use of emacs indent-tabs-mode: setting'			\
+	  $(_sc_search_regexp)
 
 include $(srcdir)/dist-check.mk
diff --git a/gnulib b/gnulib
index 9d0ad65..fb814d4 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 9d0ad652de159d08e5f679842f8a2a5658196361
+Subproject commit fb814d4cf9834324f0c05bcd04899003933933fa
diff --git a/lib/.gitignore b/lib/.gitignore
index 461e93b..2916a59 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -11,6 +11,8 @@ charset.alias
 chdir-long.c
 chdir-long.h
 chown.c
+cloexec.c
+cloexec.h
 close-hook.c
 close-hook.h
 close-stream.c
@@ -73,6 +75,7 @@ fseterr.h
 fstatat.c
 ftello.c
 getcwd.c
+getdtablesize.c
 getopt.c
 getopt.h
 getopt.in.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 657e29f..ff53b60 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -5,6 +5,7 @@ calloc.m4
 chdir-long.m4
 chown.m4
 clock_time.m4
+cloexec.m4
 close-stream.m4
 close.m4
 closein.m4
@@ -45,6 +46,7 @@ ftello.m4
 getcwd-abort-bug.m4
 getcwd-path-max.m4
 getcwd.m4
+getdtablesize.m4
 getopt.m4
 getpagesize.m4
 gettime.m4
@@ -124,8 +126,10 @@ vfprintf-posix.m4
 warn-on-use.m4
 warnings.m4
 wchar.m4
+wchar_h.m4
 wchar_t.m4
 wctype.m4
+wctype_h.m4
 wint_t.m4
 xalloc.m4
 xgetcwd.m4
diff --git a/msdos/tailor.c b/msdos/tailor.c
index af9d5da..1d6d6ef 100644
--- a/msdos/tailor.c
+++ b/msdos/tailor.c
@@ -36,7 +36,7 @@ void * fcalloc(items, size)
     if (ptr_offset == 0) {
         ptr_offset = (ush)((uch*)buf-0);
     } else if (ptr_offset != (ush)((uch*)buf-0)) {
-        error("inconsistent ptr_offset");
+        error(_("inconsistent ptr_offset"));
     }
     *((ush*)&buf+1) += (ptr_offset + 15) >> 4;
     *(ush*)&buf = 0;