Browse Source

New upstream version 4.2.1

tags/upstream/4.3.0
Chris Hofstaedtler 1 year ago
parent
commit
e21bef9b78
42 changed files with 2196 additions and 1355 deletions
  1. +5
    -0
      Makefile.am
  2. +493
    -187
      Makefile.in
  3. +87
    -104
      aclocal.m4
  4. +4
    -4
      build-aux/compile
  5. +281
    -278
      build-aux/config.guess
  6. +107
    -142
      build-aux/config.sub
  7. +4
    -4
      build-aux/depcomp
  8. +31
    -14
      build-aux/install-sh
  9. +7
    -7
      build-aux/missing
  10. +4
    -4
      build-aux/test-driver
  11. +2
    -2
      config.h.in
  12. +353
    -235
      configure
  13. +8
    -42
      configure.ac
  14. +1
    -0
      dnsmessage.proto
  15. +157
    -98
      effective_tld_names.dat
  16. +10
    -6
      ext/Makefile.in
  17. +30
    -19
      ext/json11/Makefile.in
  18. +30
    -19
      ext/probds/Makefile.in
  19. +10
    -6
      ext/yahttp/Makefile.in
  20. +33
    -20
      ext/yahttp/yahttp/Makefile.in
  21. +13
    -5
      lua-recursor4.cc
  22. +4
    -3
      lua-recursor4.hh
  23. +144
    -64
      m4/boost.m4
  24. +1
    -1
      pdns_recursor.1
  25. +26
    -9
      pdns_recursor.cc
  26. +7
    -0
      protobuf.cc
  27. +1
    -0
      protobuf.hh
  28. +47
    -13
      pubsuffix.cc
  29. +2
    -1
      rec-snmp.cc
  30. +42
    -1
      rec_channel_rec.cc
  31. +27
    -2
      rec_control.1
  32. +43
    -1
      reczones.cc
  33. +6
    -6
      rpzloader.cc
  34. +1
    -0
      rpzloader.hh
  35. +39
    -15
      syncres.cc
  36. +61
    -29
      syncres.hh
  37. +42
    -0
      test-rpzloader_cc.cc
  38. +8
    -4
      test-syncres_cc.cc
  39. +1
    -1
      test-syncres_cc.hh
  40. +7
    -2
      test-syncres_cc4.cc
  41. +13
    -7
      test-syncres_cc5.cc
  42. +4
    -0
      zoneparser-tng.cc

+ 5
- 0
Makefile.am View File

@@ -30,6 +30,8 @@ BUILT_SOURCES=htmlfiles.h \
CLEANFILES = htmlfiles.h \
dnsmessage.pb.cc \
dnsmessage.pb.h \
dnstap.pb.cc \
dnstap.pb.h \
recursor.conf-dist

