From 2259a29c5ae7c34c7709235c96f47a069c2394bb Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Wed, 7 Mar 2012 10:26:44 +0100 Subject: [PATCH] Update gnulib files. --- GNUmakefile | 14 ++-------- NEWS | 1 + build-aux/update-copyright | 13 +++++++-- gl/errno.in.h | 3 +- gl/gettext.h | 3 +- gl/lseek.c | 3 +- gl/malloc.c | 3 +- gl/msvc-inval.c | 3 +- gl/msvc-inval.h | 3 +- gl/msvc-nothrow.c | 3 +- gl/msvc-nothrow.h | 3 +- gl/read-file.c | 3 +- gl/read-file.h | 3 +- gl/stdarg.in.h | 3 +- gl/stddef.in.h | 3 +- gl/stdint.in.h | 11 ++++---- gl/stdio-impl.h | 2 ++ gl/stdio.in.h | 5 ++-- gl/sys_stat.in.h | 30 ++++++++++++++++---- gl/time.in.h | 3 +- gl/unistd.in.h | 3 +- gl/version-etc.h | 2 +- lib/gllib/stddef.in.h | 3 +- lib/gllib/stdint.in.h | 11 ++++---- lib/gllib/string.in.h | 3 +- lib/gllib/strverscmp.c | 3 +- maint.mk | 69 ++++++++++++++++++++++++++++++---------------- 27 files changed, 116 insertions(+), 93 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index d0fd3e8..58f2ead 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -20,20 +20,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Systems where /bin/sh is not the default shell need this. The $(shell) -# command below won't work with e.g. stock DOS/Windows shells. -ifeq ($(wildcard /bin/s[h]),/bin/sh) -SHELL = /bin/sh -else -# will be used only with the next shell-test line, then overwritten -# by a configured-in value -SHELL = sh -endif - # If the user runs GNU make but has not yet run ./configure, # give them a diagnostic. -_have-Makefile := $(shell test -f Makefile && echo yes) -ifeq ($(_have-Makefile),yes) +_gl-Makefile := $(wildcard [M]akefile) +ifneq ($(_gl-Makefile),) # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner diff --git a/NEWS b/NEWS index ea6f001..c3b49fa 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ GNU Libtasn1 NEWS -*- outline -*- * Noteworthy changes in release 2.12 (????-??-??) [?] +- build: Update gnulib files. * Noteworthy changes in release 2.11 (2011-11-25) [stable] - qa: Now builds without compiler warnings with Solaris CC. diff --git a/build-aux/update-copyright b/build-aux/update-copyright index d86a12b..082b749 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}' if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2011-01-02.20:59'; # UTC +my $VERSION = '2012-02-05.21:39'; # UTC # Copyright (C) 2009-2012 Free Software Foundation, Inc. # @@ -24,7 +24,7 @@ my $VERSION = '2011-01-02.20:59'; # UTC # The arguments to this script should be names of files that contain # copyright statements to be updated. The copyright holder's name -# defaults to "Free Softward Foundation, Inc." but may be changed to +# defaults to "Free Software Foundation, Inc." but may be changed to # any other name by using the "UPDATE_COPYRIGHT_HOLDER" environment # variable. # @@ -43,7 +43,7 @@ my $VERSION = '2011-01-02.20:59'; # UTC # A warning is printed for every file for which no copyright # statement is recognized. # -# Each file's copyright statement must be formated correctly in +# Each file's copyright statement must be formatted correctly in # order to be recognized. For example, each of these is fine: # # Copyright @copyright{} 1990-2005, 2007-2009 Free Software @@ -110,6 +110,9 @@ my $VERSION = '2011-01-02.20:59'; # UTC # interval (such as 1990-2008). If unset or set to 0, all existing # copyright year intervals in a reformatted FSF copyright statement # are expanded instead. +# If UPDATE_COPYRIGHT_USE_INTERVALS=2, convert a sequence with gaps +# to the minimal containing range. For example, convert +# 2000, 2004-2007, 2009 to 2000-2009. # 3. For testing purposes, you can set the assumed current year in # UPDATE_COPYRIGHT_YEAR. # 4. The default maximum line length for a copyright line is 72. @@ -221,6 +224,10 @@ if (defined $stmt_re) })) )+ /$1-$3/gx; + + # When it's 2, emit a single range encompassing all year numbers. + $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2 + and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1-$2/; } # Format within margin. diff --git a/gl/errno.in.h b/gl/errno.in.h index 5271bcd..2f42612 100644 --- a/gl/errno.in.h +++ b/gl/errno.in.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_ERRNO_H diff --git a/gl/gettext.h b/gl/gettext.h index 050134a..75875cd 100644 --- a/gl/gettext.h +++ b/gl/gettext.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program; if not, see . */ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 diff --git a/gl/lseek.c b/gl/lseek.c index 5433678..cd7e2d6 100644 --- a/gl/lseek.c +++ b/gl/lseek.c @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program; if not, see . */ #include diff --git a/gl/malloc.c b/gl/malloc.c index ffe042b..e0d5c89 100644 --- a/gl/malloc.c +++ b/gl/malloc.c @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ /* written by Jim Meyering and Bruno Haible */ diff --git a/gl/msvc-inval.c b/gl/msvc-inval.c index b7a917d..ba76a7e 100644 --- a/gl/msvc-inval.c +++ b/gl/msvc-inval.c @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program; if not, see . */ #include diff --git a/gl/msvc-inval.h b/gl/msvc-inval.h index 373f9bf..eb6930b 100644 --- a/gl/msvc-inval.h +++ b/gl/msvc-inval.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program; if not, see . */ #ifndef _MSVC_INVAL_H #define _MSVC_INVAL_H diff --git a/gl/msvc-nothrow.c b/gl/msvc-nothrow.c index f0fea17..e5cf181 100644 --- a/gl/msvc-nothrow.c +++ b/gl/msvc-nothrow.c @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program; if not, see . */ #include diff --git a/gl/msvc-nothrow.h b/gl/msvc-nothrow.h index e066b24..2b71945 100644 --- a/gl/msvc-nothrow.h +++ b/gl/msvc-nothrow.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program; if not, see . */ #ifndef _MSVC_NOTHROW_H #define _MSVC_NOTHROW_H diff --git a/gl/read-file.c b/gl/read-file.c index 72ab4e8..0d5ab8b 100644 --- a/gl/read-file.c +++ b/gl/read-file.c @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #include diff --git a/gl/read-file.h b/gl/read-file.h index b45b76d..a1142b8 100644 --- a/gl/read-file.h +++ b/gl/read-file.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #ifndef READ_FILE_H #define READ_FILE_H diff --git a/gl/stdarg.in.h b/gl/stdarg.in.h index 3e0e43f..53104a6 100644 --- a/gl/stdarg.in.h +++ b/gl/stdarg.in.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_STDARG_H diff --git a/gl/stddef.in.h b/gl/stddef.in.h index 65e1775..17fcaea 100644 --- a/gl/stddef.in.h +++ b/gl/stddef.in.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ /* Written by Eric Blake. */ diff --git a/gl/stdint.in.h b/gl/stdint.in.h index f16a2d4..8e4c822 100644 --- a/gl/stdint.in.h +++ b/gl/stdint.in.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ /* * ISO C 99 for platforms that lack it. @@ -36,8 +35,10 @@ /* On Android (Bionic libc), includes this file before having defined 'time_t'. Therefore in this case avoid including - other system header files; just include the system's . */ -#if defined __BIONIC__ \ + other system header files; just include the system's . + Ideally we should test __BIONIC__ here, but it is only defined after + has been included; hence test __ANDROID__ instead. */ +#if defined __ANDROID__ \ && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_ # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else @@ -614,5 +615,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) #endif #endif /* _@GUARD_PREFIX@_STDINT_H */ -#endif /* !(defined __BIONIC__ && ...) */ +#endif /* !(defined __ANDROID__ && ...) */ #endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */ diff --git a/gl/stdio-impl.h b/gl/stdio-impl.h index a065c1a..4935795 100644 --- a/gl/stdio-impl.h +++ b/gl/stdio-impl.h @@ -26,6 +26,8 @@ # include #endif +#include /* For detecting Plan9. */ + #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ # if defined __DragonFly__ /* DragonFly */ diff --git a/gl/stdio.in.h b/gl/stdio.in.h index 0481930..9dc7c4a 100644 --- a/gl/stdio.in.h +++ b/gl/stdio.in.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -779,7 +778,7 @@ _GL_CXXALIASWARN (pclose); #elif defined GNULIB_POSIXCHECK # undef pclose # if HAVE_RAW_DECL_PCLOSE -_GL_WARN_ON_USE (pclose, "popen is unportable - " +_GL_WARN_ON_USE (pclose, "pclose is unportable - " "use gnulib module pclose for more portability"); # endif #endif diff --git a/gl/sys_stat.in.h b/gl/sys_stat.in.h index 44b6a1b..e4331c7 100644 --- a/gl/sys_stat.in.h +++ b/gl/sys_stat.in.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ @@ -616,14 +615,33 @@ _GL_WARN_ON_USE (mknodat, "mknodat is not portable - " /* We can't use the object-like #define stat rpl_stat, because of struct stat. This means that rpl_stat will not be used if the user does (stat)(a,b). Oh well. */ -# undef stat -# ifdef _LARGE_FILES +# if defined _AIX && defined stat && defined _LARGE_FILES /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, so we have to replace stat64() instead of stat(). */ -# define stat stat64 # undef stat64 # define stat64(name, st) rpl_stat (name, st) -# else /* !_LARGE_FILES */ +# elif defined __MINGW32__ && defined stat +# ifdef _USE_32BIT_TIME_T + /* The system headers define stat to _stat32i64. */ +# undef _stat32i64 +# define _stat32i64(name, st) rpl_stat (name, st) +# else + /* The system headers define stat to _stat64. */ +# undef _stat64 +# define _stat64(name, st) rpl_stat (name, st) +# endif +# elif defined _MSC_VER && defined stat +# ifdef _USE_32BIT_TIME_T + /* The system headers define stat to _stat32. */ +# undef _stat32 +# define _stat32(name, st) rpl_stat (name, st) +# else + /* The system headers define stat to _stat64i32. */ +# undef _stat64i32 +# define _stat64i32(name, st) rpl_stat (name, st) +# endif +# else /* !(_AIX ||__MINGW32__ || _MSC_VER) */ +# undef stat # define stat(name, st) rpl_stat (name, st) # endif /* !_LARGE_FILES */ _GL_EXTERN_C int stat (const char *name, struct stat *buf) diff --git a/gl/time.in.h b/gl/time.in.h index 5080d45..04cde05 100644 --- a/gl/time.in.h +++ b/gl/time.in.h @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ diff --git a/gl/unistd.in.h b/gl/unistd.in.h index 660094a..1b26c09 100644 --- a/gl/unistd.in.h +++ b/gl/unistd.in.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ diff --git a/gl/version-etc.h b/gl/version-etc.h index c62704c..5548c02 100644 --- a/gl/version-etc.h +++ b/gl/version-etc.h @@ -37,7 +37,7 @@ extern const char version_etc_copyright[]; standard way: command and package names, package version, followed by a short GPLv3+ notice and a list of up to 10 author names. - If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of + If COMMAND_NAME is NULL, the PACKAGE is assumed to be the name of the program. The formats are therefore: PACKAGE VERSION diff --git a/lib/gllib/stddef.in.h b/lib/gllib/stddef.in.h index d282610..9384cf6 100644 --- a/lib/gllib/stddef.in.h +++ b/lib/gllib/stddef.in.h @@ -13,8 +13,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ /* Written by Eric Blake. */ diff --git a/lib/gllib/stdint.in.h b/lib/gllib/stdint.in.h index ea0f32f..de38072 100644 --- a/lib/gllib/stdint.in.h +++ b/lib/gllib/stdint.in.h @@ -13,8 +13,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ /* * ISO C 99 for platforms that lack it. @@ -36,8 +35,10 @@ /* On Android (Bionic libc), includes this file before having defined 'time_t'. Therefore in this case avoid including - other system header files; just include the system's . */ -#if defined __BIONIC__ \ + other system header files; just include the system's . + Ideally we should test __BIONIC__ here, but it is only defined after + has been included; hence test __ANDROID__ instead. */ +#if defined __ANDROID__ \ && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_ # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else @@ -614,5 +615,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) #endif #endif /* _@GUARD_PREFIX@_STDINT_H */ -#endif /* !(defined __BIONIC__ && ...) */ +#endif /* !(defined __ANDROID__ && ...) */ #endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */ diff --git a/lib/gllib/string.in.h b/lib/gllib/string.in.h index 2b84c54..26652d3 100644 --- a/lib/gllib/string.in.h +++ b/lib/gllib/string.in.h @@ -13,8 +13,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_STRING_H diff --git a/lib/gllib/strverscmp.c b/lib/gllib/strverscmp.c index 5456519..46f3ebc 100644 --- a/lib/gllib/strverscmp.c +++ b/lib/gllib/strverscmp.c @@ -15,8 +15,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program; if not, see . */ #if !_LIBC # include diff --git a/maint.mk b/maint.mk index 2668655..a97e0bd 100644 --- a/maint.mk +++ b/maint.mk @@ -178,6 +178,13 @@ syntax-check: $(local-check) # Regular expression (ERE) denoting either a forbidden construct # or a required construct. Those arguments are exclusive. # +# exclude +# +# Regular expression (ERE) denoting lines to ignore that matched +# a prohibit construct. For example, this can be used to exclude +# comments that mention why the nearby code uses an alternative +# construct instead of the simpler prohibited construct. +# # in_vc_files | in_files # # grep-E-style regexp denoting the files to check. If no files @@ -212,6 +219,17 @@ syntax-check: $(local-check) # when filtering by name via in_files, we explicitly filter out matching # names here as well. +# Initialize each, so that envvar settings cannot interfere. +export require = +export prohibit = +export exclude = +export in_vc_files = +export in_files = +export containing = +export non_containing = +export halt = +export with_grep_options = + # By default, _sc_search_regexp does not ignore case. export ignore_case = _ignore_case = $$(test -n "$$ignore_case" && printf %s -i || :) @@ -231,6 +249,9 @@ define _sc_search_regexp test -z "$$prohibit" && test -z "$$require" \ && { msg='Should specify either prohibit or require' \ $(_sc_say_and_exit) } || :; \ + test -z "$$prohibit" && test -n "$$exclude" \ + && { msg='Use of exclude requires a prohibit pattern' \ + $(_sc_say_and_exit) } || :; \ test -n "$$in_vc_files" && test -n "$$in_files" \ && { msg='Cannot specify both in_vc_files and in_files' \ $(_sc_say_and_exit) } || :; \ @@ -258,6 +279,7 @@ define _sc_search_regexp if test -n "$$files"; then \ if test -n "$$prohibit"; then \ grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \ + | grep -vE "$${exclude-^$$}" \ && { msg="$$halt" $(_sc_say_and_exit) } || :; \ else \ grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \ @@ -276,17 +298,17 @@ sc_avoid_if_before_free: exit 1; } || : sc_cast_of_argument_to_free: - @prohibit='\&2; exit 1; } || : + @prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)' \ + exclude=':# *define STRN?EQ\(' \ + halt='$(ME): replace strcmp calls above with STREQ/STRNEQ' \ + $(_sc_search_regexp) # Pass EXIT_*, not number, to usage, exit, and error (when exiting) # Convert all uses automatically, via these two commands: @@ -516,7 +538,7 @@ sc_prohibit_argmatch_without_use: sc_prohibit_canonicalize_without_use: @h='canonicalize.h' \ - re='CAN_(EXISTING|ALL_BUT_LAST|MISSING)|canonicalize_(mode_t|filename_mode)' \ + re='CAN_(EXISTING|ALL_BUT_LAST|MISSING)|canonicalize_(mode_t|filename_mode|file_name)' \ $(_sc_header_without_use) sc_prohibit_root_dev_ino_without_use: @@ -708,12 +730,10 @@ _gl_translatable_diag_func_re ?= error # Look for diagnostics that aren't marked for translation. # This won't find any for which error's format string is on a separate line. sc_unmarked_diagnostics: - @grep -nE \ - '\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \ - $$($(VC_LIST_EXCEPT)) \ - | grep -Ev '(_|ngettext ?)\(' && \ - { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ - exit 1; } || : + @prohibit='\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \ + exclude='(_|ngettext ?)\(' \ + halt='$(ME): found unmarked diagnostic(s)' \ + $(_sc_search_regexp) # Avoid useless parentheses like those in this example: # #if defined (SYMBOL) || defined (SYM2) @@ -974,10 +994,10 @@ sc_redundant_const: $(_sc_search_regexp) sc_const_long_option: - @grep '^ *static.*struct option ' $$($(VC_LIST_EXCEPT)) \ - | grep -Ev 'const struct option|struct option const' && { \ - echo 1>&2 '$(ME): add "const" to the above declarations'; \ - exit 1; } || : + @prohibit='^ *static.*struct option ' \ + exclude='const struct option|struct option const' \ + halt='$(ME): add "const" to the above declarations' \ + $(_sc_search_regexp) NEWS_hash = \ $$(sed -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p' \ @@ -1015,8 +1035,8 @@ update-NEWS-hash: NEWS # setting this to ' && !/PRAGMA_SYSTEM_HEADER/'. _makefile_at_at_check_exceptions ?= sc_makefile_at_at_check: - @perl -ne '/\@[A-Z_0-9]+\@/' \ - -e ' && !/([A-Z_0-9]+)\s+=.*\@\1\@$$/' \ + @perl -ne '/\@\w+\@/' \ + -e ' && !/(\w+)\s+=.*\@\1\@$$/' \ -e ''$(_makefile_at_at_check_exceptions) \ -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}' \ $$($(VC_LIST_EXCEPT) | grep -E '(^|/)(Makefile\.am|[^/]+\.mk)$$') \ @@ -1079,7 +1099,7 @@ sc_po_check: # Sometimes it is useful to change the PATH environment variable # in Makefiles. When doing so, it's better not to use the Unix-centric # path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'. -msg = '$(ME): Do not use '\'':'\'' above; use $$(PATH_SEPARATOR) instead' +msg = '$(ME): Do not use ":" above; use $$(PATH_SEPARATOR) instead' sc_makefile_path_separator_check: @prohibit='PATH[=].*:' \ in_vc_files='akefile|\.mk$$' \ @@ -1234,7 +1254,8 @@ announcement: NEWS ChangeLog $(rel-files) --gpg-key-id=$(gpg_key_ID) \ --news=$(srcdir)/NEWS \ --bootstrap-tools=$(bootstrap-tools) \ - --gnulib-version=$(gnulib-version) \ + $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ + echo --gnulib-version=$(gnulib-version);; esac) \ --no-print-checksums \ $(addprefix --url-dir=, $(url_dir_list)) @@ -1311,7 +1332,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks) $(MAKE) vc-diff-check $(MAKE) news-check $(MAKE) distcheck - $(MAKE) dist XZ_OPT=-9ev + $(MAKE) dist $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@ $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@ -- 2.7.4