svn commit: r313156 - in vendor/ldns/dist: . compat contrib/DNS-LDNS contrib/DNS-LDNS/lib/DNS contrib/DNS-LDNS/lib/DNS/LDNS contrib/DNS-LDNS/t contrib/ldnsx contrib/python doc drill examples ldns m...
Dag-Erling Smørgrav
des at FreeBSD.org
Fri Feb 3 13:01:02 UTC 2017
Author: des
Date: Fri Feb 3 13:01:00 2017
New Revision: 313156
URL: https://svnweb.freebsd.org/changeset/base/313156
Log:
import ldns 1.7.0
Added:
vendor/ldns/dist/contrib/DNS-LDNS/META.yml
vendor/ldns/dist/m4/ax_config_feature.m4
vendor/ldns/dist/m4/ax_have_poll.m4
Modified:
vendor/ldns/dist/Changelog
vendor/ldns/dist/Makefile.in
vendor/ldns/dist/README
vendor/ldns/dist/README.git
vendor/ldns/dist/aclocal.m4
vendor/ldns/dist/acx_nlnetlabs.m4
vendor/ldns/dist/buffer.c
vendor/ldns/dist/compat/b64_pton.c
vendor/ldns/dist/compat/malloc.c
vendor/ldns/dist/compat/snprintf.c
vendor/ldns/dist/config.guess
vendor/ldns/dist/config.sub
vendor/ldns/dist/configure
vendor/ldns/dist/configure.ac
vendor/ldns/dist/contrib/DNS-LDNS/Changes
vendor/ldns/dist/contrib/DNS-LDNS/LDNS.xs
vendor/ldns/dist/contrib/DNS-LDNS/Makefile.PL
vendor/ldns/dist/contrib/DNS-LDNS/README
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/DNSSecDataChain.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/DNSSecName.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/DNSSecRRSets.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/DNSSecRRs.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/DNSSecTrustTree.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/DNSSecZone.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/GC.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/Key.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/KeyList.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/Packet.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/RBNode.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/RBTree.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/RData.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/RR.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/RRList.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/Resolver.pm
vendor/ldns/dist/contrib/DNS-LDNS/lib/DNS/LDNS/Zone.pm
vendor/ldns/dist/contrib/DNS-LDNS/t/dnssec_datachain.t
vendor/ldns/dist/contrib/DNS-LDNS/t/rr.t
vendor/ldns/dist/contrib/DNS-LDNS/typemap
vendor/ldns/dist/contrib/ldnsx/ldnsx.py
vendor/ldns/dist/contrib/python/Makefile
vendor/ldns/dist/contrib/python/ldns.i
vendor/ldns/dist/contrib/python/ldns_key.i
vendor/ldns/dist/contrib/python/ldns_rdf.i
vendor/ldns/dist/contrib/python/ldns_resolver.i
vendor/ldns/dist/dane.c
vendor/ldns/dist/dname.c
vendor/ldns/dist/dnssec.c
vendor/ldns/dist/dnssec_sign.c
vendor/ldns/dist/dnssec_verify.c
vendor/ldns/dist/dnssec_zone.c
vendor/ldns/dist/doc/TODO
vendor/ldns/dist/doc/doxyparse.pl
vendor/ldns/dist/doc/function_manpages
vendor/ldns/dist/doc/header.html
vendor/ldns/dist/drill/chasetrace.c
vendor/ldns/dist/drill/config.h.in
vendor/ldns/dist/drill/configure
vendor/ldns/dist/drill/configure.ac
vendor/ldns/dist/drill/drill.1.in
vendor/ldns/dist/drill/drill.c
vendor/ldns/dist/drill/drill.h
vendor/ldns/dist/drill/error.c
vendor/ldns/dist/drill/securetrace.c
vendor/ldns/dist/drill/work.c
vendor/ldns/dist/duration.c
vendor/ldns/dist/error.c
vendor/ldns/dist/examples/config.h.in
vendor/ldns/dist/examples/configure
vendor/ldns/dist/examples/configure.ac
vendor/ldns/dist/examples/ldns-compare-zones.1
vendor/ldns/dist/examples/ldns-compare-zones.c
vendor/ldns/dist/examples/ldns-dane.1.in
vendor/ldns/dist/examples/ldns-dane.c
vendor/ldns/dist/examples/ldns-dpa.1
vendor/ldns/dist/examples/ldns-dpa.c
vendor/ldns/dist/examples/ldns-gen-zone.1
vendor/ldns/dist/examples/ldns-gen-zone.c
vendor/ldns/dist/examples/ldns-key2ds.1
vendor/ldns/dist/examples/ldns-key2ds.c
vendor/ldns/dist/examples/ldns-keyfetcher.c
vendor/ldns/dist/examples/ldns-keygen.1
vendor/ldns/dist/examples/ldns-keygen.c
vendor/ldns/dist/examples/ldns-mx.c
vendor/ldns/dist/examples/ldns-notify.1
vendor/ldns/dist/examples/ldns-notify.c
vendor/ldns/dist/examples/ldns-read-zone.1
vendor/ldns/dist/examples/ldns-read-zone.c
vendor/ldns/dist/examples/ldns-signzone.1
vendor/ldns/dist/examples/ldns-signzone.c
vendor/ldns/dist/examples/ldns-test-edns.c
vendor/ldns/dist/examples/ldns-testns.c
vendor/ldns/dist/examples/ldns-testpkts.c
vendor/ldns/dist/examples/ldns-update.1
vendor/ldns/dist/examples/ldns-update.c
vendor/ldns/dist/examples/ldns-verify-zone.1.in
vendor/ldns/dist/examples/ldns-verify-zone.c
vendor/ldns/dist/examples/ldns-walk.c
vendor/ldns/dist/examples/ldnsd.c
vendor/ldns/dist/higher.c
vendor/ldns/dist/host2str.c
vendor/ldns/dist/host2wire.c
vendor/ldns/dist/install-sh
vendor/ldns/dist/keys.c
vendor/ldns/dist/ldns/buffer.h
vendor/ldns/dist/ldns/common.h.in
vendor/ldns/dist/ldns/config.h.in
vendor/ldns/dist/ldns/dane.h
vendor/ldns/dist/ldns/dname.h
vendor/ldns/dist/ldns/dnssec.h
vendor/ldns/dist/ldns/dnssec_sign.h
vendor/ldns/dist/ldns/dnssec_verify.h
vendor/ldns/dist/ldns/dnssec_zone.h
vendor/ldns/dist/ldns/duration.h
vendor/ldns/dist/ldns/error.h
vendor/ldns/dist/ldns/higher.h
vendor/ldns/dist/ldns/host2str.h
vendor/ldns/dist/ldns/host2wire.h
vendor/ldns/dist/ldns/keys.h
vendor/ldns/dist/ldns/net.h.in
vendor/ldns/dist/ldns/packet.h
vendor/ldns/dist/ldns/radix.h
vendor/ldns/dist/ldns/rbtree.h
vendor/ldns/dist/ldns/rdata.h
vendor/ldns/dist/ldns/resolver.h
vendor/ldns/dist/ldns/rr.h
vendor/ldns/dist/ldns/str2host.h
vendor/ldns/dist/ldns/tsig.h
vendor/ldns/dist/ldns/update.h
vendor/ldns/dist/ldns/util.h.in
vendor/ldns/dist/ldns/wire2host.h
vendor/ldns/dist/ldns/zone.h
vendor/ldns/dist/libdns.doxygen
vendor/ldns/dist/ltmain.sh
vendor/ldns/dist/m4/libtool.m4
vendor/ldns/dist/m4/ltoptions.m4
vendor/ldns/dist/m4/ltsugar.m4
vendor/ldns/dist/m4/ltversion.m4
vendor/ldns/dist/m4/lt~obsolete.m4
vendor/ldns/dist/net.c
vendor/ldns/dist/packaging/ldns-config.in
vendor/ldns/dist/packet.c
vendor/ldns/dist/parse.c
vendor/ldns/dist/radix.c
vendor/ldns/dist/rbtree.c
vendor/ldns/dist/rdata.c
vendor/ldns/dist/resolver.c
vendor/ldns/dist/rr.c
vendor/ldns/dist/rr_functions.c
vendor/ldns/dist/str2host.c
vendor/ldns/dist/tsig.c
vendor/ldns/dist/update.c
vendor/ldns/dist/util.c
vendor/ldns/dist/wire2host.c
vendor/ldns/dist/zone.c
Modified: vendor/ldns/dist/Changelog
==============================================================================
--- vendor/ldns/dist/Changelog Fri Feb 3 12:51:40 2017 (r313155)
+++ vendor/ldns/dist/Changelog Fri Feb 3 13:01:00 2017 (r313156)
@@ -1,3 +1,118 @@
+1.7.0 2016-12-20
+ * Fix lookup of relative names in ldns_resolver_search.
+ * bugfix #548: Double free for answers > 4096 in ldns_resolver_send_pkt
+ * Follow CNAME's when tracing with drill (TODO dnssec trace)
+ * Fix #551 change Regent to Copyright holder in BSD license in
+ some of the headings of the file, to match the opensource.org
+ BSD license.
+ * -e option makes ldns-compare-zones exit with status code 2 on difference
+ * Filter out specified RR types with ldns-read-zone -e and -E options
+ * bugfix #563: Correct DNSKEY from DSA private key. Thanks Peter Koch.
+ * bugfix #562: ldns-keygen match DSA key maximum size with library.
+ And check keysizes with all algorithms. Thanks Peter Koch.
+ * ldns-verify-zone accepts only one single zonefile as argument.
+ * bugfix #573: ldns-keygen write private keys with mode 0600.
+ Thanks Leon Weber
+ * Fix configure to make ldns compile with LibreSSL 2.0
+ * drill now also accepts dig style -y option
+ (-y <[algo:]name:key> i.s.o. -y <name:key[:algo]>)
+ * OPENPGPKEY draft rr types. Enable with: --enable-rrtype-openpgpkey
+ * bugfix #608: Correct comment about escaped characters
+ * CDS and CDNSKEY rr type from RFC 7344.
+ --enable-rrtype-cds configure option removed
+ * fix: Memory leak in ldns_pkt_rr_list_by_name()
+ Thanks Johannes Naab
+ * fix: Memory leak in ldns_dname2buffer_wire_compress()
+ Thanks Max Liebkies
+ * bugfix #613: Allow tab as whitespace too in last rdata field of types
+ of variable length. Thanks Xiali Yan
+ * bugfix: strip trailing whitespace from $ORIGIN lines in zone files
+ * Let ldns-keygen output .ds files only for KSK keys
+ * Parse RFC7218 TLSA mnemonics, but do not output them
+ * Let ldns-dane use SPKI as the default selector i.s.o. Cert
+ * bugfix: Fit left over NSEC3s once more before adding empty non
+ terminals. Thanks Stuart Browne
+ * bugfix #605: Determine default trust anchor location at compile time
+ Thanks Peter Koch
+ * bugfix #697: Double free with ldns-dane create
+ Thanks Carsten Strotmann
+ * bugfix #623: Do not redefine bool type and boolean values
+ Thanks Jakob Petsovits
+ * bugfix #570: Add TLSA, CDS, CDNSKEY and OPENPGPKEY RR types to ldnsx
+ Thanks Shussain
+ * bugfix #575: ldns_pkt_clone() does not copy timestamp field
+ Thanks Calle Dybedahl
+ * bugfix #584: ldns-update fixes. Send update to port 53, bring manpage
+ in sync with the usage text, and don't alter the ldns_resolver passed
+ to ldns_update_soa_zone_mname(). Created a ldns_resolver_clone()
+ function in the process. Thanks Nicholas Riley.
+ * bugfix #633: ldns_pkt_clone() parameter isn't const.
+ Thanks Jakop Petsovits
+ * bugfix: ldns-dane manpage correction
+ Thanks Erwin Lansing
+ * Spelling fixes. Thanks Andreas Schulze
+ * Hyphen used as minus in manpages. Thanks Andreas Schulze.
+ * RFC7553 RR Type URI is supported by default.
+ * Fix ECDSA signature generation, do not omit leading zeroes.
+ * bugfix: Get rid of superfluous newline in ldns-keyfetcher
+ Thanks Jan-Piet Mens
+ * bugfix: -U option to ldns-signzone to sign with every algorithm
+ Thanks Guido Kroon
+ * const function parameters whenever possible.
+ Thanks Ray Bellis
+ * bugfix #725: allow RR-types on the type bitmap window border
+ Thanks Pieter Lexis
+ * bugfix #726: 2 typos in drill manpage.
+ Thanks Hugo Lombard
+ * Add type CSYNC support, RFC 7477.
+ * Prepare for ED25519, ED448 support: todo convert* routines in
+ dnssec.h, once openssl has support for signing with these algorithms.
+ The dns algorithm number is not yet allocated. These features are
+ not fully implemented yet, openssl (1.1) does not support the
+ algorithms enough to generate keys and sign and verify with them.
+ * Fix _answerfrom comment in ldns_struct_pkt.
+ * Fix drill axfr ipv4/ipv6 queries.
+ * Fix comment referring to mk_query in packet.h to pkt_query_new.
+ * Fix description of QR flag in packet.h.
+ * Fix for openssl 1.1.0 API changes.
+ * Remove commented out macro. Thanks Thiago Farina
+ * bugfix #641: Include install-sh in .gitignore
+ * bugfix #825: Module import breaks with newer SWIG versions.
+ Thanks Christoph Egger
+ * bugfix #796 - #792: Fix miscellaneous compiler warning issues.
+ Thanks Ngie Cooper
+ * bugfix #769: Add support for :: in an IPv6 address
+ Thanks Hajimu UMEMOTO
+ * bugfix #760: Detect superfluous text in presentation format
+ Thanks Xiali Yan
+ * bugfix #708: warnings and errors with xcode 6.1/7.0
+ * bugfix #754: Memory leak in ldns_str2rdf_ipseckey
+ Thanks Xiali Yan
+ * bugfix #661: Fail NSEC3 signing when NSEC domainname length
+ would overflow. Thanks Jan-Piet Mens.
+ * bugfix #771: hmac-sha224, hmac-sha384 and hmac-sha512 keys.
+ Thanks Harald Jenny
+ * bugfix #680: ldns fails to reject invalidly formatted
+ RFC 7553 URI RRs. Thanks Robert Edmonds
+ * bugfix #678: Use poll i.s.o. select to support > 1024 fds
+ Thanks William King
+ * Use OpenSSL DANE functions for verification (unless explicitly
+ disabled with --disable-dane-ta-usage).
+ * Bumb .so version
+ * Include OPENPGPKEY RR type by default
+ * rdata processing for SMIMEA RR type
+ * Fix crash in displaying TLSA RR's.
+ Thanks Andreas Schulze
+ * Update ldns-key2ds man page to mention GOST and SHA384 hash
+ functions. Thanks Harald Jenny
+ * Add sha384 and sha512 tsig algorithm. Thanks Michael Weiser
+ * Clarify data ownership with consts for tsig parameters.
+ Thanks Michael Weiser
+ * bugfix: Fix detection of DSA support with OpenSSL >= 1.1.0
+ * bugfix #1160: Provide sha256 for release tarballs
+ * --enable-gost-anyway compiles GOST support with OpenSSL >= 1.1.0
+ even when the GOST engine is not available.
+
1.6.17 2014-01-10
* Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a
zone to be an NSEC3 (or its RRSIG) covering an empty non terminal.
Modified: vendor/ldns/dist/Makefile.in
==============================================================================
--- vendor/ldns/dist/Makefile.in Fri Feb 3 12:51:40 2017 (r313155)
+++ vendor/ldns/dist/Makefile.in Fri Feb 3 13:01:00 2017 (r313156)
@@ -12,6 +12,7 @@ datarootdir = @datarootdir@
datadir = @datadir@
libdir = @libdir@
includedir = @includedir@
+sysconfdir = @sysconfdir@
doxygen = @doxygen@
pywrapdir = $(srcdir)/contrib/python
pyldnsxwrapdir = $(srcdir)/contrib/ldnsx
@@ -27,13 +28,21 @@ pyldnsx_uninst = @PYLDNSXUNINST@
libtool = @libtool@
CONFIG_FILES = @CONFIG_FILES@
+LDNS_TRUST_ANCHOR_FILE = @LDNS_TRUST_ANCHOR_FILE@
+DEFAULT_CAFILE = @DEFAULT_CAFILE@
+DEFAULT_CAPATH = @DEFAULT_CAPATH@
+
+edit = sed \
+ -e 's|@LDNS_TRUST_ANCHOR_FILE[@]|$(LDNS_TRUST_ANCHOR_FILE)|g' \
+ -e 's|@DEFAULT_CAFILE[@]|$(DEFAULT_CAFILE)|g' \
+ -e 's|@DEFAULT_CAPATH[@]|$(DEFAULT_CAPATH)|g'
+
# override $U variable which is used by autotools for deansification (for
# K&R C compilers), but causes problems if $U is defined in the env).
U=
-
CC = @CC@
CFLAGS = @CFLAGS@
-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ @DEFS@
+CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ @DEFS@ -DLDNS_TRUST_ANCHOR_FILE="\"$(LDNS_TRUST_ANCHOR_FILE)\""
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
LIBOBJDIR = compat/
@@ -92,11 +101,10 @@ LDNS_DANE_LOBJS = examples/ldns-dane.lo
EX_SSL_PROGS = examples/ldns-nsec3-hash examples/ldns-revoke examples/ldns-signzone examples/ldns-verify-zone
EX_SSL_LOBJS = examples/ldns-nsec3-hash.lo examples/ldns-revoke.lo examples/ldns-signzone.lo examples/ldns-verify-zone.lo
-
COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
COMP_LIB = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS)
-LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -version-number $(version_info) -no-undefined
+LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -version-info $(version_info) -no-undefined
LINK_EXE = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBSSL_LDFLAGS)
.PHONY: clean realclean docclean manpages doc lint all lib pyldns test
@@ -129,7 +137,7 @@ putdown-builddir:
if test -d drill -a ! -f drill/README ; then rmdir drill || : ; fi
if test -d compat -a ! -f compat/malloc.c; then rmdir compat || : ; fi
-drill: no-drill-config-h drill/drill
+drill: no-drill-config-h drill/drill drill/drill.1
no-drill-config-h:
@if test -e $(srcdir)/drill/config.h -o -e drill/config.h ; \
then echo "A config.h was detected in the drill subdirectory." ; \
@@ -138,10 +146,14 @@ no-drill-config-h:
echo "or build drill there." ; \
exit -1 ; \
fi
+
drill/drill: $(DRILL_LOBJS) $(LIB)
$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
-install-drill: drill/drill
+drill/drill.1: $(srcdir)/drill/drill.1.in
+ $(edit) $(srcdir)/drill/drill.1.in > drill/drill.1
+
+install-drill: drill/drill drill/drill.1
$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
@@ -154,9 +166,9 @@ uninstall-drill:
test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
clean-drill:
- $(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill
+ $(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill drill/drill.1
-examples: no-examples-config-h $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS)
+examples: no-examples-config-h $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
no-examples-config-h:
@if test -e $(srcdir)/examples/config.h -o -e examples/config.h ; \
then echo "A config.h was detected in the examples subdirectory." ; \
@@ -165,6 +177,7 @@ no-examples-config-h:
echo "or build examples there." ; \
exit -1 ; \
fi
+
$(EXAMPLE_PROGS):
$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
@@ -182,7 +195,13 @@ $(LDNS_DANE):
$(EX_SSL_PROGS):
$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
-install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS)
+examples/ldns-dane.1: $(srcdir)/examples/ldns-dane.1.in
+ $(edit) $(srcdir)/examples/ldns-dane.1.in > examples/ldns-dane.1
+
+examples/ldns-verify-zone.1: $(srcdir)/examples/ldns-verify-zone.1.in
+ $(edit) $(srcdir)/examples/ldns-verify-zone.1.in > examples/ldns-verify-zone.1
+
+install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
@@ -205,6 +224,7 @@ clean-examples:
$(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS)
$(LIBTOOL) --mode clean rm -f $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS)
$(LIBTOOL) --mode clean rm -f $(EXAMPLE_LOBJS)
+ $(LIBTOOL) --mode clean rm -f examples/ldns-dane.1 examples/ldns-verify-zone.1
linktest: $(srcdir)/linktest.c libldns.la
$(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo
@@ -224,7 +244,7 @@ mancheck:
sh -c 'find . -name \*.\[13\] -exec troff -z {} \;' 2>&1 | sed "s/^\.\///" | sed "s/\(:[0\-9]\+:\)/\1 warning:/g"
doxygen: manpages
- if test ! -e doc/header.html ; then \
+ @if test ! -e doc/header.html ; then \
$(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \
fi ;
$(doxygen) $(srcdir)/libdns.doxygen
@@ -236,22 +256,40 @@ manpages: $(srcdir)/doc/function_manpage
@$(INSTALL) -d doc
@cat $(srcdir)/ldns/*.h \
| $(srcdir)/doc/doxyparse.pl \
- -m $(srcdir)/doc/function_manpages 2>&1 \
+ -m $(srcdir)/doc/function_manpages \
| grep -v ^doxygen | grep -v ^cat > doc/ldns_manpages
+manpage-create-errors: $(srcdir)/doc/function_manpages
+ @$(INSTALL) -d doc
+ @cat $(srcdir)/ldns/*.h \
+ | $(srcdir)/doc/doxyparse.pl -e \
+ -m $(srcdir)/doc/function_manpages >/dev/null
+
+manpage-errors:
+ @man --version >/dev/null 2>&1 && \
+ for m in `cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | grep -v ^doxygen | grep -v ^cat` ; do\
+ LC_ALL=en_US.UTF-8 MANROFFSEQ='' MANWIDTH=80 \
+ man --warnings -E UTF-8 -l -Tutf8 -Z doc/man/man3/$${m}.3 2>&1 >/dev/null \
+ | awk "-vpage=$${m}.3" '{printf("%s: ", page);print}'; \
+ if ! lexgrog doc/man/man3/$${m}.3 >/dev/null 2>&1 ; \
+ then \
+ echo doc/man/man3/$${m}.3: manpage-has-bad-whatis-entry; \
+ fi; \
+ done || echo "WARNING!: Cannot detect manpage errors on `uname`"
+
pyldns: _ldns.la
$(pywrapdir)/ldns_wrapper.c: $(PYLDNS_I_FILES) ldns/config.h
- $(swig) $(swigpy_flags) -o $@ $(CPPFLAGS) $(PYTHON_CPPFLAGS) $(pywrapdir)/ldns.i
+ $(swig) $(swigpy_flags) -o $@ $(PYTHON_CPPFLAGS) $(pywrapdir)/ldns.i
ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h
- $(COMP_LIB) -I./include/ldns $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
+ $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
_ldns.la: ldns_wrapper.lo libldns.la
- $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-number $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
$(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
- BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); $(PERL) Makefile.PL PREFIX="$(prefix)" LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
+ BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
$(p5_dns_ldns_dir)/blib/arch/auto/DNS/LDNS/LDNS.so: $(p5_dns_ldns_dir)/Makefile
cd $(p5_dns_ldns_dir); $(MAKE)
Modified: vendor/ldns/dist/README
==============================================================================
--- vendor/ldns/dist/README Fri Feb 3 12:51:40 2017 (r313155)
+++ vendor/ldns/dist/README Fri Feb 3 13:01:00 2017 (r313156)
@@ -42,7 +42,9 @@ INSTALLATION
If you are building from the repository you will need to have (gnu)
autotools like libtool and autoreconf installed. A list of all the commands
needed to build everything can be found in README.git. Note that the actual
-commands may be a little bit different on your machine. Most notable, you'll need to run libtoolize (or glibtoolize), if you skip this step, you'll get an error about missing config.sub.
+commands may be a little bit different on your machine. Most notably, you'll
+need to run libtoolize (or glibtoolize). If you skip this step, you'll get
+an error about missing config.sub.
* Developers
ldns is developed by the ldns team at NLnet Labs. This team currently
@@ -85,7 +87,7 @@ for more information.
SOLARIS
-In Solaris multi-architecture systems (that have both 32-bit and
+In Solaris multi-architecture systems (which have both 32-bit and
64-bit support), it can be a bit taxing to convince the system to
compile in 64-bit mode. Jakob Schlyter has kindly contributed a build
script that sets the right build and link options. You can find it in
@@ -99,13 +101,13 @@ http://www.nlnetlabs.nl/projects/ldns/bu
* pyldns
Compiling pyldns produces many ``unused parameter'' warnings. Those are
harmless and may safely be ignored.
-Also when building with Swig which version is before 2.0.4, compiling
+Also, when building with SWIG older than 2.0.4, compiling
pyldns produces many ``missing initializer'' warnings. Those are harmless
too.
Your Support
-NLnet Labs offers all of its software products as open source, most are
-published under a BDS license. You can download them, not only from the
+NLnet Labs offers all of its software products as open source, most
+published under a BSD license. You can download them, not only from the
NLnet Labs website but also through the various OS distributions for
which NSD, ldns, and Unbound are packaged. We therefore have little idea
who uses our software in production environments and have no direct ties
Modified: vendor/ldns/dist/README.git
==============================================================================
--- vendor/ldns/dist/README.git Fri Feb 3 12:51:40 2017 (r313155)
+++ vendor/ldns/dist/README.git Fri Feb 3 13:01:00 2017 (r313156)
@@ -13,8 +13,9 @@
# older versions of libtoolize do not support --install
# so you might need to remove that (with newer versions
# it is needed)
-libtoolize -c --install
-autoreconf --install
+git submodule update --init
+libtoolize -ci
+autoreconf -fi
./configure --with-examples --with-drill # --with-pyldns --with-p5-dns-ldns
make
make doc # needs doxygen for the html pages
Modified: vendor/ldns/dist/aclocal.m4
==============================================================================
--- vendor/ldns/dist/aclocal.m4 Fri Feb 3 12:51:40 2017 (r313155)
+++ vendor/ldns/dist/aclocal.m4 Fri Feb 3 13:01:00 2017 (r313156)
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -12,8609 +11,11 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
- [m4_fatal([Libtool version $1 or higher is required],
- 63)])],
- [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\ *)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- _LT_PATH_MAGIC
- fi
- ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME. Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
- [m4_ifval([$1], [$1], [$2])])
- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
- m4_ifval([$4],
- [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
- lt_dict_add_subkey([lt_decl_dict], [$2],
- [tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
- [0], [m4_fatal([$0: too few arguments: $#])],
- [1], [m4_fatal([$0: too few arguments: $#: $1])],
- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
- [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_if([$2], [],
- m4_quote(lt_decl_varnames),
- m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
- lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly. In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-# # Some comment about what VAR is for.
-# visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
- [description])))[]dnl
-m4_pushdef([_libtool_name],
- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
- [0], [_libtool_name=[$]$1],
- [1], [_libtool_name=$lt_[]$1],
- [2], [_libtool_name=$lt_[]$1],
- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
- dnl If the libtool generation code has been placed in $CONFIG_LT,
- dnl instead of duplicating it all over again into config.status,
- dnl then we will have config.status run $CONFIG_LT later, so it
- dnl needs to know what name is stored there:
- [AC_CONFIG_COMMANDS([libtool],
- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
- dnl If the libtool generation code is destined for config.status,
- dnl expand the accumulated commands and init code now:
- [AC_CONFIG_COMMANDS([libtool],
- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script. The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
- echo
- AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
-
-Report bugs to <bug-libtool at gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list