htmlfiles.h: html/*
@@ -246,6 +248,8 @@ testrunner_SOURCES = \
recpacketcache.cc recpacketcache.hh \
recursor_cache.cc recursor_cache.hh \
responsestats.cc \
rpzloader.cc rpzloader.hh \
resolver.hh resolver.cc \
root-dnssec.hh \
sillyrecords.cc \
sholder.hh \
@@ -273,6 +277,7 @@ testrunner_SOURCES = \
test-rcpgenerator_cc.cc \
test-recpacketcache_cc.cc \
test-recursorcache_cc.cc \
test-rpzloader_cc.cc \
test-signers.cc \
test-syncres_cc.hh \
test-syncres_cc.cc \


+ 493
- 187
Makefile.in View File

@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -326,27 +326,27 @@ am__testrunner_SOURCES_DIST = arguments.cc base32.cc base64.cc \
pollmplexer.cc protobuf.cc protobuf.hh qtype.cc qtype.hh \
rcpgenerator.cc rec-protobuf.cc rec-protobuf.hh \
recpacketcache.cc recpacketcache.hh recursor_cache.cc \
recursor_cache.hh responsestats.cc root-dnssec.hh \
sillyrecords.cc sholder.hh sstuff.hh stable-bloom.hh \
syncres.cc syncres.hh test-arguments_cc.cc test-base32_cc.cc \
test-base64_cc.cc test-common.hh test-dnsrecordcontent.cc \
test-dns_random_hh.cc test-dnsname_cc.cc test-dnsparser_hh.cc \
test-dnsrecords_cc.cc test-ednsoptions_cc.cc \
test-filterpo_cc.cc test-iputils_hh.cc test-ixfr_cc.cc \
test-misc_hh.cc test-mtasker.cc test-mplexer.cc \
test-negcache_cc.cc test-packetcache_hh.cc \
recursor_cache.hh responsestats.cc rpzloader.cc rpzloader.hh \
resolver.hh resolver.cc root-dnssec.hh sillyrecords.cc \
sholder.hh sstuff.hh stable-bloom.hh syncres.cc syncres.hh \
test-arguments_cc.cc test-base32_cc.cc test-base64_cc.cc \
test-common.hh test-dnsrecordcontent.cc test-dns_random_hh.cc \
test-dnsname_cc.cc test-dnsparser_hh.cc test-dnsrecords_cc.cc \
test-ednsoptions_cc.cc test-filterpo_cc.cc test-iputils_hh.cc \
test-ixfr_cc.cc test-misc_hh.cc test-mtasker.cc \
test-mplexer.cc test-negcache_cc.cc test-packetcache_hh.cc \
test-rcpgenerator_cc.cc test-recpacketcache_cc.cc \
test-recursorcache_cc.cc test-signers.cc test-syncres_cc.hh \
test-syncres_cc.cc test-syncres_cc1.cc test-syncres_cc2.cc \
test-syncres_cc3.cc test-syncres_cc4.cc test-syncres_cc5.cc \
test-syncres_cc6.cc test-syncres_cc7.cc test-syncres_cc8.cc \
test-syncres_cc9.cc test-tsig.cc test-xpf_cc.cc testrunner.cc \
threadname.hh threadname.cc tsigverifier.cc tsigverifier.hh \
unix_utility.cc validate.cc validate.hh validate-recursor.cc \
validate-recursor.hh xpf.cc xpf.hh zoneparser-tng.cc \
zoneparser-tng.hh nod.hh nod.cc test-nod_cc.cc \
sodiumsigners.cc kqueuemplexer.cc epollmplexer.cc \
devpollmplexer.cc portsmplexer.cc
test-recursorcache_cc.cc test-rpzloader_cc.cc test-signers.cc \
test-syncres_cc.hh test-syncres_cc.cc test-syncres_cc1.cc \
test-syncres_cc2.cc test-syncres_cc3.cc test-syncres_cc4.cc \
test-syncres_cc5.cc test-syncres_cc6.cc test-syncres_cc7.cc \
test-syncres_cc8.cc test-syncres_cc9.cc test-tsig.cc \
test-xpf_cc.cc testrunner.cc threadname.hh threadname.cc \
tsigverifier.cc tsigverifier.hh unix_utility.cc validate.cc \
validate.hh validate-recursor.cc validate-recursor.hh xpf.cc \
xpf.hh zoneparser-tng.cc zoneparser-tng.hh nod.hh nod.cc \
test-nod_cc.cc sodiumsigners.cc kqueuemplexer.cc \
epollmplexer.cc devpollmplexer.cc portsmplexer.cc
@NOD_ENABLED_TRUE@am__objects_8 = nod.$(OBJEXT) test-nod_cc.$(OBJEXT)
am_testrunner_OBJECTS = arguments.$(OBJEXT) base32.$(OBJEXT) \
base64.$(OBJEXT) dns.$(OBJEXT) dns_random.$(OBJEXT) \
@@ -361,24 +361,26 @@ am_testrunner_OBJECTS = arguments.$(OBJEXT) base32.$(OBJEXT) \
protobuf.$(OBJEXT) qtype.$(OBJEXT) rcpgenerator.$(OBJEXT) \
rec-protobuf.$(OBJEXT) recpacketcache.$(OBJEXT) \
recursor_cache.$(OBJEXT) responsestats.$(OBJEXT) \
sillyrecords.$(OBJEXT) syncres.$(OBJEXT) \
test-arguments_cc.$(OBJEXT) test-base32_cc.$(OBJEXT) \
test-base64_cc.$(OBJEXT) test-dnsrecordcontent.$(OBJEXT) \
test-dns_random_hh.$(OBJEXT) test-dnsname_cc.$(OBJEXT) \
test-dnsparser_hh.$(OBJEXT) test-dnsrecords_cc.$(OBJEXT) \
test-ednsoptions_cc.$(OBJEXT) test-filterpo_cc.$(OBJEXT) \
test-iputils_hh.$(OBJEXT) test-ixfr_cc.$(OBJEXT) \
test-misc_hh.$(OBJEXT) test-mtasker.$(OBJEXT) \
test-mplexer.$(OBJEXT) test-negcache_cc.$(OBJEXT) \
test-packetcache_hh.$(OBJEXT) test-rcpgenerator_cc.$(OBJEXT) \
rpzloader.$(OBJEXT) resolver.$(OBJEXT) sillyrecords.$(OBJEXT) \
syncres.$(OBJEXT) test-arguments_cc.$(OBJEXT) \
test-base32_cc.$(OBJEXT) test-base64_cc.$(OBJEXT) \
test-dnsrecordcontent.$(OBJEXT) test-dns_random_hh.$(OBJEXT) \
test-dnsname_cc.$(OBJEXT) test-dnsparser_hh.$(OBJEXT) \
test-dnsrecords_cc.$(OBJEXT) test-ednsoptions_cc.$(OBJEXT) \
test-filterpo_cc.$(OBJEXT) test-iputils_hh.$(OBJEXT) \
test-ixfr_cc.$(OBJEXT) test-misc_hh.$(OBJEXT) \
test-mtasker.$(OBJEXT) test-mplexer.$(OBJEXT) \
test-negcache_cc.$(OBJEXT) test-packetcache_hh.$(OBJEXT) \
test-rcpgenerator_cc.$(OBJEXT) \
test-recpacketcache_cc.$(OBJEXT) \
test-recursorcache_cc.$(OBJEXT) test-signers.$(OBJEXT) \
test-syncres_cc.$(OBJEXT) test-syncres_cc1.$(OBJEXT) \
test-syncres_cc2.$(OBJEXT) test-syncres_cc3.$(OBJEXT) \
test-syncres_cc4.$(OBJEXT) test-syncres_cc5.$(OBJEXT) \
test-syncres_cc6.$(OBJEXT) test-syncres_cc7.$(OBJEXT) \
test-syncres_cc8.$(OBJEXT) test-syncres_cc9.$(OBJEXT) \
test-tsig.$(OBJEXT) test-xpf_cc.$(OBJEXT) testrunner.$(OBJEXT) \
test-recursorcache_cc.$(OBJEXT) test-rpzloader_cc.$(OBJEXT) \
test-signers.$(OBJEXT) test-syncres_cc.$(OBJEXT) \
test-syncres_cc1.$(OBJEXT) test-syncres_cc2.$(OBJEXT) \
test-syncres_cc3.$(OBJEXT) test-syncres_cc4.$(OBJEXT) \
test-syncres_cc5.$(OBJEXT) test-syncres_cc6.$(OBJEXT) \
test-syncres_cc7.$(OBJEXT) test-syncres_cc8.$(OBJEXT) \
test-syncres_cc9.$(OBJEXT) test-tsig.$(OBJEXT) \
test-xpf_cc.$(OBJEXT) testrunner.$(OBJEXT) \
threadname.$(OBJEXT) tsigverifier.$(OBJEXT) \
unix_utility.$(OBJEXT) validate.$(OBJEXT) \
validate-recursor.$(OBJEXT) xpf.$(OBJEXT) \
@@ -410,7 +412,72 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/arguments.Po ./$(DEPDIR)/base32.Po \
./$(DEPDIR)/base64.Po ./$(DEPDIR)/capabilities.Po \
./$(DEPDIR)/decafsigners.Po ./$(DEPDIR)/devpollmplexer.Po \
./$(DEPDIR)/dns.Po ./$(DEPDIR)/dns_random.Po \
./$(DEPDIR)/dnslabeltext.Po ./$(DEPDIR)/dnsmessage.pb.Po \
./$(DEPDIR)/dnsname.Po ./$(DEPDIR)/dnsparser.Po \
./$(DEPDIR)/dnsrecords.Po ./$(DEPDIR)/dnssecinfra.Po \
./$(DEPDIR)/dnswriter.Po ./$(DEPDIR)/ednscookies.Po \
./$(DEPDIR)/ednsoptions.Po ./$(DEPDIR)/ednssubnet.Po \
./$(DEPDIR)/epollmplexer.Po ./$(DEPDIR)/filterpo.Po \
./$(DEPDIR)/gettime.Po ./$(DEPDIR)/gss_context.Po \
./$(DEPDIR)/iputils.Po ./$(DEPDIR)/ixfr.Po ./$(DEPDIR)/json.Po \
./$(DEPDIR)/kqueuemplexer.Po ./$(DEPDIR)/logger.Po \
./$(DEPDIR)/lua-base4.Po ./$(DEPDIR)/lua-recursor4.Po \
./$(DEPDIR)/lwres.Po ./$(DEPDIR)/malloctrace.Po \
./$(DEPDIR)/misc.Po ./$(DEPDIR)/mtasker_context.Po \
./$(DEPDIR)/negcache.Po ./$(DEPDIR)/nod.Po \
./$(DEPDIR)/nsecrecords.Po ./$(DEPDIR)/opensslsigners.Po \
./$(DEPDIR)/pdns_recursor.Po ./$(DEPDIR)/pollmplexer.Po \
./$(DEPDIR)/portsmplexer.Po ./$(DEPDIR)/protobuf.Po \
./$(DEPDIR)/pubsuffix.Po ./$(DEPDIR)/pubsuffixloader.Po \
./$(DEPDIR)/qtype.Po ./$(DEPDIR)/rcpgenerator.Po \
./$(DEPDIR)/rec-carbon.Po ./$(DEPDIR)/rec-lua-conf.Po \
./$(DEPDIR)/rec-protobuf.Po ./$(DEPDIR)/rec-snmp.Po \
./$(DEPDIR)/rec_channel.Po ./$(DEPDIR)/rec_channel_rec.Po \
./$(DEPDIR)/rec_control.Po ./$(DEPDIR)/recpacketcache.Po \
./$(DEPDIR)/recursor_cache.Po ./$(DEPDIR)/reczones.Po \
./$(DEPDIR)/remote_logger.Po ./$(DEPDIR)/resolver.Po \
./$(DEPDIR)/responsestats.Po ./$(DEPDIR)/rpzloader.Po \
./$(DEPDIR)/secpoll-recursor.Po ./$(DEPDIR)/sillyrecords.Po \
./$(DEPDIR)/snmp-agent.Po ./$(DEPDIR)/sodiumsigners.Po \
./$(DEPDIR)/sortlist.Po ./$(DEPDIR)/syncres.Po \
./$(DEPDIR)/test-arguments_cc.Po ./$(DEPDIR)/test-base32_cc.Po \
./$(DEPDIR)/test-base64_cc.Po \
./$(DEPDIR)/test-dns_random_hh.Po \
./$(DEPDIR)/test-dnsname_cc.Po \
./$(DEPDIR)/test-dnsparser_hh.Po \
./$(DEPDIR)/test-dnsrecordcontent.Po \
./$(DEPDIR)/test-dnsrecords_cc.Po \
./$(DEPDIR)/test-ednsoptions_cc.Po \
./$(DEPDIR)/test-filterpo_cc.Po ./$(DEPDIR)/test-iputils_hh.Po \
./$(DEPDIR)/test-ixfr_cc.Po ./$(DEPDIR)/test-misc_hh.Po \
./$(DEPDIR)/test-mplexer.Po ./$(DEPDIR)/test-mtasker.Po \
./$(DEPDIR)/test-negcache_cc.Po ./$(DEPDIR)/test-nod_cc.Po \
./$(DEPDIR)/test-packetcache_hh.Po \
./$(DEPDIR)/test-rcpgenerator_cc.Po \
./$(DEPDIR)/test-recpacketcache_cc.Po \
./$(DEPDIR)/test-recursorcache_cc.Po \
./$(DEPDIR)/test-rpzloader_cc.Po ./$(DEPDIR)/test-signers.Po \
./$(DEPDIR)/test-syncres_cc.Po ./$(DEPDIR)/test-syncres_cc1.Po \
./$(DEPDIR)/test-syncres_cc2.Po \
./$(DEPDIR)/test-syncres_cc3.Po \
./$(DEPDIR)/test-syncres_cc4.Po \
./$(DEPDIR)/test-syncres_cc5.Po \
./$(DEPDIR)/test-syncres_cc6.Po \
./$(DEPDIR)/test-syncres_cc7.Po \
./$(DEPDIR)/test-syncres_cc8.Po \
./$(DEPDIR)/test-syncres_cc9.Po ./$(DEPDIR)/test-tsig.Po \
./$(DEPDIR)/test-xpf_cc.Po ./$(DEPDIR)/testrunner.Po \
./$(DEPDIR)/threadname.Po ./$(DEPDIR)/tsigverifier.Po \
./$(DEPDIR)/unix_utility.Po ./$(DEPDIR)/uuid-utils.Po \
./$(DEPDIR)/validate-recursor.Po ./$(DEPDIR)/validate.Po \
./$(DEPDIR)/version.Po ./$(DEPDIR)/webserver.Po \
./$(DEPDIR)/ws-api.Po ./$(DEPDIR)/ws-recursor.Po \
./$(DEPDIR)/xpf.Po ./$(DEPDIR)/zoneparser-tng.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -504,7 +571,8 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope check recheck distdir dist dist-all distcheck
cscope check recheck distdir distdir-am dist dist-all \
distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -934,6 +1002,7 @@ pdns_configure_args = @pdns_configure_args@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
socketdir = @socketdir@
@@ -956,8 +1025,9 @@ AM_LDFLAGS = \
ACLOCAL_AMFLAGS = -I m4
BUILT_SOURCES = htmlfiles.h dnslabeltext.cc $(am__append_4) \
$(am__append_27)
CLEANFILES = htmlfiles.h dnsmessage.pb.cc dnsmessage.pb.h \
recursor.conf-dist $(am__append_5) $(am__append_30)
CLEANFILES = htmlfiles.h dnsmessage.pb.cc dnsmessage.pb.h dnstap.pb.cc \
dnstap.pb.h recursor.conf-dist $(am__append_5) \
$(am__append_30)
SUBDIRS = ext
EXTRA_DIST = \
contrib/* \
@@ -1047,6 +1117,7 @@ testrunner_SOURCES = arguments.cc base32.cc base64.cc base64.hh \
protobuf.hh qtype.cc qtype.hh rcpgenerator.cc rec-protobuf.cc \
rec-protobuf.hh recpacketcache.cc recpacketcache.hh \
recursor_cache.cc recursor_cache.hh responsestats.cc \
rpzloader.cc rpzloader.hh resolver.hh resolver.cc \
root-dnssec.hh sillyrecords.cc sholder.hh sstuff.hh \
stable-bloom.hh syncres.cc syncres.hh test-arguments_cc.cc \
test-base32_cc.cc test-base64_cc.cc test-common.hh \
@@ -1056,16 +1127,17 @@ testrunner_SOURCES = arguments.cc base32.cc base64.cc base64.hh \
test-ixfr_cc.cc test-misc_hh.cc test-mtasker.cc \
test-mplexer.cc test-negcache_cc.cc test-packetcache_hh.cc \
test-rcpgenerator_cc.cc test-recpacketcache_cc.cc \
test-recursorcache_cc.cc test-signers.cc test-syncres_cc.hh \
test-syncres_cc.cc test-syncres_cc1.cc test-syncres_cc2.cc \
test-syncres_cc3.cc test-syncres_cc4.cc test-syncres_cc5.cc \
test-syncres_cc6.cc test-syncres_cc7.cc test-syncres_cc8.cc \
test-syncres_cc9.cc test-tsig.cc test-xpf_cc.cc testrunner.cc \
threadname.hh threadname.cc tsigverifier.cc tsigverifier.hh \
unix_utility.cc validate.cc validate.hh validate-recursor.cc \
validate-recursor.hh xpf.cc xpf.hh zoneparser-tng.cc \
zoneparser-tng.hh $(am__append_9) $(am__append_14) \
$(am__append_22) $(am__append_24) $(am__append_26)
test-recursorcache_cc.cc test-rpzloader_cc.cc test-signers.cc \
test-syncres_cc.hh test-syncres_cc.cc test-syncres_cc1.cc \
test-syncres_cc2.cc test-syncres_cc3.cc test-syncres_cc4.cc \
test-syncres_cc5.cc test-syncres_cc6.cc test-syncres_cc7.cc \
test-syncres_cc8.cc test-syncres_cc9.cc test-tsig.cc \
test-xpf_cc.cc testrunner.cc threadname.hh threadname.cc \
tsigverifier.cc tsigverifier.hh unix_utility.cc validate.cc \
validate.hh validate-recursor.cc validate-recursor.hh xpf.cc \
xpf.hh zoneparser-tng.cc zoneparser-tng.hh $(am__append_9) \
$(am__append_14) $(am__append_22) $(am__append_24) \
$(am__append_26)
testrunner_LDFLAGS = $(AM_LDFLAGS) $(BOOST_CONTEXT_LDFLAGS) \
$(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(LIBCRYPTO_LDFLAGS) \
$(BOOST_SYSTEM_LDFLAGS) $(am__append_11)
@@ -1124,8 +1196,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/lua_hpp.mk $(am__empty):

@@ -1278,118 +1350,125 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arguments.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base32.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/capabilities.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decafsigners.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devpollmplexer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns_random.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnslabeltext.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsmessage.pb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsparser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsrecords.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnssecinfra.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnswriter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ednscookies.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ednsoptions.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ednssubnet.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epollmplexer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filterpo.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gss_context.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iputils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixfr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kqueuemplexer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua-base4.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua-recursor4.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lwres.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloctrace.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtasker_context.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negcache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nod.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nsecrecords.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opensslsigners.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdns_recursor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pollmplexer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/portsmplexer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protobuf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubsuffix.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubsuffixloader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qtype.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rcpgenerator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-carbon.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-lua-conf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-protobuf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-snmp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec_channel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec_channel_rec.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec_control.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recpacketcache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recursor_cache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reczones.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_logger.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolver.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/responsestats.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpzloader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secpoll-recursor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sillyrecords.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snmp-agent.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sodiumsigners.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortlist.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syncres.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-arguments_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-base32_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-base64_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dns_random_hh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsname_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsparser_hh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsrecordcontent.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsrecords_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ednsoptions_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-filterpo_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iputils_hh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ixfr_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-misc_hh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mplexer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mtasker.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-negcache_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-nod_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-packetcache_hh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rcpgenerator_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-recpacketcache_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-recursorcache_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-signers.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc3.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc4.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc5.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc6.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc7.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc8.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc9.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tsig.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xpf_cc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testrunner.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsigverifier.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_utility.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uuid-utils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validate-recursor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/webserver.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ws-api.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ws-recursor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoneparser-tng.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arguments.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base32.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/capabilities.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decafsigners.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devpollmplexer.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns_random.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnslabeltext.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsmessage.pb.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsname.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsparser.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsrecords.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnssecinfra.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnswriter.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ednscookies.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ednsoptions.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ednssubnet.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epollmplexer.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filterpo.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gss_context.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iputils.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixfr.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kqueuemplexer.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua-base4.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua-recursor4.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lwres.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloctrace.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtasker_context.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negcache.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nod.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nsecrecords.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opensslsigners.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdns_recursor.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pollmplexer.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/portsmplexer.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protobuf.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubsuffix.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubsuffixloader.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qtype.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rcpgenerator.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-carbon.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-lua-conf.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-protobuf.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-snmp.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec_channel.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec_channel_rec.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec_control.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recpacketcache.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recursor_cache.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reczones.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_logger.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolver.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/responsestats.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpzloader.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secpoll-recursor.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sillyrecords.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snmp-agent.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sodiumsigners.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortlist.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syncres.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-arguments_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-base32_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-base64_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dns_random_hh.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsname_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsparser_hh.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsrecordcontent.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dnsrecords_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ednsoptions_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-filterpo_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iputils_hh.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ixfr_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-misc_hh.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mplexer.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mtasker.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-negcache_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-nod_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-packetcache_hh.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rcpgenerator_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-recpacketcache_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-recursorcache_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rpzloader_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-signers.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc1.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc2.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc3.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc4.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc5.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc6.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc7.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc8.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-syncres_cc9.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tsig.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xpf_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testrunner.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadname.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsigverifier.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_utility.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uuid-utils.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validate-recursor.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validate.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/webserver.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ws-api.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ws-recursor.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpf.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoneparser-tng.Po@am__quote@ # am--include-marker

$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@

am--depfiles: $(am__depfiles_remade)

.cc.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1735,7 +1814,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
fi; \
$$success || exit 1

check-TESTS:
check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1785,7 +1864,10 @@ testrunner.log: testrunner$(EXEEXT)
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)

distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -2029,7 +2111,119 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool \

distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/arguments.Po
-rm -f ./$(DEPDIR)/base32.Po
-rm -f ./$(DEPDIR)/base64.Po
-rm -f ./$(DEPDIR)/capabilities.Po
-rm -f ./$(DEPDIR)/decafsigners.Po
-rm -f ./$(DEPDIR)/devpollmplexer.Po
-rm -f ./$(DEPDIR)/dns.Po
-rm -f ./$(DEPDIR)/dns_random.Po
-rm -f ./$(DEPDIR)/dnslabeltext.Po
-rm -f ./$(DEPDIR)/dnsmessage.pb.Po
-rm -f ./$(DEPDIR)/dnsname.Po
-rm -f ./$(DEPDIR)/dnsparser.Po
-rm -f ./$(DEPDIR)/dnsrecords.Po
-rm -f ./$(DEPDIR)/dnssecinfra.Po
-rm -f ./$(DEPDIR)/dnswriter.Po
-rm -f ./$(DEPDIR)/ednscookies.Po
-rm -f ./$(DEPDIR)/ednsoptions.Po
-rm -f ./$(DEPDIR)/ednssubnet.Po
-rm -f ./$(DEPDIR)/epollmplexer.Po
-rm -f ./$(DEPDIR)/filterpo.Po
-rm -f ./$(DEPDIR)/gettime.Po
-rm -f ./$(DEPDIR)/gss_context.Po
-rm -f ./$(DEPDIR)/iputils.Po
-rm -f ./$(DEPDIR)/ixfr.Po
-rm -f ./$(DEPDIR)/json.Po
-rm -f ./$(DEPDIR)/kqueuemplexer.Po
-rm -f ./$(DEPDIR)/logger.Po
-rm -f ./$(DEPDIR)/lua-base4.Po
-rm -f ./$(DEPDIR)/lua-recursor4.Po
-rm -f ./$(DEPDIR)/lwres.Po
-rm -f ./$(DEPDIR)/malloctrace.Po
-rm -f ./$(DEPDIR)/misc.Po
-rm -f ./$(DEPDIR)/mtasker_context.Po
-rm -f ./$(DEPDIR)/negcache.Po
-rm -f ./$(DEPDIR)/nod.Po
-rm -f ./$(DEPDIR)/nsecrecords.Po
-rm -f ./$(DEPDIR)/opensslsigners.Po
-rm -f ./$(DEPDIR)/pdns_recursor.Po
-rm -f ./$(DEPDIR)/pollmplexer.Po
-rm -f ./$(DEPDIR)/portsmplexer.Po
-rm -f ./$(DEPDIR)/protobuf.Po
-rm -f ./$(DEPDIR)/pubsuffix.Po
-rm -f ./$(DEPDIR)/pubsuffixloader.Po
-rm -f ./$(DEPDIR)/qtype.Po
-rm -f ./$(DEPDIR)/rcpgenerator.Po
-rm -f ./$(DEPDIR)/rec-carbon.Po
-rm -f ./$(DEPDIR)/rec-lua-conf.Po
-rm -f ./$(DEPDIR)/rec-protobuf.Po
-rm -f ./$(DEPDIR)/rec-snmp.Po
-rm -f ./$(DEPDIR)/rec_channel.Po
-rm -f ./$(DEPDIR)/rec_channel_rec.Po
-rm -f ./$(DEPDIR)/rec_control.Po
-rm -f ./$(DEPDIR)/recpacketcache.Po
-rm -f ./$(DEPDIR)/recursor_cache.Po
-rm -f ./$(DEPDIR)/reczones.Po
-rm -f ./$(DEPDIR)/remote_logger.Po
-rm -f ./$(DEPDIR)/resolver.Po
-rm -f ./$(DEPDIR)/responsestats.Po
-rm -f ./$(DEPDIR)/rpzloader.Po
-rm -f ./$(DEPDIR)/secpoll-recursor.Po
-rm -f ./$(DEPDIR)/sillyrecords.Po
-rm -f ./$(DEPDIR)/snmp-agent.Po
-rm -f ./$(DEPDIR)/sodiumsigners.Po
-rm -f ./$(DEPDIR)/sortlist.Po
-rm -f ./$(DEPDIR)/syncres.Po
-rm -f ./$(DEPDIR)/test-arguments_cc.Po
-rm -f ./$(DEPDIR)/test-base32_cc.Po
-rm -f ./$(DEPDIR)/test-base64_cc.Po
-rm -f ./$(DEPDIR)/test-dns_random_hh.Po
-rm -f ./$(DEPDIR)/test-dnsname_cc.Po
-rm -f ./$(DEPDIR)/test-dnsparser_hh.Po
-rm -f ./$(DEPDIR)/test-dnsrecordcontent.Po
-rm -f ./$(DEPDIR)/test-dnsrecords_cc.Po
-rm -f ./$(DEPDIR)/test-ednsoptions_cc.Po
-rm -f ./$(DEPDIR)/test-filterpo_cc.Po
-rm -f ./$(DEPDIR)/test-iputils_hh.Po
-rm -f ./$(DEPDIR)/test-ixfr_cc.Po
-rm -f ./$(DEPDIR)/test-misc_hh.Po
-rm -f ./$(DEPDIR)/test-mplexer.Po
-rm -f ./$(DEPDIR)/test-mtasker.Po
-rm -f ./$(DEPDIR)/test-negcache_cc.Po
-rm -f ./$(DEPDIR)/test-nod_cc.Po
-rm -f ./$(DEPDIR)/test-packetcache_hh.Po
-rm -f ./$(DEPDIR)/test-rcpgenerator_cc.Po
-rm -f ./$(DEPDIR)/test-recpacketcache_cc.Po
-rm -f ./$(DEPDIR)/test-recursorcache_cc.Po
-rm -f ./$(DEPDIR)/test-rpzloader_cc.Po
-rm -f ./$(DEPDIR)/test-signers.Po
-rm -f ./$(DEPDIR)/test-syncres_cc.Po
-rm -f ./$(DEPDIR)/test-syncres_cc1.Po
-rm -f ./$(DEPDIR)/test-syncres_cc2.Po
-rm -f ./$(DEPDIR)/test-syncres_cc3.Po
-rm -f ./$(DEPDIR)/test-syncres_cc4.Po
-rm -f ./$(DEPDIR)/test-syncres_cc5.Po
-rm -f ./$(DEPDIR)/test-syncres_cc6.Po
-rm -f ./$(DEPDIR)/test-syncres_cc7.Po
-rm -f ./$(DEPDIR)/test-syncres_cc8.Po
-rm -f ./$(DEPDIR)/test-syncres_cc9.Po
-rm -f ./$(DEPDIR)/test-tsig.Po
-rm -f ./$(DEPDIR)/test-xpf_cc.Po
-rm -f ./$(DEPDIR)/testrunner.Po
-rm -f ./$(DEPDIR)/threadname.Po
-rm -f ./$(DEPDIR)/tsigverifier.Po
-rm -f ./$(DEPDIR)/unix_utility.Po
-rm -f ./$(DEPDIR)/uuid-utils.Po
-rm -f ./$(DEPDIR)/validate-recursor.Po
-rm -f ./$(DEPDIR)/validate.Po
-rm -f ./$(DEPDIR)/version.Po
-rm -f ./$(DEPDIR)/webserver.Po
-rm -f ./$(DEPDIR)/ws-api.Po
-rm -f ./$(DEPDIR)/ws-recursor.Po
-rm -f ./$(DEPDIR)/xpf.Po
-rm -f ./$(DEPDIR)/zoneparser-tng.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -2078,7 +2272,119 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/arguments.Po
-rm -f ./$(DEPDIR)/base32.Po
-rm -f ./$(DEPDIR)/base64.Po
-rm -f ./$(DEPDIR)/capabilities.Po
-rm -f ./$(DEPDIR)/decafsigners.Po
-rm -f ./$(DEPDIR)/devpollmplexer.Po
-rm -f ./$(DEPDIR)/dns.Po
-rm -f ./$(DEPDIR)/dns_random.Po
-rm -f ./$(DEPDIR)/dnslabeltext.Po
-rm -f ./$(DEPDIR)/dnsmessage.pb.Po
-rm -f ./$(DEPDIR)/dnsname.Po
-rm -f ./$(DEPDIR)/dnsparser.Po
-rm -f ./$(DEPDIR)/dnsrecords.Po
-rm -f ./$(DEPDIR)/dnssecinfra.Po
-rm -f ./$(DEPDIR)/dnswriter.Po
-rm -f ./$(DEPDIR)/ednscookies.Po
-rm -f ./$(DEPDIR)/ednsoptions.Po
-rm -f ./$(DEPDIR)/ednssubnet.Po
-rm -f ./$(DEPDIR)/epollmplexer.Po
-rm -f ./$(DEPDIR)/filterpo.Po
-rm -f ./$(DEPDIR)/gettime.Po
-rm -f ./$(DEPDIR)/gss_context.Po
-rm -f ./$(DEPDIR)/iputils.Po
-rm -f ./$(DEPDIR)/ixfr.Po
-rm -f ./$(DEPDIR)/json.Po
-rm -f ./$(DEPDIR)/kqueuemplexer.Po
-rm -f ./$(DEPDIR)/logger.Po
-rm -f ./$(DEPDIR)/lua-base4.Po
-rm -f ./$(DEPDIR)/lua-recursor4.Po
-rm -f ./$(DEPDIR)/lwres.Po
-rm -f ./$(DEPDIR)/malloctrace.Po
-rm -f ./$(DEPDIR)/misc.Po
-rm -f ./$(DEPDIR)/mtasker_context.Po
-rm -f ./$(DEPDIR)/negcache.Po
-rm -f ./$(DEPDIR)/nod.Po
-rm -f ./$(DEPDIR)/nsecrecords.Po
-rm -f ./$(DEPDIR)/opensslsigners.Po
-rm -f ./$(DEPDIR)/pdns_recursor.Po
-rm -f ./$(DEPDIR)/pollmplexer.Po
-rm -f ./$(DEPDIR)/portsmplexer.Po
-rm -f ./$(DEPDIR)/protobuf.Po
-rm -f ./$(DEPDIR)/pubsuffix.Po
-rm -f ./$(DEPDIR)/pubsuffixloader.Po
-rm -f ./$(DEPDIR)/qtype.Po
-rm -f ./$(DEPDIR)/rcpgenerator.Po
-rm -f ./$(DEPDIR)/rec-carbon.Po
-rm -f ./$(DEPDIR)/rec-lua-conf.Po
-rm -f ./$(DEPDIR)/rec-protobuf.Po
-rm -f ./$(DEPDIR)/rec-snmp.Po
-rm -f ./$(DEPDIR)/rec_channel.Po
-rm -f ./$(DEPDIR)/rec_channel_rec.Po
-rm -f ./$(DEPDIR)/rec_control.Po
-rm -f ./$(DEPDIR)/recpacketcache.Po
-rm -f ./$(DEPDIR)/recursor_cache.Po
-rm -f ./$(DEPDIR)/reczones.Po
-rm -f ./$(DEPDIR)/remote_logger.Po
-rm -f ./$(DEPDIR)/resolver.Po
-rm -f ./$(DEPDIR)/responsestats.Po
-rm -f ./$(DEPDIR)/rpzloader.Po
-rm -f ./$(DEPDIR)/secpoll-recursor.Po
-rm -f ./$(DEPDIR)/sillyrecords.Po
-rm -f ./$(DEPDIR)/snmp-agent.Po
-rm -f ./$(DEPDIR)/sodiumsigners.Po
-rm -f ./$(DEPDIR)/sortlist.Po
-rm -f ./$(DEPDIR)/syncres.Po
-rm -f ./$(DEPDIR)/test-arguments_cc.Po
-rm -f ./$(DEPDIR)/test-base32_cc.Po
-rm -f ./$(DEPDIR)/test-base64_cc.Po
-rm -f ./$(DEPDIR)/test-dns_random_hh.Po
-rm -f ./$(DEPDIR)/test-dnsname_cc.Po
-rm -f ./$(DEPDIR)/test-dnsparser_hh.Po
-rm -f ./$(DEPDIR)/test-dnsrecordcontent.Po
-rm -f ./$(DEPDIR)/test-dnsrecords_cc.Po
-rm -f ./$(DEPDIR)/test-ednsoptions_cc.Po
-rm -f ./$(DEPDIR)/test-filterpo_cc.Po
-rm -f ./$(DEPDIR)/test-iputils_hh.Po
-rm -f ./$(DEPDIR)/test-ixfr_cc.Po
-rm -f ./$(DEPDIR)/test-misc_hh.Po
-rm -f ./$(DEPDIR)/test-mplexer.Po
-rm -f ./$(DEPDIR)/test-mtasker.Po
-rm -f ./$(DEPDIR)/test-negcache_cc.Po
-rm -f ./$(DEPDIR)/test-nod_cc.Po
-rm -f ./$(DEPDIR)/test-packetcache_hh.Po
-rm -f ./$(DEPDIR)/test-rcpgenerator_cc.Po
-rm -f ./$(DEPDIR)/test-recpacketcache_cc.Po
-rm -f ./$(DEPDIR)/test-recursorcache_cc.Po
-rm -f ./$(DEPDIR)/test-rpzloader_cc.Po
-rm -f ./$(DEPDIR)/test-signers.Po
-rm -f ./$(DEPDIR)/test-syncres_cc.Po
-rm -f ./$(DEPDIR)/test-syncres_cc1.Po
-rm -f ./$(DEPDIR)/test-syncres_cc2.Po
-rm -f ./$(DEPDIR)/test-syncres_cc3.Po
-rm -f ./$(DEPDIR)/test-syncres_cc4.Po
-rm -f ./$(DEPDIR)/test-syncres_cc5.Po
-rm -f ./$(DEPDIR)/test-syncres_cc6.Po
-rm -f ./$(DEPDIR)/test-syncres_cc7.Po
-rm -f ./$(DEPDIR)/test-syncres_cc8.Po
-rm -f ./$(DEPDIR)/test-syncres_cc9.Po
-rm -f ./$(DEPDIR)/test-tsig.Po
-rm -f ./$(DEPDIR)/test-xpf_cc.Po
-rm -f ./$(DEPDIR)/testrunner.Po
-rm -f ./$(DEPDIR)/threadname.Po
-rm -f ./$(DEPDIR)/tsigverifier.Po
-rm -f ./$(DEPDIR)/unix_utility.Po
-rm -f ./$(DEPDIR)/uuid-utils.Po
-rm -f ./$(DEPDIR)/validate-recursor.Po
-rm -f ./$(DEPDIR)/validate.Po
-rm -f ./$(DEPDIR)/version.Po
-rm -f ./$(DEPDIR)/webserver.Po
-rm -f ./$(DEPDIR)/ws-api.Po
-rm -f ./$(DEPDIR)/ws-recursor.Po
-rm -f ./$(DEPDIR)/xpf.Po
-rm -f ./$(DEPDIR)/zoneparser-tng.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

@@ -2105,22 +2411,22 @@ uninstall-man: uninstall-man1
install-strip

.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-TESTS check-am check-local clean \
clean-binPROGRAMS clean-cscope clean-generic clean-libtool \
clean-noinstPROGRAMS clean-sbinPROGRAMS cscope cscopelist-am \
ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-man1 install-pdf \
install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
install-strip install-sysconfDATA \
install-systemdsystemunitDATA installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
am--depfiles am--refresh check check-TESTS check-am \
check-local clean clean-binPROGRAMS clean-cscope clean-generic \
clean-libtool clean-noinstPROGRAMS clean-sbinPROGRAMS cscope \
cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-man1 install-pdf install-pdf-am install-ps \
install-ps-am install-sbinPROGRAMS install-strip \
install-sysconfDATA install-systemdsystemunitDATA installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am \


+ 87
- 104
aclocal.m4 View File

@@ -1,6 +1,6 @@
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-

# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -364,7 +364,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES

# Copyright (C) 2002-2017 Free Software Foundation, Inc.
# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -376,10 +376,10 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15.1], [],
m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])

@@ -395,14 +395,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15.1])dnl
[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -454,7 +454,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`

# AM_COND_IF -*- Autoconf -*-

# Copyright (C) 2008-2017 Free Software Foundation, Inc.
# Copyright (C) 2008-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -491,7 +491,7 @@ fi[]dnl

# AM_CONDITIONAL -*- Autoconf -*-

# Copyright (C) 1997-2017 Free Software Foundation, Inc.
# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -522,7 +522,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])

# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -713,13 +713,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl

# Generate code to set up dependency tracking. -*- Autoconf -*-

# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 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.


# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -727,49 +726,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
*\'*) eval set x "$CONFIG_FILES" ;;
*) set x $CONFIG_FILES ;;
esac
# TODO: see whether this extra hack can be removed once we start
# requiring Autoconf 2.70 or later.
AS_CASE([$CONFIG_FILES],
[*\'*], [eval set x "$CONFIG_FILES"],
[*], [set x $CONFIG_FILES])
shift
for mf
# Used to flag and report bootstrapping failures.
am_rc=0
for am_mf
do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
# We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile which includes
# dependency-tracking related rules and includes.
# Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
# from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|| continue
am_dirpart=`AS_DIRNAME(["$am_mf"])`
am_filepart=`AS_BASENAME(["$am_mf"])`
AM_RUN_LOG([cd "$am_dirpart" \
&& sed -e '/# am--include-marker/d' "$am_filepart" \
| $MAKE -f - am--depfiles]) || am_rc=$?
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
for automatic dependency tracking. Try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
AS_UNSET([am_dirpart])
AS_UNSET([am_filepart])
AS_UNSET([am_mf])
AS_UNSET([am_rc])
rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS

@@ -778,18 +769,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
# This code is only required when automatic dependency tracking is enabled.
# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])

# Do all the work for Automake. -*- Autoconf -*-

# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -876,8 +866,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -944,7 +934,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue.

You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <http://www.gnu.org/software/coreutils/>.
that behaves properly: <https://www.gnu.org/software/coreutils/>.

If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -986,7 +976,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1007,7 +997,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])

# Copyright (C) 2003-2017 Free Software Foundation, Inc.
# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1028,7 +1018,7 @@ AC_SUBST([am__leading_dot])])

# Check to see how 'make' treats includes. -*- Autoconf -*-

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,49 +1026,42 @@ AC_SUBST([am__leading_dot])])

# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
# Check whether make has an 'include' directive that can support all
# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
cat > confinc.mk << 'END'
am__doit:
@echo this is the am__doit target
@echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
am__quote=
_am_result=GNU
;;
esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=.include
am__quote="\""
_am_result=BSD
;;
esac
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# BSD make does it like this.
echo '.include "confinc.mk" # ignored' > confmf.BSD
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
echo 'include confinc.mk # ignored' > confmf.GNU
_am_result=no
for s in GNU BSD; do
AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
AS_CASE([$?:`cat confinc.out 2>/dev/null`],
['0:this is the am__doit target'],
[AS_CASE([$s],
[BSD], [am__include='.include' am__quote='"'],
[am__include='include' am__quote=''])])
if test "$am__include" != "#"; then
_am_result="yes ($s style)"
break
fi
done
rm -f confinc.* confmf.*
AC_MSG_RESULT([${_am_result}])
AC_SUBST([am__include])])
AC_SUBST([am__quote])])

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

# Copyright (C) 1997-2017 Free Software Foundation, Inc.
# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1117,7 +1100,7 @@ fi

# Helper functions for option handling. -*- Autoconf -*-

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1146,7 +1129,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1193,7 +1176,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1212,7 +1195,7 @@ AC_DEFUN([AM_RUN_LOG],

# Check to make sure that the build environment is sane. -*- Autoconf -*-

# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1293,7 +1276,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])

# Copyright (C) 2009-2017 Free Software Foundation, Inc.
# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1353,7 +1336,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])

# Copyright (C) 2001-2017 Free Software Foundation, Inc.
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1381,7 +1364,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])

# Copyright (C) 2006-2017 Free Software Foundation, Inc.
# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1400,7 +1383,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

# Check how to create a tarball. -*- Autoconf -*-

# Copyright (C) 2004-2017 Free Software Foundation, Inc.
# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,


+ 4
- 4
build-aux/compile View File

@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.

scriptversion=2016-01-11.22; # UTC
scriptversion=2018-03-07.03; # UTC

# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
# 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/>.

# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -340,7 +340,7 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"


+ 281
- 278
build-aux/config.guess
File diff suppressed because it is too large
View File


+ 107
- 142
build-aux/config.sub View File

@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
# Copyright 1992-2018 Free Software Foundation, Inc.

timestamp='2017-04-02'
timestamp='2018-03-08'

# This file 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 @@ timestamp='2017-04-02'
# 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/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2017-04-02'
# Otherwise, we print the canonical config type on stdout and succeed.

# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub

# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS

Canonicalize a configuration name.

Operation modes:
Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)

Copyright 1992-2017 Free Software Foundation, Inc.
Copyright 1992-2018 Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -94,7 +94,7 @@ while test $# -gt 0 ; do

*local*)
# First pass through any local machine types.
echo $1
echo "$1"
exit ;;

* )
@@ -112,7 +112,7 @@ esac

# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
@@ -120,16 +120,16 @@ case $maybe_os in
kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
android-linux)
os=-linux-android
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
then os=`echo $1 | sed 's/.*-/-/'`
basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
if [ "$basic_machine" != "$1" ]
then os=`echo "$1" | sed 's/.*-/-/'`
else os=; fi
;;
esac
@@ -178,44 +178,44 @@ case $os in
;;
-sco6)
os=-sco5v6
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
os=-sco3.2v4
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-udk*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-clix*)
basic_machine=clipper-intergraph
;;
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
@@ -227,10 +227,7 @@ case $os in
os=-lynxos
;;
-ptx*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
;;
-windowsnt*)
os=`echo $os | sed -e 's/windowsnt/winnt/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
;;
-psos*)
os=-psos
@@ -299,7 +296,7 @@ case $basic_machine in
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| pdp10 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
@@ -316,7 +313,6 @@ case $basic_machine in
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -337,7 +333,7 @@ case $basic_machine in
basic_machine=$basic_machine-unknown
os=-none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
ms1)
basic_machine=mt-unknown
@@ -366,7 +362,7 @@ case $basic_machine in
;;
# Object if more than one company name word.
*-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -461,7 +457,7 @@ case $basic_machine in
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
basic_machine=i386-unknown
basic_machine=i386-pc
os=-bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -495,7 +491,7 @@ case $basic_machine in
basic_machine=x86_64-pc
;;
amd64-*)
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
@@ -540,7 +536,7 @@ case $basic_machine in
os=-linux
;;
blackfin-*)
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
@@ -548,13 +544,13 @@ case $basic_machine in
os=-cnk
;;
c54x-*)
basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c55x-*)
basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c6x-*)
basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c90)
basic_machine=c90-cray
@@ -643,7 +639,7 @@ case $basic_machine in
basic_machine=rs6000-bull
os=-bosx
;;
dpx2* | dpx2*-bull)
dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
@@ -652,7 +648,7 @@ case $basic_machine in
os=$os"spe"
;;
e500v[12]-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
@@ -744,9 +740,6 @@ case $basic_machine in
hp9k8[0-9][0-9] | hp8[0-9][0-9])
basic_machine=hppa1.0-hp
;;
hppa-next)
os=-nextstep3
;;
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
@@ -759,26 +752,26 @@ case $basic_machine in
basic_machine=i370-ibm
;;
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
i*86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
i*86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
i*86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach)
basic_machine=i386-mach
os=-mach
;;
i386-vsta | vsta)
vsta)
basic_machine=i386-unknown
os=-vsta
;;
@@ -797,19 +790,16 @@ case $basic_machine in
os=-sysv
;;
leon-*|leon[3-9]-*)
basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
m88k-omron*)
basic_machine=m88k-omron
;;
magnum | m3230)
basic_machine=mips-mips
os=-sysv
@@ -841,10 +831,10 @@ case $basic_machine in
os=-mint
;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
;;
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
;;
monitor)
basic_machine=m68k-rom68k
@@ -863,7 +853,7 @@ case $basic_machine in
os=-msdos
;;
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i686-pc
@@ -905,7 +895,7 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
next | m*-next )
next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -950,6 +940,9 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
nsv-tandem)
basic_machine=nsv-tandem
;;
nsx-tandem)
basic_machine=nsx-tandem
;;
@@ -985,7 +978,7 @@ case $basic_machine in
os=-linux
;;
parisc-*)
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
@@ -1001,7 +994,7 @@ case $basic_machine in
basic_machine=i386-pc
;;
pc98-*)
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
@@ -1016,16 +1009,16 @@ case $basic_machine in
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium4-*)
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
@@ -1035,23 +1028,23 @@ case $basic_machine in
ppc | ppcbe) basic_machine=powerpc-unknown
;;
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ps2)
basic_machine=i386-ibm
@@ -1105,17 +1098,10 @@ case $basic_machine in
sequent)
basic_machine=i386-sequent
;;
sh)
basic_machine=sh-hitachi
os=-hms
;;
sh5el)
basic_machine=sh5le-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
sparclite-wrs | simso-wrs)
simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -1134,7 +1120,7 @@ case $basic_machine in
os=-sysv4
;;
strongarm-* | thumb-*)
basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
sun2)
basic_machine=m68000-sun
@@ -1248,9 +1234,6 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
wasm32)
basic_machine=wasm32-unknown
;;
w65*)
basic_machine=w65-wdc
os=-none
@@ -1259,6 +1242,9 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
x64)
basic_machine=x86_64-pc
;;
xbox)
basic_machine=i686-pc
os=-mingw32
@@ -1267,20 +1253,12 @@ case $basic_machine in
basic_machine=xps100-honeywell
;;
xscale-* | xscalee[bl]-*)
basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
;;
z80-*-coff)
basic_machine=z80-unknown
os=-sim
;;
none)
basic_machine=none-none
os=-none
@@ -1309,10 +1287,6 @@ case $basic_machine in
vax)
basic_machine=vax-dec
;;
pdp10)
# there are many clones, so DEC is not a safe bet
basic_machine=pdp10-unknown
;;
pdp11)
basic_machine=pdp11-dec
;;
@@ -1322,9 +1296,6 @@ case $basic_machine in
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
basic_machine=cydra-cydrome
;;
@@ -1344,7 +1315,7 @@ case $basic_machine in
# Make sure to match an already-canonicalized machine name.
;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
esac
@@ -1352,10 +1323,10 @@ esac
# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
*-digital*)
basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
;;
*-commodore*)
basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
;;
*)
;;
@@ -1366,8 +1337,8 @@ esac
if [ x"$os" != x"" ]
then
case $os in
# First match some system type aliases
# that might get confused with valid system types.
# First match some system type aliases that might get confused
# with valid system types.
# -solaris* is a basic system type, with this one exception.
-auroraux)
os=-auroraux
@@ -1378,18 +1349,19 @@ case $os in
-solaris)
os=-solaris2
;;
-svr4*)
os=-sysv4
;;
-unixware*)
os=-sysv4.2uw
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
# First accept the basic system types.
# es1800 is here to avoid being matched by es* (a different OS)
-es1800*)
os=-ose
;;
# Now accept the basic system types.
# The portable systems comes first.
# Each alternative MUST END IN A *, to match a version number.
# Each alternative MUST end in a * to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1399,25 +1371,26 @@ case $os in
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -morphos* | -superux* | -rtmk* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
| -midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1434,12 +1407,12 @@ case $os in
-nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-sim | -xray | -os68k* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
os=`echo "$os" | sed -e 's|mac|macos|'`
;;
-linux-dietlibc)
os=-linux-dietlibc
@@ -1448,10 +1421,10 @@ case $os in
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`
os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
-sunos6*)
os=`echo $os | sed -e 's|sunos6|solaris3|'`
os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
-opened*)
os=-openedition
@@ -1462,12 +1435,6 @@ case $os in
-wince*)
os=-wince
;;
-osfrose*)
os=-osfrose
;;
-osf*)
os=-osf
;;
-utek*)
os=-bsd
;;
@@ -1492,7 +1459,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
-ns2 )
-ns2)
os=-nextstep2
;;
-nsk*)
@@ -1514,7 +1481,7 @@ case $os in
-oss*)
os=-sysv3
;;