18 files changed, 46 insertions, 46 deletions
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index f85c1b535..6f5d5fcbd 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-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
@@ -13,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ########################################################
 ###  IMPORTANT NOTE: keep this file 'set -e' clean.  ###
@@ -102,7 +102,7 @@ is_blocked_signal ()
 {
   # Use perl, since trying to do this portably in the shell can be
   # very tricky, if not downright impossible.  For reference, see:
-  # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+  # <https://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
   if $PERL -w -e '
     use strict;
     use warnings FATAL => "all";
diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in
index 9bc802acd..b1b3b4186 100644
--- a/t/ax/cc-no-c-o.in
+++ b/t/ax/cc-no-c-o.in
@@ -1,5 +1,5 @@
 #! @AM_TEST_RUNNER_SHELL@
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # A "C compiler" that chokes when the '-c' and '-o' options are passed
 # together to it on the command line.  See also automake bug#13378.
diff --git a/t/ax/deltree.pl b/t/ax/deltree.pl
index 5148dc2d6..2d2949a69 100644
--- a/t/ax/deltree.pl
+++ b/t/ax/deltree.pl
@@ -2,7 +2,7 @@
 # deltree: recursively removes file and directory,
 # trying to handle permissions and other complications.
 
-# Copyright (C) 2013-2017 Free Software Foundation, Inc.
+# Copyright (C) 2013-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
@@ -15,7 +15,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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use strict;
 use warnings FATAL => 'all';
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
index 9d0036cdf..0e5213031 100644
--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Check dependency tracking in various flavours.
 # Contains both libtool and non-libtool case.
@@ -22,7 +22,7 @@
 
 # -------------------------------------------------------------------------
 
-# <http://lists.gnu.org/archive/html/automake-patches/2011-04/msg00028.html>
+# <https://lists.gnu.org/archive/html/automake-patches/2011-04/msg00028.html>
 #
 # Here's the bug: makedepend will prefix VPATH to the object file name,
 # thus the second make will invoke depcomp with object='../../src/foo.o',
@@ -34,8 +34,8 @@
 
 # -------------------------------------------------------------------------
 
-# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8473>
-# <http://lists.gnu.org/archive/html/automake-patches/2011-04/msg00079.html>
+# <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=8473>
+# <https://lists.gnu.org/archive/html/automake-patches/2011-04/msg00079.html>
 #
 # Here's the bug: hp depmode will prefix VPATH to the object file name,
 # thus the second gmake will invoke depcomp with object='../../src/foo.o',
@@ -49,8 +49,8 @@
 
 # -------------------------------------------------------------------------
 
-# <http://lists.gnu.org/archive/html/automake-patches/2011-04/msg00140.html>
-# <http://lists.gnu.org/archive/html/automake-patches/2011-05/msg00019.html>
+# <https://lists.gnu.org/archive/html/automake-patches/2011-04/msg00140.html>
+# <https://lists.gnu.org/archive/html/automake-patches/2011-05/msg00019.html>
 #
 # A partial failure of an earlier version of this test; some bad
 # post-processing of the '*.Po' files led to the following broken
diff --git a/t/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
index 68c34a09b..e6325d112 100644
--- a/t/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
@@ -1,6 +1,6 @@
 ## Data files for some tests.  Not used in the automake build system.
 ##
-## Copyright (C) 2011-2017 Free Software Foundation, Inc.
+## Copyright (C) 2011-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
@@ -13,7 +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, see <http://www.gnu.org/licenses/>.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 distcheck-hook:
 	@fatal () { echo "$@: $$*" >&2; exit 1; }; \
diff --git a/t/ax/extract-testsuite-summary.pl b/t/ax/extract-testsuite-summary.pl
index 180f53926..742088e7b 100644
--- a/t/ax/extract-testsuite-summary.pl
+++ b/t/ax/extract-testsuite-summary.pl
@@ -2,7 +2,7 @@
 # Extract the testsuite summary generated by the parallel testsuite
 # harness from the output of "make check".
 
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -15,7 +15,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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use warnings FATAL => 'all';
 use strict;
diff --git a/t/ax/is b/t/ax/is
index c085793b5..e4bc59ccf 100755
--- a/t/ax/is
+++ b/t/ax/is
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Test that two whitespace-separated lists are equal.
 # Assumes the two lists are passed on the command line separated by
diff --git a/t/ax/is_newest b/t/ax/is_newest
index 1cf0da1c9..aa7fd9f60 100755
--- a/t/ax/is_newest
+++ b/t/ax/is_newest
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Usage: is_newest FILE FILES
 # Fail if any file in FILES is newer than FILE, and print the list of
diff --git a/t/ax/runtest.in b/t/ax/runtest.in
index 7caceb2a9..07c1e91d1 100644
--- a/t/ax/runtest.in
+++ b/t/ax/runtest.in
@@ -1,7 +1,7 @@
 #!@AM_TEST_RUNNER_SHELL@
 # @configure_input@
 #
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -14,7 +14,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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Run an Automake test from the command line.
 
diff --git a/t/ax/shell-no-trail-bslash.in b/t/ax/shell-no-trail-bslash.in
index eefd90ea3..58c88c98b 100644
--- a/t/ax/shell-no-trail-bslash.in
+++ b/t/ax/shell-no-trail-bslash.in
@@ -1,5 +1,5 @@
 #! @AM_TEST_RUNNER_SHELL@
-# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # A "shell" that chokes on '-c' commands and/or shell scripts having
 # a trailing '\' character (possibly followed by whitespace only).
diff --git a/t/ax/tap-functions.sh b/t/ax/tap-functions.sh
index 17a6c11b3..24a8df304 100644
--- a/t/ax/tap-functions.sh
+++ b/t/ax/tap-functions.sh
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-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
@@ -13,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Helper functions used by TAP-producing tests of the Automake testsuite.
 
diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh
index 0eae2a386..1f2e2b5c3 100644
--- a/t/ax/tap-setup.sh
+++ b/t/ax/tap-setup.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Auxiliary shell script that copies the common data and files used by
 # many tests on TAP support into the current directory.  It should be
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 1f22f3fe7..182078de5 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Auxiliary script for tests on TAP support: checking testsuite summary.
 
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 2465c61c1..5dc2a61af 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -1,7 +1,7 @@
 # -*- shell-script -*-
 # @configure_input@
 #
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-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
@@ -14,7 +14,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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Defines and minimal setup for Automake testing environment.
 
@@ -55,13 +55,13 @@ case ${am_running_installcheck:=no} in
     ;;
   no)
     am_amdir=$am_top_srcdir/lib/am
