From: Paul Eggert Date: Thu, 25 Apr 2024 15:24:22 +0000 (-0700) Subject: make fetch X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ca664d96d6fe95809d79c8613a3b929b38cc9c7;p=thirdparty%2Fautoconf.git make fetch --- diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index b0433c798..60447d4f5 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,7 +2,7 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2024-01-01.00 +scriptversion=2024-01-27.16 # Copyright 2003-2024 Free Software Foundation, Inc. # @@ -66,7 +66,7 @@ generate_html=true generate_info=true generate_tex=true outdir=manual -source_extra= +unset source_extra split=node srcfile= texarg="-t @finalout" @@ -167,7 +167,7 @@ while test $# -gt 0; do --html) shift; default_htmlarg=false; htmlarg=$1;; --info) shift; infoarg=$1;; --no-ascii) generate_ascii=false;; - --no-html) generate_ascii=false;; + --no-html) generate_html=false;; --no-info) generate_info=false;; --no-tex) generate_tex=false;; --source) shift; source_extra=$1;; @@ -416,11 +416,49 @@ fi # end html printf "\nMaking .tar.gz for sources...\n" d=`dirname $srcfile` ( - cd "$d" - srcfiles=`ls -d *.texinfo *.texi *.txi *.eps $source_extra 2>/dev/null` || true - tar czfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles - ls -l "$abs_outdir/$PACKAGE.texi.tar.gz" -) + cd "$d" || exit + + # Set PATS to a list of globbing patterns that expand to + # file names to be put into the .tar.gz for sources. + # Omit patterns that do not expand to file names. + pats= + + if case `$MAKEINFO --version | sed -e 's/^[^0-9]*//' -e 1q` in \ + [1-6]* | 7.[01]*) false;; \ + *) true;; \ + esac \ + ; then + + for pat in '*.eps'; do + for file in $pat; do + test "$file" = "$pat" && test ! -e "$file" || pats="$pats $pat" + break + done + done + + # if $MAKEINFO is recent enough, use --trace-includes on the + # $srcfile to get the included files of the targetted manual only + base=`basename "$srcfile"` + + cmd="$SETLANG $MAKEINFO $commonarg --trace-includes \"$base\"" + eval "$cmd" \ + | tar -czhf "$abs_outdir/$PACKAGE.texi.tar.gz" \ + --verbatim-files-from -T- -- "$base" $pats \ + ${source_extra+"$source_extra"} \ + && ls -l "$abs_outdir/$PACKAGE.texi.tar.gz" + else + for pat in '*.texinfo' '*.texi' '*.txi' '*.eps'; do + for file in $pat; do + test "$file" = "$pat" && test ! -e "$file" || pats="$pats $pat" + break + done + done + + tar -czhf "$abs_outdir/$PACKAGE.texi.tar.gz" \ + -- $pats ${source_extra+"$source_extra"} \ + && ls -l "$abs_outdir/$PACKAGE.texi.tar.gz" + fi +) || exit texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"` # diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index f090ab56c..fc38aa9b9 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,9 +3,9 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2023-10-19.19} +\def\texinfoversion{2024-02-10.22} % -% Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc. +% Copyright 1985, 1986, 1988, 1990-2024 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -6137,8 +6137,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % normally unnmhead0 calls unnumberedzzz: \outer\parseargdef\unnumbered{\unnmhead0{#1}} \def\unnumberedzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\unnumberedno by 1 + \global\advance\unnumberedno by 1 % % Since an unnumbered has no number, no prefix for figures. \global\let\chaplevelprefix = \empty @@ -6194,8 +6193,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% % normally calls unnumberedseczzz: \outer\parseargdef\unnumberedsec{\unnmhead1{#1}} \def\unnumberedseczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% + \global\advance\unnumberedno by 1 + \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno}% } % Subsections. @@ -6218,9 +6217,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% % normally calls unnumberedsubseczzz: \outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} \def\unnumberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno}% + \global\advance\unnumberedno by 1 + \sectionheading{#1}{subsec}{Ynothing}{\the\unnumberedno}% } % Subsubsections. @@ -6244,9 +6242,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% % normally unnumberedsubsubseczzz: \outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} \def\unnumberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% + \global\advance\unnumberedno by 1 + \sectionheading{#1}{subsubsec}{Ynothing}{\the\unnumberedno}% } % These macros control what the section commands do, according @@ -8205,8 +8202,6 @@ might help (with 'rm \jobname.?? \jobname.??s')% \let\commondummyword\unmacrodo \xdef\macrolist{\macrolist}% \endgroup - \else - \errmessage{Macro #1 not defined}% \fi } diff --git a/doc/make-stds.texi b/doc/make-stds.texi index 132476c7a..115fca724 100644 --- a/doc/make-stds.texi +++ b/doc/make-stds.texi @@ -498,11 +498,12 @@ files. This directory should normally be @file{/usr/local/etc}, but write it as @file{$(prefix)/etc}. (If you are using Autoconf, write it as @samp{@@sysconfdir@@}.) -Do not install executables here in this directory (they probably belong -in @file{$(libexecdir)} or @file{$(sbindir)}). Also do not install -files that are modified in the normal course of their use (programs -whose purpose is to change the configuration of the system excluded). -Those probably belong in @file{$(localstatedir)}. +This directory is not the right place to install executables built by +running @samp{make}---they probably belong in @file{$(libexecdir)} or +@file{$(sbindir)}. Also do not install here files that will be +modified in the normal course of their use (programs whose purpose is +to change the configuration of the system excluded). Those probably +belong in @file{$(localstatedir)}. @item sharedstatedir The directory for installing architecture-independent data files which diff --git a/lib/Autom4te/ChannelDefs.pm b/lib/Autom4te/ChannelDefs.pm index 91e6abddc..eadbacdcc 100644 --- a/lib/Autom4te/ChannelDefs.pm +++ b/lib/Autom4te/ChannelDefs.pm @@ -13,6 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +################################################################## +# The master copy of this file is in Automake's source repository. +# Please send updates to automake-patches@gnu.org. +################################################################## + package Autom4te::ChannelDefs; =head1 NAME @@ -69,7 +74,7 @@ our @EXPORT = qw (&prog_error &error &fatal &verb =head2 CHANNELS The following channels can be used as the first argument of -C. For some of them we list a shorthand +C. For some of them we list a shorthand function that makes the code more readable. =over 4 diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm index 73bca6e3f..6d157458a 100644 --- a/lib/Autom4te/Channels.pm +++ b/lib/Autom4te/Channels.pm @@ -13,10 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -############################################################### -# The main copy of this file is in Automake's git repository. # -# Updates should be sent to automake-patches@gnu.org. # -############################################################### +################################################################## +# The master copy of this file is in Automake's source repository. +# Please send updates to automake-patches@gnu.org. +################################################################## package Autom4te::Channels; diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm index 3f4596d55..ffc401930 100644 --- a/lib/Autom4te/Configure_ac.pm +++ b/lib/Autom4te/Configure_ac.pm @@ -13,10 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -############################################################### -# The main copy of this file is in Automake's git repository. # -# Updates should be sent to automake-patches@gnu.org. # -############################################################### +################################################################## +# The master copy of this file is in Automake's source repository. +# Please send updates to automake-patches@gnu.org. +################################################################## package Autom4te::Configure_ac; diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm index c714d694a..e2d8c38ba 100644 --- a/lib/Autom4te/FileUtils.pm +++ b/lib/Autom4te/FileUtils.pm @@ -13,10 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -############################################################### -# The main copy of this file is in Automake's git repository. # -# Updates should be sent to automake-patches@gnu.org. # -############################################################### +################################################################## +# The master copy of this file is in Automake's source repository. +# Please send updates to automake-patches@gnu.org. +################################################################## package Autom4te::FileUtils; diff --git a/lib/Autom4te/Getopt.pm b/lib/Autom4te/Getopt.pm index d39021bd9..3f53d34f8 100644 --- a/lib/Autom4te/Getopt.pm +++ b/lib/Autom4te/Getopt.pm @@ -13,6 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +################################################################## +# The master copy of this file is in Automake's source repository. +# Please send updates to automake-patches@gnu.org. +################################################################## + package Autom4te::Getopt; =head1 NAME diff --git a/lib/Autom4te/XFile.pm b/lib/Autom4te/XFile.pm index eeed12c18..a422cd6b6 100644 --- a/lib/Autom4te/XFile.pm +++ b/lib/Autom4te/XFile.pm @@ -15,10 +15,10 @@ # Written by Akim Demaille . -############################################################### -# The main copy of this file is in Automake's git repository. # -# Updates should be sent to automake-patches@gnu.org. # -############################################################### +################################################################## +# The master copy of this file is in Automake's source repository. +# Please send updates to automake-patches@gnu.org. +################################################################## package Autom4te::XFile; diff --git a/m4/autobuild.m4 b/m4/autobuild.m4 index 814bc192c..694d88abf 100644 --- a/m4/autobuild.m4 +++ b/m4/autobuild.m4 @@ -1,4 +1,5 @@ -# autobuild.m4 serial 8 +# autobuild.m4 +# serial 8 dnl Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/maint.mk b/maint.mk index 1b4a2de4f..c30e71ba6 100644 --- a/maint.mk +++ b/maint.mk @@ -503,6 +503,7 @@ sc_prohibit_have_config_h: # Nearly all .c files must include . However, we also permit this # via inclusion of a package-specific header, if cfg.mk specified one. # config_h_header must be suitable for grep -E. +# Rationale: The Gnulib documentation, node 'Include '. config_h_header ?= sc_require_config_h: @require='^# *include $(config_h_header)' \ @@ -526,6 +527,7 @@ perl_config_h_first_ = \ # You must include before including any other header file. # This can possibly be via a package-specific header, if given by cfg.mk. +# Rationale: The Gnulib documentation, node 'Include '. sc_require_config_h_first: @if $(VC_LIST_EXCEPT) | $(GREP) '\.c$$' > /dev/null; then \ files=$$($(VC_LIST_EXCEPT) | $(GREP) '\.c$$') && \ @@ -535,6 +537,89 @@ sc_require_config_h_first: else :; \ fi +# Generated headers that override system headers. +# Keep sorted. +gl_prefer_angle_bracket_headers_ ?= \ + alloca.h \ + arpa/inet.h \ + assert.h \ + ctype.h \ + dirent.h \ + errno.h \ + error.h \ + fcntl.h \ + fenv.h \ + float.h \ + fnmatch.h \ + getopt.h \ + glob.h \ + iconv.h \ + inttypes.h \ + langinfo.h \ + limits.h \ + locale.h \ + malloc.h \ + math.h \ + monetary.h \ + netdb.h \ + net/if.h \ + netinet/in.h \ + omp.h \ + poll.h \ + pthread.h \ + pty.h \ + sched.h \ + search.h \ + selinux/selinux.h \ + signal.h \ + spawn.h \ + stdalign.h \ + stdarg.h \ + stddef.h \ + stdint.h \ + stdio.h \ + stdlib.h \ + string.h \ + strings.h \ + sysexits.h \ + sys/file.h \ + sys/ioctl.h \ + sys/msg.h \ + sys/random.h \ + sys/resource.h \ + sys/select.h \ + sys/sem.h \ + sys/shm.h \ + sys/socket.h \ + sys/stat.h \ + sys/time.h \ + sys/times.h \ + sys/types.h \ + sys/uio.h \ + sys/utsname.h \ + sys/wait.h \ + termios.h \ + threads.h \ + time.h \ + uchar.h \ + unistd.h \ + utime.h \ + utmp.h \ + wchar.h \ + wctype.h + +# Remove each .h suffix and change each space to "|". +angle_bracket_header_re = \ + $(subst $(_sp),|,$(patsubst %.h,%,$(gl_prefer_angle_bracket_headers_))) + +# Suggest using '#include ' instead of '#include "header.h"' for +# headers that override system headers. +# Rationale: The Gnulib documentation, node 'Style of #include statements'. +sc_prefer_angle_bracket_headers: + @prohibit='^ *# *include "($(angle_bracket_header_re))\.h"' \ + halt='Use #include , not #include "hdr.h" for the above' \ + $(_sc_search_regexp) + sc_prohibit_HAVE_MBRTOWC: @prohibit='\bHAVE_MBRTOWC\b' \ halt="do not use $$prohibit; it is always defined" \ @@ -914,6 +999,7 @@ sc_prohibit_always-defined_macros: exit 1; } \ || :; \ fi + # ================================================================== # Prohibit checked in backup files.