diff options
author | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 22:46:16 +0200 |
---|---|---|
committer | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 22:46:16 +0200 |
commit | c946ae6f25422d45e54de0fd69309cbb438f942d (patch) | |
tree | b67bb9270a0de2dd53134f56490467135cb88c02 /m4 | |
parent | 323dabef4b3570798e2d9daedbba9b98e9d7a504 (diff) | |
parent | 27fbeb77f96d99f41f4b6bb87eb50ae977de25a8 (diff) | |
download | automake-c946ae6f25422d45e54de0fd69309cbb438f942d.tar.gz |
Merge branch 'micro' into minor
Diffstat (limited to 'm4')
-rw-r--r-- | m4/Makefile.inc | 2 | ||||
-rw-r--r-- | m4/amversion.in | 2 | ||||
-rw-r--r-- | m4/amversion.m4 | 2 | ||||
-rw-r--r-- | m4/ar-lib.m4 | 2 | ||||
-rw-r--r-- | m4/as.m4 | 2 | ||||
-rw-r--r-- | m4/auxdir.m4 | 2 | ||||
-rw-r--r-- | m4/cond-if.m4 | 2 | ||||
-rw-r--r-- | m4/cond.m4 | 2 | ||||
-rw-r--r-- | m4/depend.m4 | 2 | ||||
-rw-r--r-- | m4/depout.m4 | 2 | ||||
-rw-r--r-- | m4/dmalloc.m4 | 2 | ||||
-rw-r--r-- | m4/extra-recurs.m4 | 2 | ||||
-rw-r--r-- | m4/gcj.m4 | 2 | ||||
-rw-r--r-- | m4/init.m4 | 2 | ||||
-rw-r--r-- | m4/install-sh.m4 | 2 | ||||
-rw-r--r-- | m4/internal/ac-config-macro-dirs.m4 | 2 | ||||
-rw-r--r-- | m4/lead-dot.m4 | 2 | ||||
-rw-r--r-- | m4/lex.m4 | 2 | ||||
-rw-r--r-- | m4/lispdir.m4 | 2 | ||||
-rw-r--r-- | m4/maintainer.m4 | 2 | ||||
-rw-r--r-- | m4/make.m4 | 2 | ||||
-rw-r--r-- | m4/missing.m4 | 2 | ||||
-rw-r--r-- | m4/mkdirp.m4 | 2 | ||||
-rw-r--r-- | m4/obsolete.m4 | 2 | ||||
-rw-r--r-- | m4/options.m4 | 2 | ||||
-rw-r--r-- | m4/prog-cc-c-o.m4 | 2 | ||||
-rw-r--r-- | m4/python.m4 | 5 | ||||
-rw-r--r-- | m4/runlog.m4 | 2 | ||||
-rw-r--r-- | m4/sanity.m4 | 2 | ||||
-rw-r--r-- | m4/silent.m4 | 2 | ||||
-rw-r--r-- | m4/strip.m4 | 2 | ||||
-rw-r--r-- | m4/substnot.m4 | 2 | ||||
-rw-r--r-- | m4/tar.m4 | 2 | ||||
-rw-r--r-- | m4/upc.m4 | 2 | ||||
-rw-r--r-- | m4/vala.m4 | 2 |
35 files changed, 37 insertions, 36 deletions
diff --git a/m4/Makefile.inc b/m4/Makefile.inc index 0a1ed7941..eb5702742 100644 --- a/m4/Makefile.inc +++ b/m4/Makefile.inc @@ -1,6 +1,6 @@ ## Included by top-level Makefile for Automake. -## Copyright (C) 1995-2015 Free Software Foundation, Inc. +## Copyright (C) 1995-2017 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 diff --git a/m4/amversion.in b/m4/amversion.in index 6d6a47c48..4b845d888 100644 --- a/m4/amversion.in +++ b/m4/amversion.in @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## @configure_input@ -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 9d826d811..a843427a4 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## Generated from amversion.in; do not edit by hand. -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4 index 914b21bc2..4fe6fb34b 100644 --- a/m4/ar-lib.m4 +++ b/m4/ar-lib.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/auxdir.m4 b/m4/auxdir.m4 index fd0e060bb..ae4327de2 100644 --- a/m4/auxdir.m4 +++ b/m4/auxdir.m4 @@ -1,6 +1,6 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/cond-if.m4 b/m4/cond-if.m4 index 1639cdff4..2c62bd33b 100644 --- a/m4/cond-if.m4 +++ b/m4/cond-if.m4 @@ -1,6 +1,6 @@ # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2015 Free Software Foundation, Inc. +# Copyright (C) 2008-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/cond.m4 b/m4/cond.m4 index e3c04e99c..2a889d466 100644 --- a/m4/cond.m4 +++ b/m4/cond.m4 @@ -1,6 +1,6 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2015 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/depend.m4 b/m4/depend.m4 index d16a8d7ad..3b1d4b889 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1999-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/depout.m4 b/m4/depout.m4 index c3936a71d..204d47989 100644 --- a/m4/depout.m4 +++ b/m4/depout.m4 @@ -1,6 +1,6 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4 index b94124639..0b9f8d4f4 100644 --- a/m4/dmalloc.m4 +++ b/m4/dmalloc.m4 @@ -3,7 +3,7 @@ ## From Franc,ois Pinard ## ## ----------------------------------- ## -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/extra-recurs.m4 b/m4/extra-recurs.m4 index 64506b588..ac7df8eab 100644 --- a/m4/extra-recurs.m4 +++ b/m4/extra-recurs.m4 @@ -1,6 +1,6 @@ # AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*- -# Copyright (C) 2012-2015 Free Software Foundation, Inc. +# Copyright (C) 2012-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,7 +1,7 @@ # Check for Java compiler. -*- Autoconf -*- # For now we only handle the GNU compiler. -# Copyright (C) 1999-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/init.m4 b/m4/init.m4 index fedb2c71f..c84892778 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -1,6 +1,6 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/install-sh.m4 b/m4/install-sh.m4 index 411a9a23a..94b886a2a 100644 --- a/m4/install-sh.m4 +++ b/m4/install-sh.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/internal/ac-config-macro-dirs.m4 b/m4/internal/ac-config-macro-dirs.m4 index c62f506ef..cc05bbec5 100644 --- a/m4/internal/ac-config-macro-dirs.m4 +++ b/m4/internal/ac-config-macro-dirs.m4 @@ -4,7 +4,7 @@ # FIXME: keep in sync with the contents of the variable # '$ac_config_macro_dirs_fallback' in aclocal.in. -# Copyright (C) 2012-2015 Free Software Foundation, Inc. +# Copyright (C) 2012-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4 index 747236e73..a82932169 100644 --- a/m4/lead-dot.m4 +++ b/m4/lead-dot.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ ## Replacement for AC_PROG_LEX. -*- Autoconf -*- ## by Alexandre Oliva <oliva@dcc.unicamp.br> -# Copyright (C) 1998-2015 Free Software Foundation, Inc. +# Copyright (C) 1998-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index 1d5e1e98a..846ef3f0e 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -3,7 +3,7 @@ ## From Ulrich Drepper ## Almost entirely rewritten by Alexandre Oliva ## ------------------------ -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/maintainer.m4 b/m4/maintainer.m4 index f1b13e992..33cb24ecc 100644 --- a/m4/maintainer.m4 +++ b/m4/maintainer.m4 @@ -1,7 +1,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/make.m4 b/m4/make.m4 index fff073329..d62dcfb22 100644 --- a/m4/make.m4 +++ b/m4/make.m4 @@ -1,6 +1,6 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/missing.m4 b/m4/missing.m4 index abc985f98..20be2a5e4 100644 --- a/m4/missing.m4 +++ b/m4/missing.m4 @@ -1,6 +1,6 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2015 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4 index 84f964039..511f52675 100644 --- a/m4/mkdirp.m4 +++ b/m4/mkdirp.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/obsolete.m4 b/m4/obsolete.m4 index d1f39c550..46e067d89 100644 --- a/m4/obsolete.m4 +++ b/m4/obsolete.m4 @@ -2,7 +2,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/options.m4 b/m4/options.m4 index ada0bc7d3..45cfa546a 100644 --- a/m4/options.m4 +++ b/m4/options.m4 @@ -1,6 +1,6 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/prog-cc-c-o.m4 b/m4/prog-cc-c-o.m4 index afacb62bd..c366078f5 100644 --- a/m4/prog-cc-c-o.m4 +++ b/m4/prog-cc-c-o.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1999-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/python.m4 b/m4/python.m4 index 32c30e299..6d9e93401 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -3,7 +3,7 @@ ## From Andrew Dalke ## Updated by James Henstridge ## ------------------------ -# Copyright (C) 1999-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -36,8 +36,9 @@ 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). + dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) diff --git a/m4/runlog.m4 b/m4/runlog.m4 index ed01ec623..a56b02757 100644 --- a/m4/runlog.m4 +++ b/m4/runlog.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/sanity.m4 b/m4/sanity.m4 index a209693fe..2dbdd213a 100644 --- a/m4/sanity.m4 +++ b/m4/sanity.m4 @@ -1,6 +1,6 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/silent.m4 b/m4/silent.m4 index 1b7ad70bc..6549ae39f 100644 --- a/m4/silent.m4 +++ b/m4/silent.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2009-2015 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/strip.m4 b/m4/strip.m4 index 6c32a34ef..23b822006 100644 --- a/m4/strip.m4 +++ b/m4/strip.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/substnot.m4 b/m4/substnot.m4 index e98cc5104..f781aa0b8 100644 --- a/m4/substnot.m4 +++ b/m4/substnot.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2006-2015 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ # Find a compiler for Unified Parallel C. -*- Autoconf -*- -# Copyright (C) 2006-2015 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/vala.m4 b/m4/vala.m4 index f3eeeef39..8b742d1c5 100644 --- a/m4/vala.m4 +++ b/m4/vala.m4 @@ -1,6 +1,6 @@ # Autoconf support for the Vala compiler -# Copyright (C) 2008-2015 Free Software Foundation, Inc. +# Copyright (C) 2008-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, |