-    am_automake_acdir=$am_top_srcdir/m4
-    am_bindir=$am_top_builddir/t/wrap
+    am_automake_acdir=""
+    am_bindir=$am_top_builddir/bin
     am_datadir=$am_top_srcdir
     am_docdir=$am_top_srcdir/doc
     am_pkgvdatadir=$am_top_srcdir/lib
     am_scriptdir=$am_top_srcdir/lib
-    am_system_acdir=$am_top_srcdir/m4/acdir
+    am_system_acdir=""
     ;;
   *)
     echo "$me: variable 'am_running_installcheck' has invalid"
@@ -187,7 +187,7 @@ sleep='sleep ''@MODIFICATION_DELAY@'
 # An old timestamp that can be given to a file, in "touch -t" format.
 # The time stamp should be portable to all file systems of interest.
 # Just for fun, choose the exact time of the announcement of the GNU project
-# in UTC; see <http://www.gnu.org/gnu/initial-announcement.html>.
+# in UTC; see <https://www.gnu.org/gnu/initial-announcement.html>.
 old_timestamp=198309271735.59
 
 # Make our wrapper script (or installed scripts, if running under
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index bf9017f4c..0cebbc87d 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-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
@@ -13,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 set -e
 
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 2ed15dcf9..0ea1cb73e 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-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
@@ -13,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ########################################################
 ###  IMPORTANT NOTE: keep this file 'set -e' clean.  ###
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 1d4b9f5cb..12fddfc5a 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Check the testsuite summary with the parallel test harness.  This
 # script is meant to be sourced by other test script, so that it can
diff --git a/t/ax/trivial-test-driver b/t/ax/trivial-test-driver
index 8885fb331..7fffc07c8 100644
--- a/t/ax/trivial-test-driver
+++ b/t/ax/trivial-test-driver
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-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
@@ -12,7 +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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #
 # Test driver for a very simple test protocol used by the Automake