diff options
author | Thomas Markwalder <tmark@isc.org> | 2018-01-29 11:38:33 -0500 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2018-01-29 11:38:33 -0500 |
commit | de964f22713b36dcac313fe6ff03b95210fd7297 (patch) | |
tree | a488a4a593c86a04216e0bb3fc59fff21e7381a7 | |
parent | 075a2f45da9a3194c9ea2c72b2167d9bb5bd0c21 (diff) | |
download | isc-dhcp-de964f22713b36dcac313fe6ff03b95210fd7297.tar.gz |
[master] Add m4/README to distribution tarball to avoid ac_local() failsv4_4_0_f1
Merges in rt47075.
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | RELNOTES | 6 | ||||
-rw-r--r-- | m4/README | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index c5211e01..e814399d 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 e53896c3..182e9511 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. @@ -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 <dhcp>/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 00000000..b8363158 --- /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. |