From: DongHun Kwak Date: Thu, 30 Sep 2021 03:57:12 +0000 (+0900) Subject: Imported Upstream version 1.16.1 X-Git-Tag: upstream/1.16.1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fupstream%2F1.16.1;p=platform%2Fupstream%2Fautomake.git Imported Upstream version 1.16.1 --- diff --git a/ChangeLog b/ChangeLog index ff8ec8e..e6cb583 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,111 @@ +2018-03-11 Mathieu Lirzin + + version 1.16.1 + + * configure.ac (AC_INIT): Bump version number to 1.16.1. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + * NEWS: Record release version. + +2018-03-11 Mathieu Lirzin + + maint: Update files from upstream with 'make fetch' + + * lib/config.guess: Update. + * lib/config.sub: Likewise. + * lib/gendocs.sh: Likewise. + * lib/gitlog-to-changelog: Likewise. + * lib/gnupload: Likewise. + * lib/texinfo.tex: Likewise. + * lib/update-copyright: Likewise. + +2018-03-11 Pavel Raiskup + + install-sh: avoid (low risk) race in "/tmp" + + Ensure that nobody can cross privilege boundaries by pre-creating + symlink on '$tmpdir' destination directory. + + Just testing 'mkdir -p' by creating "/tmp/ins$RANDOM-$$/d" is not safe + because "/tmp" directory is usually world-writeable and + "/tmp/ins$RANDOM-$$" content could be pretty easily guessed by + attacker (at least for shells where $RANDOM is not supported). So, as + the first step, create the "/tmp/ins$RANDOM-$$" without -p. This step + would fail early if somebody wanted catch us. + + Systems that implement (and have enabled) fs.protected_symlinks kernel + feature are not affected even without this commit. + + References: + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 + https://bugzilla.redhat.com/show_bug.cgi?id=1140725 + + * lib/install-sh: Implement safer 'mkdir -p' test by running + '$mkdirprog $mkdir_mode "$tmpdir"' first. + * NEWS: Update. + +2018-03-08 Mathieu Lirzin + + automake: Don't rely on List::Util to provide 'none' + + This change fixes automake bug#30631. + + This removes the use of List::Util which is not supported by Perl 5.6, + by reimplementing the 'none' subroutine. + + * lib/Automake/General.pm (none): New subroutine. + * bin/automake.in (handle_single_transform): Use it. + * t/pm/General.pl: New test. + * t/list-of-tests.mk (perl_TESTS): Add it. + * NEWS: Update. + +2018-03-08 Mathieu Lirzin + + python: Support future python version up to 3.9 + + This change fixes automake bug#28160. + + Since AM_PYTHON_PATH macro takes no maximum version argument, there is + no need to generate _AM_PYTHON_INTERPRETER_LIST dynamically, like what + was previously done by the reverted commit + 1d60fb72168e62d33fe433380af621de64e22f23. We could rely on M4 to + generate this list statically however this is likely to be a complex + solution that would not improve maintainability. + + * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add 'python3.7', + 'python3.8', and 'python3.9'. + * NEWS: Update. + +2018-03-07 Paul Eggert + + maint: write-file-hooks -> before-save-hook + + write-file-hooks is obsolete since Emacs 22.1 (released June 2007) and + it's time to use the recommended replacement. + Problem reported by Glenn Morris in: + https://lists.gnu.org/r/bug-gnulib/2018-03/msg00008.html + * contrib/tap-driver.pl, lib/compile, lib/depcomp, lib/install-sh: + * lib/mdate-sh, lib/missing, lib/mkinstalldirs, lib/py-compile: + * lib/tap-driver.sh, lib/test-driver, lib/ylwrap: + Update hook usage for files where Automake is the canonical source. + +2018-03-03 Mathieu Lirzin + + Revert "python: Generate python interpreter list" + + This reverts commit 1d60fb72168e62d33fe433380af621de64e22f23. + +2018-02-25 Mathieu Lirzin + + maint: Post-release administrivia + + * NEWS: Add header line for next release. + * configure.ac (AC_INIT): Bump version number to 1.16a. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + +2018-02-25 Mathieu Lirzin + + Merge branch 'release' + 2018-02-25 Mathieu Lirzin version 1.16 diff --git a/Makefile.in b/Makefile.in index 8e80b76..c3e934c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2018 Free Software Foundation, Inc. @@ -940,6 +940,7 @@ t/pm/DisjCon2.pl \ t/pm/DisjCon3.pl \ t/pm/DisjConditions.pl \ t/pm/DisjConditions-t.pl \ +t/pm/General.pl \ t/pm/Version.pl \ t/pm/Version2.pl \ t/pm/Version3.pl \ diff --git a/NEWS b/NEWS index 06726ee..e9ab693 100644 --- a/NEWS +++ b/NEWS @@ -62,6 +62,21 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +New in 1.16.1: + +* Bugs fixed: + + - 'install-sh' now ensures that nobody can cross privilege boundaries by + pre-creating symlink on the directory inside "/tmp". + + - 'automake' does not depend on the 'none' subroutine of the List::Util + module anymore to support older Perl version. (automake bug#30631) + + - A regression in AM_PYTHON_PATH causing the rejection of non literal + minimum version parameter hasn't been fixed. (automake bug#30616) + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + New in 1.16: * Miscellaneous changes diff --git a/aclocal.m4 b/aclocal.m4 index 02d6640..f50d665 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- # Copyright (C) 1996-2018 Free Software Foundation, Inc. diff --git a/bin/automake.in b/bin/automake.in index 16fb451..a52a489 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -73,7 +73,6 @@ use Automake::Wrap 'makefile_wrap'; use Automake::Language; use File::Basename; use File::Spec; -use List::Util 'none'; use Carp; ## ----------------------- ## @@ -1793,7 +1792,7 @@ sub handle_single_transform my $dname = $derived; if ($directory ne '' && option 'subdir-objects' - && none { $dname =~ /$_$/ } @dup_shortnames) + && none { $dname =~ /$_[0]$/ } @dup_shortnames) { # At this point, we don't clear information about what # parts of $derived are truly file name components. We can diff --git a/configure b/configure index 7fff4cf..99514d7 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU Automake 1.16. +# Generated by GNU Autoconf 2.69 for GNU Automake 1.16.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Automake' PACKAGE_TARNAME='automake' -PACKAGE_VERSION='1.16' -PACKAGE_STRING='GNU Automake 1.16' +PACKAGE_VERSION='1.16.1' +PACKAGE_STRING='GNU Automake 1.16.1' PACKAGE_BUGREPORT='bug-automake@gnu.org' PACKAGE_URL='http://www.gnu.org/software/automake/' @@ -1290,7 +1290,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Automake 1.16 to adapt to many kinds of systems. +\`configure' configures GNU Automake 1.16.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Automake 1.16:";; + short | recursive ) echo "Configuration of GNU Automake 1.16.1:";; esac cat <<\_ACEOF @@ -1468,7 +1468,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Automake configure 1.16 +GNU Automake configure 1.16.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1637,7 +1637,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Automake $as_me 1.16, which was +It was created by GNU Automake $as_me 1.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2592,7 +2592,7 @@ fi # Define the identity of the package. PACKAGE='automake' - VERSION='1.16' + VERSION='1.16.1' # Some tools Automake needs. @@ -7064,7 +7064,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Automake $as_me 1.16, which was +This file was extended by GNU Automake $as_me 1.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7123,7 +7123,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Automake config.status 1.16 +GNU Automake config.status 1.16.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ef37963..766928b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.16], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.16.1], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([bin/automake.in]) AC_CONFIG_AUX_DIR([lib]) diff --git a/contrib/tap-driver.pl b/contrib/tap-driver.pl index abfc9d0..bdd86d7 100755 --- a/contrib/tap-driver.pl +++ b/contrib/tap-driver.pl @@ -555,7 +555,7 @@ main @ARGV; # cperl-extra-newline-before-brace: t # cperl-merge-trailing-else: nil # cperl-continued-statement-offset: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "my $VERSION = " # time-stamp-format: "'%:y-%02m-%02d.%02H'" # time-stamp-time-zone: "UTC0" diff --git a/doc/amhello-1.0.tar.gz b/doc/amhello-1.0.tar.gz index 1fd88cc..ed78258 100644 Binary files a/doc/amhello-1.0.tar.gz and b/doc/amhello-1.0.tar.gz differ diff --git a/doc/automake.info b/doc/automake.info index f7db80a..b9b9aff 100644 --- a/doc/automake.info +++ b/doc/automake.info @@ -1,7 +1,7 @@ This is automake.info, produced by makeinfo version 6.5 from automake.texi. -This manual is for GNU Automake (version 1.16, 25 February 2018), a +This manual is for GNU Automake (version 1.16.1, 26 February 2018), a program that creates GNU standards-compliant Makefiles from template files. @@ -27,216 +27,216 @@ END-INFO-DIR-ENTRY  Indirect: -automake.info-1: 1081 -automake.info-2: 301692 +automake.info-1: 1083 +automake.info-2: 301698  Tag Table: (Indirect) -Node: Top1081 -Node: Introduction14408 -Ref: Introduction-Footnote-115817 -Node: Autotools Introduction15976 -Node: GNU Build System17357 -Node: Use Cases20105 -Node: Basic Installation22233 -Node: Standard Targets25819 -Node: Standard Directory Variables27422 -Node: Standard Configuration Variables29279 -Node: config.site30638 -Node: VPATH Builds32064 -Node: Two-Part Install36012 -Node: Cross-Compilation38456 -Node: Renaming41431 -Node: DESTDIR42589 -Node: Preparing Distributions44771 -Node: Dependency Tracking47142 -Node: Nested Packages49250 -Node: Why Autotools50766 -Node: Hello World52408 -Ref: amhello Explained52830 -Node: Creating amhello53002 -Node: amhello's configure.ac Setup Explained58357 -Node: amhello's Makefile.am Setup Explained63277 -Node: Generalities66977 -Node: General Operation67671 -Node: Strictness71094 -Node: Uniform72712 -Node: Length Limitations77651 -Node: Canonicalization79961 -Node: User Variables81033 -Node: Auxiliary Programs82523 -Node: Examples86261 -Node: Complete87131 -Node: true89236 -Node: automake Invocation91727 -Ref: Invoking automake91882 -Node: configure99664 -Node: Requirements100593 -Node: Optional105831 -Node: aclocal Invocation115233 -Ref: Invoking aclocal115394 -Node: aclocal Options118449 -Node: Macro Search Path122174 -Ref: ACLOCAL_PATH126549 -Node: Extending aclocal128119 -Node: Local Macros131843 -Node: Serials135827 -Node: Future of aclocal141020 -Node: Macros143409 -Node: Public Macros143950 -Ref: Modernize AM_INIT_AUTOMAKE invocation145581 -Node: Obsolete Macros150062 -Node: Private Macros151404 -Node: Directories152854 -Node: Subdirectories154450 -Node: Conditional Subdirectories157841 -Node: SUBDIRS vs DIST_SUBDIRS159521 -Node: Subdirectories with AM_CONDITIONAL161159 -Node: Subdirectories with AC_SUBST162353 -Node: Unconfigured Subdirectories163180 -Node: Alternative166631 -Ref: Alternative-Footnote-1168823 -Node: Subpackages168948 -Node: Programs172295 -Node: A Program173837 -Node: Program Sources174560 -Node: Linking176465 -Node: Conditional Sources180110 -Node: Conditional Programs183036 -Node: A Library184926 -Node: A Shared Library187603 -Node: Libtool Concept188607 -Node: Libtool Libraries190711 -Node: Conditional Libtool Libraries192445 -Node: Conditional Libtool Sources194902 -Node: Libtool Convenience Libraries196289 -Node: Libtool Modules199716 -Node: Libtool Flags201032 -Node: LTLIBOBJS202936 -Node: Libtool Issues203571 -Node: Error required file ltmain.sh not found203912 -Node: Objects created both with libtool and without205133 -Node: Program and Library Variables207057 -Ref: Program and Library Variables-Footnote-1218433 -Node: Default _SOURCES218508 -Node: LIBOBJS220980 -Node: Program Variables226207 -Node: Yacc and Lex229771 -Ref: Yacc and Lex-Footnote-1235395 -Node: C++ Support235658 -Node: Objective C Support236538 -Node: Objective C++ Support237511 -Node: Unified Parallel C Support238533 -Node: Assembly Support239529 -Node: Fortran 77 Support240701 -Ref: Fortran 77 Support-Footnote-1242386 -Node: Preprocessing Fortran 77242589 -Node: Compiling Fortran 77 Files243193 -Node: Mixing Fortran 77 With C and C++243805 -Ref: Mixing Fortran 77 With C and C++-Footnote-1246128 -Node: How the Linker is Chosen246435 -Node: Fortran 9x Support247973 -Node: Compiling Fortran 9x Files249019 -Node: Java Support with gcj249655 -Node: Vala Support251136 -Node: Support for Other Languages253221 -Node: Dependencies253929 -Node: EXEEXT255816 -Node: Other Objects258059 -Node: Scripts258651 -Node: Headers261510 -Node: Data263313 -Node: Sources263998 -Node: Built Sources Example266943 -Node: Other GNU Tools274131 -Node: Emacs Lisp274660 -Node: gettext276758 -Node: Libtool277446 -Node: Java277705 -Node: Python280364 -Node: Documentation285445 -Node: Texinfo285749 -Node: Man Pages292948 -Node: Install296073 -Node: Basics of Installation296777 -Node: The Two Parts of Install298307 -Node: Extending Installation299847 -Node: Staged Installs301692 -Node: Install Rules for the User303105 -Node: Clean303663 -Node: Dist305835 -Node: Basics of Distribution306339 -Node: Fine-grained Distribution Control309570 -Node: The dist Hook310497 -Node: Checking the Distribution312988 -Node: The Types of Distributions319347 -Node: Tests321585 -Node: Generalities about Testing322781 -Node: Simple Tests325716 -Node: Scripts-based Testsuites326097 -Ref: Testsuite progress on console328481 -Ref: Simple tests and color-tests329584 -Node: Serial Test Harness333600 -Node: Parallel Test Harness335698 -Ref: Basics of test metadata336204 -Node: Custom Test Drivers344934 -Node: Overview of Custom Test Drivers Support345225 -Node: Declaring Custom Test Drivers348279 -Node: API for Custom Test Drivers349701 -Node: Command-line arguments for test drivers350478 -Node: Log files generation and test results recording353192 -Node: Testsuite progress output357403 -Node: Using the TAP test protocol358825 -Node: Introduction to TAP359187 -Node: Use TAP with the Automake test harness361004 -Node: Incompatibilities with other TAP parsers and drivers366420 -Node: Links and external resources on TAP367815 -Node: DejaGnu Tests369439 -Node: Install Tests371566 -Node: Rebuilding371876 -Node: Options375551 -Node: Options generalities375852 -Node: List of Automake options377634 -Ref: tar-formats384285 -Node: Miscellaneous387749 -Node: Tags388094 -Node: Suffixes391211 -Node: Include392843 -Node: Conditionals394578 -Node: Usage of Conditionals395437 -Node: Limits of Conditionals398793 -Node: Silencing Make399978 -Node: Make verbosity400329 -Ref: Make verbosity-Footnote-1401651 -Node: Tricks For Silencing Make401725 -Node: Automake Silent Rules404242 -Node: Gnits411226 -Node: Not Enough413706 -Node: Extending414153 -Node: Third-Party Makefiles419188 -Node: Distributing426124 -Node: API Versioning426773 -Node: Upgrading429482 -Node: FAQ431527 -Node: CVS432651 -Node: maintainer-mode441040 -Node: Wildcards445204 -Node: Limitations on File Names448643 -Node: Errors with distclean451273 -Node: Flag Variables Ordering456221 -Node: Renamed Objects464052 -Node: Per-Object Flags465643 -Node: Multiple Outputs468648 -Node: Hard-Coded Install Paths480603 -Node: Debugging Make Rules485759 -Ref: Debugging Make Rules-Footnote-1487916 -Node: Reporting Bugs488094 -Node: Copying This Manual490042 -Node: GNU Free Documentation License490272 -Node: Indices515575 -Node: Macro Index515864 -Node: Variable Index521503 -Node: General Index552525 +Node: Top1083 +Node: Introduction14412 +Ref: Introduction-Footnote-115821 +Node: Autotools Introduction15980 +Node: GNU Build System17361 +Node: Use Cases20109 +Node: Basic Installation22237 +Node: Standard Targets25823 +Node: Standard Directory Variables27426 +Node: Standard Configuration Variables29283 +Node: config.site30642 +Node: VPATH Builds32068 +Node: Two-Part Install36016 +Node: Cross-Compilation38460 +Node: Renaming41435 +Node: DESTDIR42593 +Node: Preparing Distributions44775 +Node: Dependency Tracking47146 +Node: Nested Packages49254 +Node: Why Autotools50770 +Node: Hello World52412 +Ref: amhello Explained52834 +Node: Creating amhello53006 +Node: amhello's configure.ac Setup Explained58361 +Node: amhello's Makefile.am Setup Explained63281 +Node: Generalities66981 +Node: General Operation67675 +Node: Strictness71098 +Node: Uniform72716 +Node: Length Limitations77655 +Node: Canonicalization79965 +Node: User Variables81037 +Node: Auxiliary Programs82527 +Node: Examples86265 +Node: Complete87135 +Node: true89240 +Node: automake Invocation91731 +Ref: Invoking automake91886 +Node: configure99668 +Node: Requirements100597 +Node: Optional105835 +Node: aclocal Invocation115237 +Ref: Invoking aclocal115398 +Node: aclocal Options118453 +Node: Macro Search Path122178 +Ref: ACLOCAL_PATH126553 +Node: Extending aclocal128123 +Node: Local Macros131847 +Node: Serials135831 +Node: Future of aclocal141024 +Node: Macros143413 +Node: Public Macros143954 +Ref: Modernize AM_INIT_AUTOMAKE invocation145585 +Node: Obsolete Macros150066 +Node: Private Macros151408 +Node: Directories152858 +Node: Subdirectories154454 +Node: Conditional Subdirectories157845 +Node: SUBDIRS vs DIST_SUBDIRS159525 +Node: Subdirectories with AM_CONDITIONAL161163 +Node: Subdirectories with AC_SUBST162357 +Node: Unconfigured Subdirectories163184 +Node: Alternative166635 +Ref: Alternative-Footnote-1168827 +Node: Subpackages168952 +Node: Programs172299 +Node: A Program173841 +Node: Program Sources174564 +Node: Linking176469 +Node: Conditional Sources180114 +Node: Conditional Programs183040 +Node: A Library184930 +Node: A Shared Library187607 +Node: Libtool Concept188611 +Node: Libtool Libraries190715 +Node: Conditional Libtool Libraries192449 +Node: Conditional Libtool Sources194906 +Node: Libtool Convenience Libraries196293 +Node: Libtool Modules199720 +Node: Libtool Flags201036 +Node: LTLIBOBJS202940 +Node: Libtool Issues203575 +Node: Error required file ltmain.sh not found203916 +Node: Objects created both with libtool and without205137 +Node: Program and Library Variables207061 +Ref: Program and Library Variables-Footnote-1218437 +Node: Default _SOURCES218512 +Node: LIBOBJS220984 +Node: Program Variables226211 +Node: Yacc and Lex229775 +Ref: Yacc and Lex-Footnote-1235399 +Node: C++ Support235662 +Node: Objective C Support236542 +Node: Objective C++ Support237515 +Node: Unified Parallel C Support238537 +Node: Assembly Support239533 +Node: Fortran 77 Support240705 +Ref: Fortran 77 Support-Footnote-1242390 +Node: Preprocessing Fortran 77242593 +Node: Compiling Fortran 77 Files243197 +Node: Mixing Fortran 77 With C and C++243809 +Ref: Mixing Fortran 77 With C and C++-Footnote-1246132 +Node: How the Linker is Chosen246439 +Node: Fortran 9x Support247977 +Node: Compiling Fortran 9x Files249023 +Node: Java Support with gcj249659 +Node: Vala Support251140 +Node: Support for Other Languages253225 +Node: Dependencies253933 +Node: EXEEXT255820 +Node: Other Objects258063 +Node: Scripts258655 +Node: Headers261514 +Node: Data263317 +Node: Sources264002 +Node: Built Sources Example266947 +Node: Other GNU Tools274135 +Node: Emacs Lisp274664 +Node: gettext276762 +Node: Libtool277450 +Node: Java277709 +Node: Python280368 +Node: Documentation285449 +Node: Texinfo285753 +Node: Man Pages292952 +Node: Install296077 +Node: Basics of Installation296781 +Node: The Two Parts of Install298311 +Node: Extending Installation299851 +Node: Staged Installs301698 +Node: Install Rules for the User303111 +Node: Clean303669 +Node: Dist305841 +Node: Basics of Distribution306345 +Node: Fine-grained Distribution Control309576 +Node: The dist Hook310503 +Node: Checking the Distribution312994 +Node: The Types of Distributions319353 +Node: Tests321591 +Node: Generalities about Testing322787 +Node: Simple Tests325722 +Node: Scripts-based Testsuites326103 +Ref: Testsuite progress on console328487 +Ref: Simple tests and color-tests329590 +Node: Serial Test Harness333606 +Node: Parallel Test Harness335704 +Ref: Basics of test metadata336210 +Node: Custom Test Drivers344940 +Node: Overview of Custom Test Drivers Support345231 +Node: Declaring Custom Test Drivers348285 +Node: API for Custom Test Drivers349707 +Node: Command-line arguments for test drivers350484 +Node: Log files generation and test results recording353198 +Node: Testsuite progress output357409 +Node: Using the TAP test protocol358831 +Node: Introduction to TAP359193 +Node: Use TAP with the Automake test harness361010 +Node: Incompatibilities with other TAP parsers and drivers366426 +Node: Links and external resources on TAP367821 +Node: DejaGnu Tests369445 +Node: Install Tests371572 +Node: Rebuilding371882 +Node: Options375557 +Node: Options generalities375858 +Node: List of Automake options377640 +Ref: tar-formats384291 +Node: Miscellaneous387755 +Node: Tags388100 +Node: Suffixes391217 +Node: Include392849 +Node: Conditionals394584 +Node: Usage of Conditionals395443 +Node: Limits of Conditionals398799 +Node: Silencing Make399984 +Node: Make verbosity400335 +Ref: Make verbosity-Footnote-1401657 +Node: Tricks For Silencing Make401731 +Node: Automake Silent Rules404248 +Node: Gnits411232 +Node: Not Enough413712 +Node: Extending414159 +Node: Third-Party Makefiles419194 +Node: Distributing426130 +Node: API Versioning426779 +Node: Upgrading429488 +Node: FAQ431533 +Node: CVS432657 +Node: maintainer-mode441046 +Node: Wildcards445210 +Node: Limitations on File Names448649 +Node: Errors with distclean451279 +Node: Flag Variables Ordering456227 +Node: Renamed Objects464058 +Node: Per-Object Flags465649 +Node: Multiple Outputs468654 +Node: Hard-Coded Install Paths480609 +Node: Debugging Make Rules485765 +Ref: Debugging Make Rules-Footnote-1487922 +Node: Reporting Bugs488100 +Node: Copying This Manual490048 +Node: GNU Free Documentation License490278 +Node: Indices515581 +Node: Macro Index515870 +Node: Variable Index521509 +Node: General Index552531  End Tag Table diff --git a/doc/automake.info-1 b/doc/automake.info-1 index bda38a2..231ec3f 100644 --- a/doc/automake.info-1 +++ b/doc/automake.info-1 @@ -1,7 +1,7 @@ This is automake.info, produced by makeinfo version 6.5 from automake.texi. -This manual is for GNU Automake (version 1.16, 25 February 2018), a +This manual is for GNU Automake (version 1.16.1, 26 February 2018), a program that creates GNU standards-compliant Makefiles from template files. @@ -31,7 +31,7 @@ File: automake.info, Node: Top, Next: Introduction, Up: (dir) GNU Automake ************ -This manual is for GNU Automake (version 1.16, 25 February 2018), a +This manual is for GNU Automake (version 1.16.1, 26 February 2018), a program that creates GNU standards-compliant Makefiles from template files. diff --git a/doc/automake.info-2 b/doc/automake.info-2 index 2b0ebeb..bf5a3bd 100644 --- a/doc/automake.info-2 +++ b/doc/automake.info-2 @@ -1,7 +1,7 @@ This is automake.info, produced by makeinfo version 6.5 from automake.texi. -This manual is for GNU Automake (version 1.16, 25 February 2018), a +This manual is for GNU Automake (version 1.16.1, 26 February 2018), a program that creates GNU standards-compliant Makefiles from template files. diff --git a/doc/stamp-vti b/doc/stamp-vti index 6778176..6380a51 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 25 February 2018 +@set UPDATED 26 February 2018 @set UPDATED-MONTH February 2018 -@set EDITION 1.16 -@set VERSION 1.16 +@set EDITION 1.16.1 +@set VERSION 1.16.1 diff --git a/doc/version.texi b/doc/version.texi index 6778176..6380a51 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 25 February 2018 +@set UPDATED 26 February 2018 @set UPDATED-MONTH February 2018 -@set EDITION 1.16 -@set VERSION 1.16 +@set EDITION 1.16.1 +@set VERSION 1.16.1 diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm index 32f5c8d..aa2de38 100644 --- a/lib/Automake/General.pm +++ b/lib/Automake/General.pm @@ -23,7 +23,7 @@ use File::Basename; use vars qw (@ISA @EXPORT); @ISA = qw (Exporter); -@EXPORT = qw (&uniq $me); +@EXPORT = qw (&uniq &none $me); # Variable we share with the main package. Be sure to have a single # copy of them: using 'my' together with multiple inclusion of this @@ -66,5 +66,23 @@ sub uniq (@) return wantarray ? @res : "@res"; } +# $RES +# none (&PRED, @LIST) +# ------------ +# Return 1 when no element in LIST satisfies predicate PRED otherwise 0. +sub none (&@) +{ + my ($pred, @list) = @_; + my $res = 1; + foreach my $item (@list) + { + if ($pred->($item)) + { + $res = 0; + last; + } + } + return $res; +} 1; # for require diff --git a/lib/compile b/lib/compile index 0bb9d0f..99e5052 100755 --- a/lib/compile +++ b/lib/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . @@ -340,7 +340,7 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/config.guess b/lib/config.guess index f50dcdb..256083a 100755 --- a/lib/config.guess +++ b/lib/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-02-24' +timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1046,11 +1046,7 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - if objdump -f /bin/sh | grep -q elf32-x86-64; then - echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 - else - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1473,7 +1469,7 @@ EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/lib/config.sub b/lib/config.sub index 1d8e98b..9ccf09a 100755 --- a/lib/config.sub +++ b/lib/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-02-22' +timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1376,7 +1376,7 @@ case $os in | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ @@ -1794,7 +1794,7 @@ echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/lib/depcomp b/lib/depcomp index 49eb4bf..65cbf70 100755 --- a/lib/depcomp +++ b/lib/depcomp @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1999-2018 Free Software Foundation, Inc. @@ -783,7 +783,7 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/gendocs.sh b/lib/gendocs.sh index 33277d3..9d418b9 100755 --- a/lib/gendocs.sh +++ b/lib/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=2018-01-01.00 +scriptversion=2018-03-06.19 # Copyright 2003-2018 Free Software Foundation, Inc. # @@ -497,7 +497,7 @@ $GENDOCS_TEMPLATE_DIR/gendocs_template >"$outdir/index.html" echo "Done, see $outdir/ subdirectory for new files." # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-end: "$" diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog index d8074aa..1e73f42 100755 --- a/lib/gitlog-to-changelog +++ b/lib/gitlog-to-changelog @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"' if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2017-09-13 06:45'; # UTC +my $VERSION = '2018-03-07 03:47'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -491,7 +491,7 @@ sub git_dir_option($) # Local Variables: # mode: perl # indent-tabs-mode: nil -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "my $VERSION = '" # time-stamp-format: "%:y-%02m-%02d %02H:%02M" # time-stamp-time-zone: "UTC0" diff --git a/lib/gnupload b/lib/gnupload index b8d7385..2a0bfa3 100755 --- a/lib/gnupload +++ b/lib/gnupload @@ -1,7 +1,7 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2017-09-13.06; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 2004-2018 Free Software Foundation, Inc. # @@ -432,7 +432,7 @@ done exit 0 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/install-sh b/lib/install-sh index ac159ce..8175c64 100755 --- a/lib/install-sh +++ b/lib/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2017-09-23.17; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -332,34 +332,43 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -501,7 +510,7 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/mdate-sh b/lib/mdate-sh index 21247c5..8c7a590 100755 --- a/lib/mdate-sh +++ b/lib/mdate-sh @@ -1,7 +1,7 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2017-09-22.02; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1995-2018 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 @@ -220,7 +220,7 @@ echo $day $month $year # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/missing b/lib/missing index 38e4fcb..625aeb1 100755 --- a/lib/missing +++ b/lib/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-01-04.22; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. @@ -207,7 +207,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs index a31ce6d..36aa909 100755 --- a/lib/mkinstalldirs +++ b/lib/mkinstalldirs @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC # Original author: Noah Friedman # Created: 1993-05-16 @@ -154,7 +154,7 @@ exit $errstatus # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/py-compile b/lib/py-compile index c97ad54..9f8baf7 100755 --- a/lib/py-compile +++ b/lib/py-compile @@ -1,7 +1,7 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 2000-2018 Free Software Foundation, Inc. @@ -162,7 +162,7 @@ sys.stdout.write('\n')" 2>/dev/null || : # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh index d3e68bd..2516e9c 100755 --- a/lib/tap-driver.sh +++ b/lib/tap-driver.sh @@ -643,7 +643,7 @@ test $? -eq 0 || fatal "I/O or internal error" # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/test-driver b/lib/test-driver index 880a2e8..b8521a4 100755 --- a/lib/test-driver +++ b/lib/test-driver @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 2011-2018 Free Software Foundation, Inc. # @@ -140,7 +140,7 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/texinfo.tex b/lib/texinfo.tex index c614e02..ac5c1d9 100644 --- a/lib/texinfo.tex +++ b/lib/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2018-01-09.11} +\def\texinfoversion{2018-02-12.17} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -182,7 +182,7 @@ % Hyphenation fixes. \hyphenation{ Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script - ap-pen-dix bit-map bit-maps + auto-ma-ti-cal-ly ap-pen-dix bit-map bit-maps data-base data-bases eshell fall-ing half-way long-est man-u-script man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces diff --git a/lib/update-copyright b/lib/update-copyright index 3bb26ab..f2fc97e 100755 --- a/lib/update-copyright +++ b/lib/update-copyright @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"' if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2018-01-04.14:48'; # UTC +my $VERSION = '2018-03-07.03:47'; # UTC # Copyright (C) 2009-2018 Free Software Foundation, Inc. # @@ -269,7 +269,7 @@ else # coding: utf-8 # mode: perl # indent-tabs-mode: nil -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "my $VERSION = '" # time-stamp-format: "%:y-%02m-%02d.%02H:%02M" # time-stamp-time-zone: "UTC0" diff --git a/lib/ylwrap b/lib/ylwrap index d9f09a5..5943168 100755 --- a/lib/ylwrap +++ b/lib/ylwrap @@ -1,7 +1,7 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1996-2018 Free Software Foundation, Inc. # @@ -239,7 +239,7 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 9e06a9e..79e9434 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/m4/python.m4 b/m4/python.m4 index d6dda13..63c0a0e 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -36,24 +36,12 @@ AC_DEFUN([AM_PATH_PYTHON], [ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). - m4_define_default([am_py_min_ver], m4_ifval([$1], [$1], [2.0])) - dnl The arbitrary default maximum version. - m4_define_default([am_py_max_ver], [4.0]) - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [[python] \ - dnl If we want some Python 2 versions (min version <= 2.7), - dnl also search for "python2". - m4_if(m4_version_compare(am_py_min_ver, [2.8]), [-1], [python2], []) \ - [python3] \ - dnl Construct a comma-separated list of interpreter names (python2.6, - dnl python2.7, etc). We only care about the first 3 characters of the - dnl version strings (major-dot-minor; not - dnl major-dot-minor-dot-bugfix[-dot-whatever]) - m4_foreach([py_ver], - m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(am_py_max_ver, [0], [3]) -0.1 m4_substr(am_py_min_ver, [0], [3])), - dnl Remove python2.8 and python2.9 since they will never exist - [m4_bmatch(py_ver, [2.[89]], [], [python]py_ver)])]) +[python python2 python3 dnl + python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl + python3.2 python3.1 python3.0 dnl + python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl + python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 271bfb5..84dd29a 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -54,6 +54,7 @@ t/pm/DisjCon2.pl \ t/pm/DisjCon3.pl \ t/pm/DisjConditions.pl \ t/pm/DisjConditions-t.pl \ +t/pm/General.pl \ t/pm/Version.pl \ t/pm/Version2.pl \ t/pm/Version3.pl \ diff --git a/t/pm/General.pl b/t/pm/General.pl new file mode 100644 index 0000000..0caefe7 --- /dev/null +++ b/t/pm/General.pl @@ -0,0 +1,27 @@ +# Copyright (C) 2018 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . + +use Automake::General; + +my $failed = 0; + +# Check 'none'. +my $none_positive = none { $_[0] < 0 } (1, 7, 3, 8, 9); +$failed = 1 if ($none_positive == 0); + +my $none_gt_8 = none { $_[0] >= 8 } (1, 7, 3, 8, 9); +$failed = 1 if ($none_gt_8 == 1); + +exit $failed;