From de964f22713b36dcac313fe6ff03b95210fd7297 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Mon, 29 Jan 2018 11:38:33 -0500 Subject: [PATCH] [master] Add m4/README to distribution tarball to avoid ac_local() fails Merges in rt47075. --- Makefile.am | 3 ++- Makefile.in | 2 +- RELNOTES | 6 ++++++ m4/README | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 m4/README diff --git a/Makefile.am b/Makefile.am index c5211e014..e814399d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,8 @@ EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \ doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/libtool.dox \ doc/devel/mainpage.dox doc/devel/omapi.dox doc/devel/qa.dox \ client/tests/Atffile common/tests/Atffile server/tests/Atffile \ - client/tests/Kyuafile common/tests/Kyuafile server/tests/Kyuafile + client/tests/Kyuafile common/tests/Kyuafile server/tests/Kyuafile \ + m4/README if HAVE_BINDDIR EXTRA_DIST += bind/Makefile.in bind/bind.tar.gz bind/version.tmp diff --git a/Makefile.in b/Makefile.in index e53896c3f..182e95110 100644 --- a/Makefile.in +++ b/Makefile.in @@ -385,7 +385,7 @@ EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \ doc/devel/mainpage.dox doc/devel/omapi.dox doc/devel/qa.dox \ client/tests/Atffile common/tests/Atffile server/tests/Atffile \ client/tests/Kyuafile common/tests/Kyuafile \ - server/tests/Kyuafile $(am__append_1) + server/tests/Kyuafile m4/README $(am__append_1) # Use an autoconf substitution vs an automake conditional here # to fool automake when the bind directory does not exist. diff --git a/RELNOTES b/RELNOTES index cd269fac5..0a1f9b452 100644 --- a/RELNOTES +++ b/RELNOTES @@ -122,6 +122,12 @@ by Eric Young (eay@cryptsoft.com). was causing BIND9 build to not generate dns/enumclass.h and dns/enumtype.h. [ISC-Bugs #46971] +- Added /m4/README to the distribution tarball. Some versions of + ac_local() treat the absence of the m4 subdirectory as error rather than + warning. This was causing the call to autoreconf, necessary for building + with libtool, to fail. + [ISC-Bugs #47075] + Changes since 4.4.0a1 (New Features) - Added experimental support for relay port (draft-ietf-dhc-relay-port-10.txt) diff --git a/m4/README b/m4/README new file mode 100644 index 000000000..b83631588 --- /dev/null +++ b/m4/README @@ -0,0 +1,2 @@ +Currently we have no m4 macros. This directory is here to accommodate +some versions of ac_local() which treat its absence as an error. -- GitLab