Commit d9bb7300 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded automake to 1.16.3

parent 3efe5fc9
diff -uNr automake-1.16.2/t/tags-lisp-space.sh automake-1.16.2-fix_tags-lisp-space/t/tags-lisp-space.sh
--- automake-1.16.2/t/tags-lisp-space.sh 2020-01-02 06:13:29.000000000 +1030
+++ automake-1.16.2-fix_tags-lisp-space/t/tags-lisp-space.sh 2020-07-09 17:21:05.759947393 +0930
@@ -18,7 +18,7 @@
# if there are CONFIG_HEADERS.
# See automake bug#38139.
-required=''
+required=etags
. test-init.sh
# some AC_CONFIG_FILES header is needed to trigger the bug.
diff -uNr automake-1.16.3/configure.ac automake-1.16.3-fix_tests/configure.ac
--- automake-1.16.3/configure.ac 2020-11-19 11:52:53.000000000 +1030
+++ automake-1.16.3-fix_tests/configure.ac 2020-11-19 11:52:53.000000000 +1030
@@ -123,7 +123,9 @@
AC_CACHE_CHECK([whether autoconf works], [am_cv_autoconf_works],
[mkdir conftest
-echo 'AC''_INIT' > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC''_INIT([smoke-test], [1])' \
+ 'AC''_OUTPUT'
if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
then
am_cv_autoconf_works=yes
@@ -139,7 +141,10 @@
AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
[mkdir conftest
dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro
-echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC'"_PREREQ([[$required_autoconf_version]])" \
+ 'AC''_INIT([smoke-test], [1])' \
+ 'AC''_OUTPUT'
if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
then
am_cv_autoconf_version=yes
diff -uNr automake-1.16.3/m4/init.m4 automake-1.16.3-fix_tests/m4/init.m4
--- automake-1.16.3/m4/init.m4 2020-11-19 11:51:03.000000000 +1030
+++ automake-1.16.3-fix_tests/m4/init.m4 2020-11-19 11:51:03.000000000 +1030
@@ -64,7 +64,7 @@
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(
- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
[ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
diff -uNr automake-1.16.3/t/deprecated-acinit.sh automake-1.16.3-fix_tests/t/deprecated-acinit.sh
--- automake-1.16.3/t/deprecated-acinit.sh 2020-11-19 11:51:03.000000000 +1030
+++ automake-1.16.3-fix_tests/t/deprecated-acinit.sh 2020-11-19 11:51:03.000000000 +1030
@@ -35,6 +35,7 @@
$ac_init
$am_init_automake
AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
END
cat configure.ac # For debugging.
$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
diff -uNr automake-1.16.3/t/init.sh automake-1.16.3-fix_tests/t/init.sh
--- automake-1.16.3/t/init.sh 2020-11-19 11:51:03.000000000 +1030
+++ automake-1.16.3-fix_tests/t/init.sh 2020-11-19 11:51:03.000000000 +1030
@@ -25,6 +25,7 @@
unindent >configure.ac <<END
AC_INIT$ac_init_args
AM_INIT_AUTOMAKE$am_init_args
+ AC_OUTPUT
END
cat configure.ac # For debugging.
# The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment