Version in base suite: 5.2.13-0+deb13u1
Base version: pdns-recursor_5.2.13-0+deb13u1
Target version: pdns-recursor_5.4.9-1~deb13u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/pdns-recursor/pdns-recursor_5.2.13-0+deb13u1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/p/pdns-recursor/pdns-recursor_5.4.9-1~deb13u1.dsc
COPYING | 9
Makefile.am | 70
Makefile.in | 746
RECURSOR-MIB.in | 6
RECURSOR-MIB.txt | 80
aclocal.m4 | 473
aggressive_nsec.cc | 54
aggressive_nsec.hh | 5
arguments.cc | 21
auth-catalogzone.hh | 13
axfr-retriever.cc | 35
axfr-retriever.hh | 4
base64.cc | 72
base64.hh | 5
build-aux/compile | 11
build-aux/config.guess | 112
build-aux/config.sub | 251
build-aux/depcomp | 15
build-aux/gen-version | 77
build-aux/install-sh | 14
build-aux/missing | 75
build-aux/test-driver | 15
builder-support/gen-version | 4
burtle.hh | 6
cachecleaner.hh | 2
channel.hh | 26
comment.hh | 7
config.h.in | 108
configure | 4328 +-
configure.ac | 14
credentials.cc | 65
credentials.hh | 15
debian/.gitlab-ci.yml | 1
debian/changelog | 184
debian/control | 28
debian/copyright | 8
debian/gbp.conf | 4
debian/patches/0002-Relax-cargo-dependencies-for-trixie.patch | 30
debian/patches/series | 1
debian/patches/testrunner-log-verbosity | 4
debian/pdns-recursor.conffiles | 1
debian/pdns-recursor.lintian-overrides | 4
debian/pdns-recursor.postinst | 7
debian/pdns-recursor.preinst | 29
debian/pdns-recursor.sysusers | 1
debian/rules | 46
debian/source/lintian-overrides | 4
debian/watch | 8
dns.cc | 69
dns.hh | 68
dns_random.hh | 5
dnsbackend.hh | 197
dnslabeltext.cc | 109
dnslabeltext.rl | 5
dnsmessage.proto | 6
dnsname.cc | 378
dnsname.hh | 282
dnspacket.hh | 10
dnsparser.cc | 212
dnsparser.hh | 136
dnsrecords.cc | 63
dnsrecords.hh | 339
dnssec.hh | 189
dnssecinfra.cc | 51
dnssecinfra.hh | 2
dnsseckeeper.hh | 314
dnstap.cc | 15
dnstap.hh | 10
dnstap.proto | 23
dnswriter.cc | 49
dnswriter.hh | 13
dolog.hh | 47
ednscookies.cc | 119
ednscookies.hh | 32
ednsextendederror.hh | 2
ednsoptions.cc | 84
ednsoptions.hh | 7
ednssubnet.cc | 57
ednssubnet.hh | 45
effective_tld_names.dat |16409 ---------
ext/Makefile.am | 1
ext/Makefile.in | 20
ext/arc4random/Makefile.am | 3
ext/arc4random/Makefile.in | 36
ext/arc4random/meson.build | 20
ext/json11/Makefile.am | 4
ext/json11/Makefile.in | 37
ext/json11/json11.cpp | 54
ext/json11/json11.hpp | 6
ext/json11/meson.build | 12
ext/luawrapper/include/LuaContext.hpp | 179
ext/luawrapper/meson.build | 3
ext/probds/Makefile.in | 33
ext/probds/meson.build | 12
ext/protozero/CHANGELOG.md | 449
ext/protozero/LICENSE.from_folly | 177
ext/protozero/LICENSE.md | 26
ext/protozero/include/protozero/basic_pbf_builder.hpp | 4
ext/protozero/include/protozero/basic_pbf_writer.hpp | 56
ext/protozero/include/protozero/buffer_string.hpp | 4
ext/protozero/include/protozero/config.hpp | 11
ext/protozero/include/protozero/data_view.hpp | 4
ext/protozero/include/protozero/pbf_message.hpp | 2
ext/protozero/include/protozero/pbf_reader.hpp | 8
ext/protozero/include/protozero/types.hpp | 2
ext/protozero/include/protozero/varint.hpp | 47
ext/protozero/include/protozero/version.hpp | 6
ext/protozero/meson.build | 3
ext/yahttp/Makefile.am | 5
ext/yahttp/Makefile.in | 25
ext/yahttp/meson.build | 3
ext/yahttp/yahttp/Makefile.am | 3
ext/yahttp/yahttp/Makefile.in | 36
ext/yahttp/yahttp/meson.build | 26
ext/yahttp/yahttp/reqresp.cpp | 36
ext/yahttp/yahttp/reqresp.hpp | 16
ext/yahttp/yahttp/router.cpp | 8
filterpo.cc | 4
filterpo.hh | 2
fstrm_logger.cc | 4
fstrm_logger.hh | 2
html/index.html | 2
html/js/handlebars-v4.0.11-min.js | 284
html/js/handlebars-v4.0.11.js | 4840 --
html/js/handlebars-v4.7.8-min.js | 29
html/js/handlebars-v4.7.8.js | 5972 +++
html/js/moment.js | 737
html/js/moment.min.js | 2
html/js/rickshaw.js | 703
html/js/rickshaw.min.js | 6
iputils.cc | 30
iputils.hh | 206
libssl.cc | 292
libssl.hh | 24
lock.hh | 8
logger.cc | 19
logger.hh | 17
logging.cc | 50
logging.hh | 60
logr.hh | 42
lua-base4.cc | 36
lua-base4.hh | 4
lua-recursor4.cc | 142
lua-recursor4.hh | 30
lwres.cc | 441
lwres.hh | 20
m4/ax_cxx_compile_stdcxx.m4 | 92
m4/ax_cxx_compile_stdcxx_20.m4 | 4
m4/pdns_check_curl.m4 | 4
m4/pdns_check_libcrypto.m4 | 2
m4/pdns_check_libcrypto_ecdsa.m4 | 4
m4/pdns_check_libcrypto_eddsa.m4 | 4
m4/pdns_enable_p11kit.m4 | 21
m4/pdns_with_gnutls.m4 | 34
m4/pdns_with_lua.m4 | 50
malloctrace.cc | 6
malloctrace.hh | 2
meson-dist-script.sh | 72
meson.build | 821
meson/atomics/atomic_add_fetch.cc | 8
meson/atomics/meson.build | 23
meson/auto-var-init/meson.build | 13
meson/boost-context/meson.build | 2
meson/boost-filesystem/meson.build | 2
meson/boost-program-options/meson.build | 2
meson/boost-serialization/meson.build | 7
meson/boost-test/meson.build | 5
meson/boost/meson.build | 5
meson/cdb/meson.build | 21
meson/clock-gettime/meson.build | 15
meson/code-coverage/meson.build | 31
meson/compiler-setup/meson.build | 22
meson/config/meson.build | 2
meson/cxx-fs/cxx-fs.cc | 8
meson/cxx-fs/meson.build | 36
meson/dlopen/meson.build | 15
meson/dnstap/meson.build | 16
meson/dot/meson.build | 8
meson/geoip/meson.build | 14
meson/gnutls/meson.build | 19
meson/gss-tsig/meson.build | 21
meson/hardening/control-flow/meson.build | 10
meson/hardening/fortify-source/meson.build | 37
meson/hardening/meson.build | 34
meson/hardening/relro/meson.build | 16
meson/hardening/stack-clash-prot/meson.build | 10
meson/hardening/stack-prot/meson.build | 8
meson/hardening/stack-smashing-prot/meson.build | 10
meson/ipcipher/meson.build | 9
meson/ldap/meson.build | 68
meson/libcap/meson.build | 5
meson/libcrypto/bn_new.cc | 7
meson/libcrypto/ecdsa/meson.build | 33
meson/libcrypto/eddsa/meson.build | 24
meson/libcrypto/meson.build | 118
meson/libcurl/meson.build | 4
meson/libdir/meson.build | 1
meson/libresolv/meson.build | 22
meson/libsnmp/meson.build | 40
meson/libsodium/meson.build | 21
meson/libssl-engines/meson.build | 5
meson/libssl/meson.build | 48
meson/libsystemd/meson.build | 14
meson/lmdb/meson.build | 11
meson/lua-records/meson.build | 32
meson/lua/meson.build | 54
meson/malloc-trace/meson.build | 2
meson/mmap/meson.build | 7
meson/mmdb/meson.build | 14
meson/mysql/meson.build | 36
meson/net-libs/meson.build | 44
meson/nod/meson.build | 22
meson/odbc/meson.build | 30
meson/pgsql/meson.build | 44
meson/pkcs11/meson.build | 15
meson/pkcs11/p11_kit_module_for_name.cc | 7
meson/platform/meson.build | 64
meson/prog-curl/meson.build | 3
meson/pthread-headers/meson.build | 18
meson/pthread-np/meson.build | 13
meson/pthread-setname/meson.build | 57
meson/pthread-setname/pthread_set_name_np_2args.cc | 9
meson/pthread-setname/pthread_set_name_np_void_2args.cc | 10
meson/pthread-setname/pthread_setname_np_1arg.cc | 9
meson/pthread-setname/pthread_setname_np_2args.cc | 10
meson/pthread-setname/pthread_setname_np_3args.cc | 9
meson/reproducible/meson.build | 48
meson/requirements.in | 9
meson/requirements.txt | 225
meson/sanitizers/address-sanitizer-fiber-switching/meson.build | 44
meson/sanitizers/address-sanitizer-fiber-switching/sanitizer_finish_switch_fiber_1ptr.cc | 7
meson/sanitizers/address-sanitizer-fiber-switching/sanitizer_finish_switch_fiber_3ptrs.cc | 7
meson/sanitizers/meson.build | 25
meson/socket-dir/meson.build | 2
meson/sqlite3/meson.build | 13
meson/strerror/meson.build | 13
meson/strerror/strerror_r.c | 8
meson/summary/meson.build | 5
meson/sysconfdir/meson.build | 1
meson/systemd/meson.build | 60
meson/timet-sign/meson.build | 10
meson/timet-sign/timet_sign.cc | 8
meson/timet-size/meson.build | 9
meson/tm-gmtoff/meson.build | 8
meson/various-functions/meson.build | 21
meson/various-headers/meson.build | 5
meson/verbose-logging/meson.build | 2
meson/version/meson.build | 2
meson/yaml-cpp/meson.build | 21
meson/zeromq/meson.build | 17
meson_options.txt | 27
metrics.py | 5
metrics_table.py | 116
minicurl.cc | 8
minicurl.hh | 5
misc.cc | 322
misc.hh | 172
mkpubsuffixcc | 22
mplexer.hh | 13
mtasker.hh | 12
mtasker_context.cc | 14
namespaces.hh | 1
negcache.cc | 79
negcache.hh | 40
nod.cc | 24
nod.hh | 5
noinitvector.hh | 1
nsecrecords.cc | 8
opensslsigners.cc | 68
packetcache.hh | 23
pdns-recursor.service.in | 1
pdns-recursor.service.meson.in | 53
pdns_recursor.1 | 7
pdns_recursor.cc | 792
pdnsexception.hh | 6
protozero-helpers.hh | 98
protozero-trace.cc | 605
protozero-trace.hh | 884
protozero.hh | 28
pubsuffix.cc |16553 +++++-----
pubsuffix.hh | 1
pubsuffixloader.cc | 89
qtype.cc | 25
qtype.hh | 14
ratelimitedlog.hh | 22
rcpgenerator.cc | 304
rcpgenerator.hh | 10
rec-carbon.cc | 21
rec-cookiestore.cc | 57
rec-cookiestore.hh | 104
rec-eventtrace.cc | 115
rec-eventtrace.hh | 205
rec-lua-conf.cc | 285
rec-lua-conf.hh | 16
rec-main.cc | 800
rec-main.hh | 111
rec-metrics-gen.h | 282
rec-nsspeeds.cc | 229
rec-nsspeeds.hh | 172
rec-oids-gen.h | 174
rec-prometheus-gen.h | 200
rec-protozero.hh | 2
rec-responsestats.cc | 55
rec-responsestats.hh | 11
rec-rust-lib/Makefile.am | 33
rec-rust-lib/Makefile.in | 615
rec-rust-lib/README.md | 227
rec-rust-lib/cxxsettings-private.hh | 97
rec-rust-lib/cxxsettings.hh | 59
rec-rust-lib/cxxsupport.cc | 1549
rec-rust-lib/docs-new-preamble-in.rst | 683
rec-rust-lib/docs-old-preamble-in.rst | 41
rec-rust-lib/generate.py | 870
rec-rust-lib/meson.build | 36
rec-rust-lib/rust-bridge-in.rs | 460
rec-rust-lib/rust-preamble-in.rs | 51
rec-rust-lib/rust/Cargo.lock | 864
rec-rust-lib/rust/Cargo.toml | 38
rec-rust-lib/rust/Makefile.am | 32
rec-rust-lib/rust/Makefile.in | 610
rec-rust-lib/rust/build.rs | 13
rec-rust-lib/rust/build_recrust | 37
rec-rust-lib/rust/meson.build | 42
rec-rust-lib/rust/src/bridge.hh | 105
rec-rust-lib/rust/src/bridge.rs | 1457
rec-rust-lib/rust/src/helpers.rs | 82
rec-rust-lib/rust/src/lib.rs | 3921 ++
rec-rust-lib/rust/src/misc.rs | 69
rec-rust-lib/rust/src/web.rs | 1234
rec-rust-lib/table.py | 3678 ++
rec-snmp-gen.h | 174
rec-snmp.cc | 8
rec-system-resolve.cc | 34
rec-tcounters.cc | 2
rec-tcounters.hh | 57
rec-tcp.cc | 226
rec-tcpout.cc | 81
rec-tcpout.hh | 26
rec-web-stubs.hh | 38
rec-xfr.cc | 4
rec-zonetocache.cc | 8
rec_channel.cc | 182
rec_channel.hh | 36
rec_channel_rec.cc | 1666 -
rec_control.1 | 27
rec_control.cc | 60
recpacketcache.cc | 27
recpacketcache.hh | 22
recursor_cache.cc | 322
recursor_cache.hh | 88
reczones-helpers.cc | 23
reczones.cc | 124
remote_logger.cc | 39
resolve-context.hh | 8
resolver.cc | 12
rpzloader.cc | 130
rpzloader.hh | 4
sanitizer.hh | 51
secpoll-recursor.cc | 33
secpoll-recursor.hh | 4
settings/Makefile.am | 33
settings/Makefile.in | 604
settings/README.md | 227
settings/cxxsettings-generated.cc | 2208 -
settings/cxxsettings-private.hh | 97
settings/cxxsettings.hh | 59
settings/cxxsupport.cc | 1455
settings/docs-new-preamble-in.rst | 543
settings/docs-old-preamble-in.rst | 41
settings/generate.py | 842
settings/rust-bridge-in.rs | 398
settings/rust-preamble-in.rs | 48
settings/rust/Cargo.lock | 323
settings/rust/Cargo.toml | 21
settings/rust/Makefile.am | 20
settings/rust/Makefile.in | 587
settings/rust/build.rs | 7
settings/rust/src/bridge.hh | 30
settings/rust/src/bridge.rs | 1203
settings/rust/src/helpers.rs | 82
settings/rust/src/lib.rs | 3735 --
settings/table.py | 3636 --
sholder.hh | 11
shuffle.cc | 48
shuffle.hh | 1
sillyrecords.cc | 48
sodiumsigners.cc | 4
sstuff.hh | 40
svc-records.cc | 119
svc-records.hh | 104
syncres.cc | 501
syncres.hh | 64
taskqueue.cc | 4
tcounters.hh | 21
tcpiohandler.cc | 203
tcpiohandler.hh | 35
test-aggressive_nsec_cc.cc | 268
test-base64_cc.cc | 41
test-dns_random_hh.cc | 53
test-dnsname_cc.cc | 103
test-dnsrecordcontent.cc | 10
test-dnsrecords_cc.cc | 48
test-ednscookie_cc.cc | 116
test-ednsoptions_cc.cc | 97
test-filterpo_cc.cc | 18
test-iputils_hh.cc | 75
test-luawrapper.cc | 96
test-misc_hh.cc | 2
test-mtasker.cc | 4
test-packetcache_hh.cc | 40
test-protozero-trace.cc | 288
test-rcpgenerator_cc.cc | 211
test-rec-tcounters_cc.cc | 18
test-recpacketcache_cc.cc | 54
test-recursorcache_cc.cc | 366
test-reczones-helpers.cc | 19
test-rpzloader_cc.cc | 9
test-settings.cc | 31
test-shuffle_cc.cc | 58
test-signers.cc | 31
test-syncres_cc.cc | 73
test-syncres_cc.hh | 8
test-syncres_cc1.cc | 237
test-syncres_cc10.cc | 191
test-syncres_cc2.cc | 139
test-syncres_cc3.cc | 169
test-syncres_cc4.cc | 246
test-syncres_cc5.cc | 456
test-syncres_cc6.cc | 162
test-syncres_cc7.cc | 134
test-syncres_cc8.cc | 143
test-syncres_cc9.cc | 114
test-tsig.cc | 13
testrunner.cc | 6
threadname.cc | 4
ueberbackend.hh | 182
unix_utility.cc | 3
utility.hh | 1
validate-recursor.cc | 15
validate.cc | 179
validate.hh | 14
version.cc | 9
version.sh | 9
webserver.cc | 94
webserver.hh | 26
ws-api.cc | 98
ws-api.hh | 12
ws-recursor.cc | 431
ws-recursor.hh | 14
zonemd.cc | 16
zonemd.hh | 12
zoneparser-tng.cc | 38
zoneparser-tng.hh | 22
453 files changed, 54631 insertions(+), 56687 deletions(-)
dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmp8dst0qma/pdns-recursor_5.2.13-0+deb13u1.dsc: no acceptable signature found
dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmp8dst0qma/pdns-recursor_5.4.9-1~deb13u1.dsc: no acceptable signature found
diff -Nru pdns-recursor-5.2.13/COPYING pdns-recursor-5.4.9/COPYING
--- pdns-recursor-5.2.13/COPYING 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/COPYING 2026-10-26 09:46:36.000000000 +0000
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -303,9 +303,8 @@
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 this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -336,4 +335,4 @@
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
\ No newline at end of file
+Public License instead of this License.
diff -Nru pdns-recursor-5.2.13/Makefile.am pdns-recursor-5.4.9/Makefile.am
--- pdns-recursor-5.2.13/Makefile.am 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/Makefile.am 2026-10-26 08:26:51.000000000 +0000
@@ -1,16 +1,16 @@
JSON11_LIBS = $(top_builddir)/ext/json11/libjson11.la
PROBDS_LIBS = $(top_builddir)/ext/probds/libprobds.la
ARC4RANDOM_LIBS = $(top_builddir)/ext/arc4random/libarc4random.la
-RUST_LIBS = $(top_builddir)/settings/rust/libsettings.a $(LIBDL)
+RUST_LIBS = $(top_builddir)/rec-rust-lib/rust/librecrust.a $(LIBDL)
AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(LIBSODIUM_CFLAGS) $(NET_SNMP_CFLAGS) $(LIBCAP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
AM_CPPFLAGS += \
-I$(top_srcdir)/ext/json11 \
-I$(top_srcdir)/ext/protozero/include \
- -I$(top_srcdir)/settings \
- -I$(top_builddir)/settings \
- -I$(top_srcdir)/settings/rust/src \
+ -I$(top_srcdir)/rec-rust-lib \
+ -I$(top_builddir)/rec-rust-lib \
+ -I$(top_srcdir)/rec-rust-lib/rust/src \
$(YAHTTP_CFLAGS) \
$(LIBCRYPTO_INCLUDES) \
-DBOOST_CONTAINER_USE_STD_EXCEPTIONS
@@ -46,15 +46,15 @@
recursor.yml-dist
htmlfiles.h: incfiles ${srcdir}/html/* ${srcdir}/html/js/*
- $(AM_V_GEN)$(srcdir)/incfiles > $@.tmp
+ $(AM_V_GEN)$(srcdir)/incfiles ${srcdir} > $@.tmp
@mv $@.tmp $@
# Use patterns to avoid having two instances of generate run simultaneously, a well-known hack for GNU make
rec-metrics-gen%h rec-prometheus-gen%h rec-snmp-gen%h rec-oids-gen%h RECURSOR-MIB%txt: metrics.py metrics_table.py RECURSOR-MIB.in
- $(PYTHON) metrics.py
+ $(PYTHON) ${srcdir}/metrics.py ${srcdir} .
-# We explicitly build settings in two steps, as settings modifies files in the settings/rust subdir
-SUBDIRS=ext settings settings/rust
+# We explicitly build rec-rust-lib in two steps, as it modifies files in the rec-rust-lib/rust subdir
+SUBDIRS=ext rec-rust-lib rec-rust-lib/rust
if LUA
AM_CPPFLAGS +=$(LUA_CFLAGS)
@@ -67,7 +67,6 @@
dnslabeltext.cc \
dnslabeltext.rl \
dnsmessage.proto \
- effective_tld_names.dat \
epollmplexer.cc \
kqueuemplexer.cc \
lua_hpp.mk \
@@ -136,10 +135,11 @@
dnspacket.hh \
dnsparser.hh dnsparser.cc \
dnsrecords.cc dnsrecords.hh \
+ dnssec.hh \
dnssecinfra.hh dnssecinfra.cc \
- dnsseckeeper.hh \
dnswriter.cc dnswriter.hh \
dolog.hh \
+ ednscookies.cc ednscookies.hh \
ednsextendederror.cc ednsextendederror.hh \
ednsoptions.cc ednsoptions.hh \
ednspadding.cc ednspadding.hh \
@@ -174,6 +174,8 @@
pdns_recursor.cc \
pdnsexception.hh \
pollmplexer.cc \
+ protozero-helpers.hh \
+ protozero-trace.cc protozero-trace.hh \
protozero.cc protozero.hh \
proxy-protocol.cc proxy-protocol.hh \
pubsuffix.hh pubsuffix.cc \
@@ -183,11 +185,14 @@
ratelimitedlog.hh \
rcpgenerator.cc rcpgenerator.hh \
rec-carbon.cc \
+ rec-cookiestore.cc rec-cookiestore.hh \
rec-eventtrace.cc rec-eventtrace.hh \
rec-lua-conf.hh rec-lua-conf.cc \
rec-main.hh rec-main.cc \
+ rec-nsspeeds.cc rec-nsspeeds.hh \
rec-protozero.cc rec-protozero.hh \
rec-responsestats.hh rec-responsestats.cc \
+ rec-rust-lib/cxxsupport.cc \
rec-snmp.hh rec-snmp.cc \
rec-system-resolve.hh rec-system-resolve.cc \
rec-taskqueue.cc rec-taskqueue.hh \
@@ -209,9 +214,9 @@
root-addresses.hh \
root-dnssec.hh \
rpzloader.cc rpzloader.hh \
+ sanitizer.hh \
secpoll-recursor.cc secpoll-recursor.hh \
secpoll.cc secpoll.hh \
- settings/cxxsupport.cc \
sha.hh \
sholder.hh \
shuffle.cc shuffle.hh \
@@ -228,7 +233,6 @@
tcpiohandler.cc tcpiohandler.hh \
threadname.hh threadname.cc \
tsigverifier.cc tsigverifier.hh \
- ueberbackend.hh \
unix_utility.cc \
utility.hh \
uuid-utils.hh uuid-utils.cc \
@@ -242,7 +246,7 @@
zoneparser-tng.cc zoneparser-tng.hh
nodist_pdns_recursor_SOURCES = \
- settings/cxxsettings-generated.cc
+ rec-rust-lib/cxxsettings-generated.cc
if !HAVE_LUA_HPP
BUILT_SOURCES += lua.hpp
@@ -252,7 +256,6 @@
CLEANFILES += lua.hpp
pdns_recursor_LDADD = \
- $(YAHTTP_LIBS) \
$(JSON11_LIBS) \
$(LIBCRYPTO_LIBS) \
$(BOOST_CONTEXT_LIBS) \
@@ -296,8 +299,8 @@
dnsname.cc dnsname.hh \
dnsparser.hh dnsparser.cc \
dnsrecords.cc \
+ dnssec.hh \
dnssecinfra.cc \
- dnsseckeeper.hh \
dnswriter.cc dnswriter.hh \
ednscookies.cc ednscookies.hh \
ednsextendederror.cc ednsextendederror.hh \
@@ -319,15 +322,19 @@
opensslsigners.cc opensslsigners.hh \
pdnsexception.hh \
pollmplexer.cc \
+ protozero-trace.cc protozero-trace.hh \
qtype.cc qtype.hh \
query-local-address.hh query-local-address.cc \
ratelimitedlog.hh \
rcpgenerator.cc \
rec-eventtrace.cc rec-eventtrace.hh \
+ rec-nsspeeds.cc rec-nsspeeds.hh \
rec-responsestats.hh rec-responsestats.cc \
+ rec-rust-lib/cxxsupport.cc \
rec-system-resolve.hh rec-system-resolve.cc \
rec-taskqueue.cc rec-taskqueue.hh \
rec-tcounters.cc rec-tcounters.hh \
+ rec-web-stubs.hh \
rec-xfrtracker.cc \
rec-zonetocache.cc rec-zonetocache.hh \
recpacketcache.cc recpacketcache.hh \
@@ -337,8 +344,8 @@
root-dnssec.hh \
rpzloader.cc rpzloader.hh \
secpoll.cc \
- settings/cxxsupport.cc \
sholder.hh \
+ shuffle.cc shuffle.hh \
sillyrecords.cc \
sortlist.cc sortlist.hh \
sstuff.hh \
@@ -357,6 +364,7 @@
test-dnsparser_hh.cc \
test-dnsrecordcontent.cc \
test-dnsrecords_cc.cc \
+ test-ednscookie_cc.cc \
test-ednsoptions_cc.cc \
test-filterpo_cc.cc \
test-histogram_hh.cc \
@@ -368,6 +376,7 @@
test-mtasker.cc \
test-negcache_cc.cc \
test-packetcache_hh.cc \
+ test-protozero-trace.cc \
test-rcpgenerator_cc.cc \
test-rec-system-resolve.cc \
test-rec-taskqueue.cc \
@@ -380,6 +389,7 @@
test-secpoll_cc.cc \
test-settings.cc \
test-sholder_hh.cc \
+ test-shuffle_cc.cc \
test-signers.cc \
test-syncres_cc.cc \
test-syncres_cc.hh \
@@ -398,6 +408,7 @@
threadname.hh threadname.cc \
tsigverifier.cc tsigverifier.hh \
unix_utility.cc \
+ uuid-utils.hh uuid-utils.cc \
validate-recursor.cc validate-recursor.hh \
validate.cc validate.hh \
version.cc version.hh \
@@ -405,7 +416,7 @@
zoneparser-tng.cc zoneparser-tng.hh
nodist_testrunner_SOURCES = \
- settings/cxxsettings-generated.cc
+ rec-rust-lib/cxxsettings-generated.cc
testrunner_LDFLAGS = \
$(AM_LDFLAGS) \
@@ -538,36 +549,32 @@
qtype.cc \
rcpgenerator.cc rcpgenerator.hh \
rec-lua-conf.cc rec-lua-conf.hh \
+ rec-rust-lib/cxxsupport.cc \
rec-system-resolve.cc rec-system-resolve.hh \
+ rec-web-stubs.hh \
rec_channel.cc rec_channel.hh \
rec_control.cc \
- settings/cxxsupport.cc \
sillyrecords.cc \
sortlist.cc sortlist.hh \
svc-records.cc svc-records.hh \
threadname.cc threadname.hh \
- unix_utility.cc
+ unix_utility.cc \
+ uuid-utils.hh uuid-utils.cc
nodist_rec_control_SOURCES = \
- settings/cxxsettings-generated.cc
+ rec-rust-lib/cxxsettings-generated.cc
dnslabeltext.cc: dnslabeltext.rl
$(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
-curl_verbose = $(curl_verbose_$(V))
-curl_verbose_ = $(curl_verbose_$(AM_DEFAULT_VERBOSITY))
-curl_verbose_0 = @echo " CURL " $@;
-$(srcdir)/effective_tld_names.dat:
- $(curl_verbose)if ! curl -s -S https://publicsuffix.org/list/public_suffix_list.dat > $@; then rm -f $@; exit 1; fi
-
-pubsuffix.cc: $(srcdir)/effective_tld_names.dat
- $(srcdir)/mkpubsuffixcc $< $@
+pubsuffix.cc:
+ $(srcdir)/mkpubsuffixcc $@
## Config file
sysconf_DATA = recursor.yml-dist
recursor.yml-dist: pdns_recursor
- dir=$$(mktemp -d) && touch "$$dir/recursor.yml" && ./pdns_recursor --config-dir="$$dir" --config=default 2> /dev/null > $@ && rm "$$dir/recursor.yml" && rmdir "$$dir"
+ ./pdns_recursor --config=default 2> /dev/null > $@
## Manpages
MANPAGES=pdns_recursor.1 \
@@ -621,7 +628,7 @@
if HAVE_SYSTEMD
pdns-recursor.service: pdns-recursor.service.in
- $(AM_V_GEN)sed -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
+ $(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
if !HAVE_SYSTEMD_WITH_RUNTIME_DIR_ENV
if HAVE_SYSTEMD_PERCENT_T
$(AM_V_GEN)sed -e 's!/pdns_recursor!& --socket-dir=%t/pdns-recursor!' -i $@
@@ -697,7 +704,8 @@
-e 's!SyslogIdentifier=.*!&-%i!' \
< $< > $@
if HAVE_SYSTEMD_PERCENT_T
- $(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' -i $@
+ $(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' \
+ -e 's!--socket-dir=%t/pdns-recursor!--config-name=%i --socket-dir=%t/pdns-recursor-%i!' -i $@
if !HAVE_SYSTEMD_WITH_RUNTIME_DIR_ENV
$(AM_V_GEN)sed -e 's!--socket-dir=[^ ]\+!&-%i !' -i $@
endif
diff -Nru pdns-recursor-5.2.13/Makefile.in pdns-recursor-5.4.9/Makefile.in
--- pdns-recursor-5.2.13/Makefile.in 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/Makefile.in 2026-10-26 09:47:08.789333600 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -71,6 +71,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -244,56 +246,58 @@
coverage.cc coverage.hh credentials.cc credentials.hh dns.hh \
dns.cc dns_random.hh dnsbackend.hh dnslabeltext.cc dnsname.cc \
dnsname.hh dnspacket.hh dnsparser.hh dnsparser.cc \
- dnsrecords.cc dnsrecords.hh dnssecinfra.hh dnssecinfra.cc \
- dnsseckeeper.hh dnswriter.cc dnswriter.hh dolog.hh \
- ednsextendederror.cc ednsextendederror.hh ednsoptions.cc \
- ednsoptions.hh ednspadding.cc ednspadding.hh ednssubnet.cc \
- ednssubnet.hh filterpo.cc filterpo.hh fstrm_logger.cc \
- fstrm_logger.hh gettime.cc gettime.hh gss_context.cc \
- gss_context.hh histogram.hh iputils.hh iputils.cc ixfr.cc \
- ixfr.hh json.cc json.hh lazy_allocator.hh libssl.cc libssl.hh \
- lock.hh logger.hh logger.cc logging.hh logging.cc logr.hh \
- lua-base4.cc lua-base4.hh lua-recursor4-ffi.hh \
- lua-recursor4.cc lua-recursor4.hh lwres.cc lwres.hh misc.hh \
- misc.cc mplexer.hh mtasker.hh mtasker_context.cc \
- mtasker_context.hh namespaces.hh negcache.hh negcache.cc \
- noinitvector.hh nsecrecords.cc opensslsigners.cc \
- opensslsigners.hh packetcache.hh pdns_recursor.cc \
- pdnsexception.hh pollmplexer.cc protozero.cc protozero.hh \
- proxy-protocol.cc proxy-protocol.hh pubsuffix.hh pubsuffix.cc \
- pubsuffixloader.cc qtype.hh qtype.cc query-local-address.hh \
- query-local-address.cc ratelimitedlog.hh rcpgenerator.cc \
- rcpgenerator.hh rec-carbon.cc rec-eventtrace.cc \
- rec-eventtrace.hh rec-lua-conf.hh rec-lua-conf.cc rec-main.hh \
- rec-main.cc rec-protozero.cc rec-protozero.hh \
- rec-responsestats.hh rec-responsestats.cc rec-snmp.hh \
- rec-snmp.cc rec-system-resolve.hh rec-system-resolve.cc \
- rec-taskqueue.cc rec-taskqueue.hh rec-tcounters.cc \
- rec-tcounters.hh rec-tcp.cc rec-tcpout.cc rec-tcpout.hh \
- rec-xfr.cc rec-xfr.hh rec-xfrtracker.cc rec-zonetocache.cc \
- rec-zonetocache.hh rec_channel.cc rec_channel.hh \
- rec_metrics.hh rec_channel_rec.cc recpacketcache.cc \
- recpacketcache.hh recursor_cache.cc recursor_cache.hh \
- reczones-helpers.cc reczones-helpers.hh reczones.cc \
- remote_logger.cc remote_logger.hh resolve-context.hh \
- resolver.hh resolver.cc root-addresses.hh root-dnssec.hh \
- rpzloader.cc rpzloader.hh secpoll-recursor.cc \
- secpoll-recursor.hh secpoll.cc secpoll.hh \
- settings/cxxsupport.cc sha.hh sholder.hh shuffle.cc shuffle.hh \
+ dnsrecords.cc dnsrecords.hh dnssec.hh dnssecinfra.hh \
+ dnssecinfra.cc dnswriter.cc dnswriter.hh dolog.hh \
+ ednscookies.cc ednscookies.hh ednsextendederror.cc \
+ ednsextendederror.hh ednsoptions.cc ednsoptions.hh \
+ ednspadding.cc ednspadding.hh ednssubnet.cc ednssubnet.hh \
+ filterpo.cc filterpo.hh fstrm_logger.cc fstrm_logger.hh \
+ gettime.cc gettime.hh gss_context.cc gss_context.hh \
+ histogram.hh iputils.hh iputils.cc ixfr.cc ixfr.hh json.cc \
+ json.hh lazy_allocator.hh libssl.cc libssl.hh lock.hh \
+ logger.hh logger.cc logging.hh logging.cc logr.hh lua-base4.cc \
+ lua-base4.hh lua-recursor4-ffi.hh lua-recursor4.cc \
+ lua-recursor4.hh lwres.cc lwres.hh misc.hh misc.cc mplexer.hh \
+ mtasker.hh mtasker_context.cc mtasker_context.hh namespaces.hh \
+ negcache.hh negcache.cc noinitvector.hh nsecrecords.cc \
+ opensslsigners.cc opensslsigners.hh packetcache.hh \
+ pdns_recursor.cc pdnsexception.hh pollmplexer.cc \
+ protozero-helpers.hh protozero-trace.cc protozero-trace.hh \
+ protozero.cc protozero.hh proxy-protocol.cc proxy-protocol.hh \
+ pubsuffix.hh pubsuffix.cc pubsuffixloader.cc qtype.hh qtype.cc \
+ query-local-address.hh query-local-address.cc \
+ ratelimitedlog.hh rcpgenerator.cc rcpgenerator.hh \
+ rec-carbon.cc rec-cookiestore.cc rec-cookiestore.hh \
+ rec-eventtrace.cc rec-eventtrace.hh rec-lua-conf.hh \
+ rec-lua-conf.cc rec-main.hh rec-main.cc rec-nsspeeds.cc \
+ rec-nsspeeds.hh rec-protozero.cc rec-protozero.hh \
+ rec-responsestats.hh rec-responsestats.cc \
+ rec-rust-lib/cxxsupport.cc rec-snmp.hh rec-snmp.cc \
+ rec-system-resolve.hh rec-system-resolve.cc rec-taskqueue.cc \
+ rec-taskqueue.hh rec-tcounters.cc rec-tcounters.hh rec-tcp.cc \
+ rec-tcpout.cc rec-tcpout.hh rec-xfr.cc rec-xfr.hh \
+ rec-xfrtracker.cc rec-zonetocache.cc rec-zonetocache.hh \
+ rec_channel.cc rec_channel.hh rec_metrics.hh \
+ rec_channel_rec.cc recpacketcache.cc recpacketcache.hh \
+ recursor_cache.cc recursor_cache.hh reczones-helpers.cc \
+ reczones-helpers.hh reczones.cc remote_logger.cc \
+ remote_logger.hh resolve-context.hh resolver.hh resolver.cc \
+ root-addresses.hh root-dnssec.hh rpzloader.cc rpzloader.hh \
+ sanitizer.hh secpoll-recursor.cc secpoll-recursor.hh \
+ secpoll.cc secpoll.hh sha.hh sholder.hh shuffle.cc shuffle.hh \
sillyrecords.cc snmp-agent.hh snmp-agent.cc sortlist.cc \
sortlist.hh sstuff.hh stable-bloom.hh stat_t.hh svc-records.cc \
svc-records.hh syncres.cc syncres.hh taskqueue.cc taskqueue.hh \
tcounters.hh tcpiohandler.cc tcpiohandler.hh threadname.hh \
- threadname.cc tsigverifier.cc tsigverifier.hh ueberbackend.hh \
- unix_utility.cc utility.hh uuid-utils.hh uuid-utils.cc \
- validate.cc validate.hh validate-recursor.cc \
- validate-recursor.hh version.cc version.hh views.hh \
- webserver.cc webserver.hh ws-api.cc ws-api.hh ws-recursor.cc \
- ws-recursor.hh zonemd.cc zonemd.hh zoneparser-tng.cc \
- zoneparser-tng.hh nod.hh nod.cc sodiumsigners.cc \
- malloctrace.cc malloctrace.hh kqueuemplexer.cc epollmplexer.cc \
- devpollmplexer.cc portsmplexer.cc dnstap.cc dnstap.hh \
- minicurl.cc minicurl.hh
+ threadname.cc tsigverifier.cc tsigverifier.hh unix_utility.cc \
+ utility.hh uuid-utils.hh uuid-utils.cc validate.cc validate.hh \
+ validate-recursor.cc validate-recursor.hh version.cc \
+ version.hh views.hh webserver.cc webserver.hh ws-api.cc \
+ ws-api.hh ws-recursor.cc ws-recursor.hh zonemd.cc zonemd.hh \
+ zoneparser-tng.cc zoneparser-tng.hh nod.hh nod.cc \
+ sodiumsigners.cc malloctrace.cc malloctrace.hh \
+ kqueuemplexer.cc epollmplexer.cc devpollmplexer.cc \
+ portsmplexer.cc dnstap.cc dnstap.hh minicurl.cc minicurl.hh
am__dirstamp = $(am__leading_dot)dirstamp
@NOD_ENABLED_TRUE@am__objects_1 = nod.$(OBJEXT)
@LIBSODIUM_TRUE@am__objects_2 = sodiumsigners.$(OBJEXT)
@@ -312,36 +316,38 @@
coverage.$(OBJEXT) credentials.$(OBJEXT) dns.$(OBJEXT) \
dnslabeltext.$(OBJEXT) dnsname.$(OBJEXT) dnsparser.$(OBJEXT) \
dnsrecords.$(OBJEXT) dnssecinfra.$(OBJEXT) dnswriter.$(OBJEXT) \
- ednsextendederror.$(OBJEXT) ednsoptions.$(OBJEXT) \
- ednspadding.$(OBJEXT) ednssubnet.$(OBJEXT) filterpo.$(OBJEXT) \
- fstrm_logger.$(OBJEXT) gettime.$(OBJEXT) gss_context.$(OBJEXT) \
- iputils.$(OBJEXT) ixfr.$(OBJEXT) json.$(OBJEXT) \
- libssl.$(OBJEXT) logger.$(OBJEXT) logging.$(OBJEXT) \
- lua-base4.$(OBJEXT) lua-recursor4.$(OBJEXT) lwres.$(OBJEXT) \
- misc.$(OBJEXT) mtasker_context.$(OBJEXT) negcache.$(OBJEXT) \
+ ednscookies.$(OBJEXT) ednsextendederror.$(OBJEXT) \
+ ednsoptions.$(OBJEXT) ednspadding.$(OBJEXT) \
+ ednssubnet.$(OBJEXT) filterpo.$(OBJEXT) fstrm_logger.$(OBJEXT) \
+ gettime.$(OBJEXT) gss_context.$(OBJEXT) iputils.$(OBJEXT) \
+ ixfr.$(OBJEXT) json.$(OBJEXT) libssl.$(OBJEXT) \
+ logger.$(OBJEXT) logging.$(OBJEXT) lua-base4.$(OBJEXT) \
+ lua-recursor4.$(OBJEXT) lwres.$(OBJEXT) misc.$(OBJEXT) \
+ mtasker_context.$(OBJEXT) negcache.$(OBJEXT) \
nsecrecords.$(OBJEXT) opensslsigners.$(OBJEXT) \
pdns_recursor.$(OBJEXT) pollmplexer.$(OBJEXT) \
- protozero.$(OBJEXT) proxy-protocol.$(OBJEXT) \
- pubsuffix.$(OBJEXT) pubsuffixloader.$(OBJEXT) qtype.$(OBJEXT) \
+ protozero-trace.$(OBJEXT) protozero.$(OBJEXT) \
+ proxy-protocol.$(OBJEXT) pubsuffix.$(OBJEXT) \
+ pubsuffixloader.$(OBJEXT) qtype.$(OBJEXT) \
query-local-address.$(OBJEXT) rcpgenerator.$(OBJEXT) \
- rec-carbon.$(OBJEXT) rec-eventtrace.$(OBJEXT) \
- rec-lua-conf.$(OBJEXT) rec-main.$(OBJEXT) \
+ rec-carbon.$(OBJEXT) rec-cookiestore.$(OBJEXT) \
+ rec-eventtrace.$(OBJEXT) rec-lua-conf.$(OBJEXT) \
+ rec-main.$(OBJEXT) rec-nsspeeds.$(OBJEXT) \
rec-protozero.$(OBJEXT) rec-responsestats.$(OBJEXT) \
- rec-snmp.$(OBJEXT) rec-system-resolve.$(OBJEXT) \
- rec-taskqueue.$(OBJEXT) rec-tcounters.$(OBJEXT) \
- rec-tcp.$(OBJEXT) rec-tcpout.$(OBJEXT) rec-xfr.$(OBJEXT) \
- rec-xfrtracker.$(OBJEXT) rec-zonetocache.$(OBJEXT) \
- rec_channel.$(OBJEXT) rec_channel_rec.$(OBJEXT) \
- recpacketcache.$(OBJEXT) recursor_cache.$(OBJEXT) \
- reczones-helpers.$(OBJEXT) reczones.$(OBJEXT) \
- remote_logger.$(OBJEXT) resolver.$(OBJEXT) rpzloader.$(OBJEXT) \
- secpoll-recursor.$(OBJEXT) secpoll.$(OBJEXT) \
- settings/cxxsupport.$(OBJEXT) shuffle.$(OBJEXT) \
- sillyrecords.$(OBJEXT) snmp-agent.$(OBJEXT) sortlist.$(OBJEXT) \
- svc-records.$(OBJEXT) syncres.$(OBJEXT) taskqueue.$(OBJEXT) \
- tcpiohandler.$(OBJEXT) threadname.$(OBJEXT) \
- tsigverifier.$(OBJEXT) unix_utility.$(OBJEXT) \
- uuid-utils.$(OBJEXT) validate.$(OBJEXT) \
+ rec-rust-lib/cxxsupport.$(OBJEXT) rec-snmp.$(OBJEXT) \
+ rec-system-resolve.$(OBJEXT) rec-taskqueue.$(OBJEXT) \
+ rec-tcounters.$(OBJEXT) rec-tcp.$(OBJEXT) rec-tcpout.$(OBJEXT) \
+ rec-xfr.$(OBJEXT) rec-xfrtracker.$(OBJEXT) \
+ rec-zonetocache.$(OBJEXT) rec_channel.$(OBJEXT) \
+ rec_channel_rec.$(OBJEXT) recpacketcache.$(OBJEXT) \
+ recursor_cache.$(OBJEXT) reczones-helpers.$(OBJEXT) \
+ reczones.$(OBJEXT) remote_logger.$(OBJEXT) resolver.$(OBJEXT) \
+ rpzloader.$(OBJEXT) secpoll-recursor.$(OBJEXT) \
+ secpoll.$(OBJEXT) shuffle.$(OBJEXT) sillyrecords.$(OBJEXT) \
+ snmp-agent.$(OBJEXT) sortlist.$(OBJEXT) svc-records.$(OBJEXT) \
+ syncres.$(OBJEXT) taskqueue.$(OBJEXT) tcpiohandler.$(OBJEXT) \
+ threadname.$(OBJEXT) tsigverifier.$(OBJEXT) \
+ unix_utility.$(OBJEXT) uuid-utils.$(OBJEXT) validate.$(OBJEXT) \
validate-recursor.$(OBJEXT) version.$(OBJEXT) \
webserver.$(OBJEXT) ws-api.$(OBJEXT) ws-recursor.$(OBJEXT) \
zonemd.$(OBJEXT) zoneparser-tng.$(OBJEXT) $(am__objects_1) \
@@ -350,11 +356,11 @@
$(am__objects_8) $(am__objects_9) $(am__objects_10)
am__objects_11 =
nodist_pdns_recursor_OBJECTS = \
- settings/cxxsettings-generated.$(OBJEXT) $(am__objects_11)
+ rec-rust-lib/cxxsettings-generated.$(OBJEXT) $(am__objects_11)
pdns_recursor_OBJECTS = $(am_pdns_recursor_OBJECTS) \
$(nodist_pdns_recursor_OBJECTS)
am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(top_builddir)/settings/rust/libsettings.a \
+am__DEPENDENCIES_2 = $(top_builddir)/rec-rust-lib/rust/librecrust.a \
$(am__DEPENDENCIES_1)
@NOD_ENABLED_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
@LIBSODIUM_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
@@ -362,14 +368,14 @@
@FSTRM_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
@HAVE_DNS_OVER_TLS_TRUE@@HAVE_LIBSSL_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
@HAVE_LIBCURL_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
-pdns_recursor_DEPENDENCIES = $(am__DEPENDENCIES_1) $(JSON11_LIBS) \
+pdns_recursor_DEPENDENCIES = $(JSON11_LIBS) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(PROBDS_LIBS) \
- $(am__DEPENDENCIES_1) $(ARC4RANDOM_LIBS) $(am__DEPENDENCIES_2) \
- $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
- $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
- $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(PROBDS_LIBS) $(am__DEPENDENCIES_1) \
+ $(ARC4RANDOM_LIBS) $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
+ $(am__DEPENDENCIES_8)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -385,12 +391,13 @@
logger.$(OBJEXT) logging.$(OBJEXT) lua-base4.$(OBJEXT) \
misc.$(OBJEXT) nsecrecords.$(OBJEXT) qtype.$(OBJEXT) \
rcpgenerator.$(OBJEXT) rec-lua-conf.$(OBJEXT) \
- rec-system-resolve.$(OBJEXT) rec_channel.$(OBJEXT) \
- rec_control.$(OBJEXT) settings/cxxsupport.$(OBJEXT) \
+ rec-rust-lib/cxxsupport.$(OBJEXT) rec-system-resolve.$(OBJEXT) \
+ rec_channel.$(OBJEXT) rec_control.$(OBJEXT) \
sillyrecords.$(OBJEXT) sortlist.$(OBJEXT) \
svc-records.$(OBJEXT) threadname.$(OBJEXT) \
- unix_utility.$(OBJEXT)
-nodist_rec_control_OBJECTS = settings/cxxsettings-generated.$(OBJEXT)
+ unix_utility.$(OBJEXT) uuid-utils.$(OBJEXT)
+nodist_rec_control_OBJECTS = \
+ rec-rust-lib/cxxsettings-generated.$(OBJEXT)
rec_control_OBJECTS = $(am_rec_control_OBJECTS) \
$(nodist_rec_control_OBJECTS)
rec_control_DEPENDENCIES = $(am__DEPENDENCIES_1) $(ARC4RANDOM_LIBS) \
@@ -404,7 +411,7 @@
base64.cc base64.hh circular_buffer.hh credentials.cc \
credentials.hh dns.cc dns.hh dns_random.hh dnslabeltext.cc \
dnsname.cc dnsname.hh dnsparser.hh dnsparser.cc dnsrecords.cc \
- dnssecinfra.cc dnsseckeeper.hh dnswriter.cc dnswriter.hh \
+ dnssec.hh dnssecinfra.cc dnswriter.cc dnswriter.hh \
ednscookies.cc ednscookies.hh ednsextendederror.cc \
ednsextendederror.hh ednsoptions.cc ednsoptions.hh \
ednspadding.cc ednspadding.hh ednssubnet.cc ednssubnet.hh \
@@ -413,17 +420,19 @@
logger.hh logging.hh logging.cc logr.hh misc.cc misc.hh \
mtasker_context.cc namespaces.hh negcache.hh negcache.cc \
nsecrecords.cc opensslsigners.cc opensslsigners.hh \
- pdnsexception.hh pollmplexer.cc qtype.cc qtype.hh \
- query-local-address.hh query-local-address.cc \
- ratelimitedlog.hh rcpgenerator.cc rec-eventtrace.cc \
- rec-eventtrace.hh rec-responsestats.hh rec-responsestats.cc \
- rec-system-resolve.hh rec-system-resolve.cc rec-taskqueue.cc \
- rec-taskqueue.hh rec-tcounters.cc rec-tcounters.hh \
+ pdnsexception.hh pollmplexer.cc protozero-trace.cc \
+ protozero-trace.hh qtype.cc qtype.hh query-local-address.hh \
+ query-local-address.cc ratelimitedlog.hh rcpgenerator.cc \
+ rec-eventtrace.cc rec-eventtrace.hh rec-nsspeeds.cc \
+ rec-nsspeeds.hh rec-responsestats.hh rec-responsestats.cc \
+ rec-rust-lib/cxxsupport.cc rec-system-resolve.hh \
+ rec-system-resolve.cc rec-taskqueue.cc rec-taskqueue.hh \
+ rec-tcounters.cc rec-tcounters.hh rec-web-stubs.hh \
rec-xfrtracker.cc rec-zonetocache.cc rec-zonetocache.hh \
recpacketcache.cc recpacketcache.hh recursor_cache.cc \
recursor_cache.hh reczones-helpers.cc reczones-helpers.hh \
resolver.hh resolver.cc root-dnssec.hh rpzloader.cc \
- rpzloader.hh secpoll.cc settings/cxxsupport.cc sholder.hh \
+ rpzloader.hh secpoll.cc sholder.hh shuffle.cc shuffle.hh \
sillyrecords.cc sortlist.cc sortlist.hh sstuff.hh \
stable-bloom.hh svc-records.cc svc-records.hh syncres.cc \
syncres.hh taskqueue.cc taskqueue.hh \
@@ -432,27 +441,29 @@
test-credentials_cc.cc test-dns_random_hh.cc \
test-dnsname_cc.cc test-dnsparser_hh.cc \
test-dnsrecordcontent.cc test-dnsrecords_cc.cc \
- test-ednsoptions_cc.cc test-filterpo_cc.cc \
- test-histogram_hh.cc test-iputils_hh.cc test-ixfr_cc.cc \
- test-luawrapper.cc test-misc_hh.cc test-mplexer.cc \
- test-mtasker.cc test-negcache_cc.cc test-packetcache_hh.cc \
+ test-ednscookie_cc.cc test-ednsoptions_cc.cc \
+ test-filterpo_cc.cc test-histogram_hh.cc test-iputils_hh.cc \
+ test-ixfr_cc.cc test-luawrapper.cc test-misc_hh.cc \
+ test-mplexer.cc test-mtasker.cc test-negcache_cc.cc \
+ test-packetcache_hh.cc test-protozero-trace.cc \
test-rcpgenerator_cc.cc test-rec-system-resolve.cc \
test-rec-taskqueue.cc test-rec-tcounters_cc.cc \
test-rec-zonetocache.cc test-recpacketcache_cc.cc \
test-recursorcache_cc.cc test-reczones-helpers.cc \
test-rpzloader_cc.cc test-secpoll_cc.cc test-settings.cc \
- test-sholder_hh.cc test-signers.cc test-syncres_cc.cc \
- test-syncres_cc.hh test-syncres_cc1.cc test-syncres_cc10.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 \
- testrunner.cc threadname.hh threadname.cc tsigverifier.cc \
- tsigverifier.hh unix_utility.cc validate-recursor.cc \
- validate-recursor.hh validate.cc validate.hh version.cc \
- version.hh zonemd.cc zonemd.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 minicurl.cc minicurl.hh
+ test-sholder_hh.cc test-shuffle_cc.cc test-signers.cc \
+ test-syncres_cc.cc test-syncres_cc.hh test-syncres_cc1.cc \
+ test-syncres_cc10.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 testrunner.cc threadname.hh threadname.cc \
+ tsigverifier.cc tsigverifier.hh unix_utility.cc uuid-utils.hh \
+ uuid-utils.cc validate-recursor.cc validate-recursor.hh \
+ validate.cc validate.hh version.cc version.hh zonemd.cc \
+ zonemd.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 minicurl.cc \
+ minicurl.hh
@NOD_ENABLED_TRUE@am__objects_12 = nod.$(OBJEXT) test-nod_cc.$(OBJEXT)
am_testrunner_OBJECTS = aggressive_nsec.$(OBJEXT) arguments.$(OBJEXT) \
axfr-retriever.$(OBJEXT) base32.$(OBJEXT) base64.$(OBJEXT) \
@@ -466,49 +477,52 @@
logger.$(OBJEXT) logging.$(OBJEXT) misc.$(OBJEXT) \
mtasker_context.$(OBJEXT) negcache.$(OBJEXT) \
nsecrecords.$(OBJEXT) opensslsigners.$(OBJEXT) \
- pollmplexer.$(OBJEXT) qtype.$(OBJEXT) \
- query-local-address.$(OBJEXT) rcpgenerator.$(OBJEXT) \
- rec-eventtrace.$(OBJEXT) rec-responsestats.$(OBJEXT) \
- rec-system-resolve.$(OBJEXT) rec-taskqueue.$(OBJEXT) \
- rec-tcounters.$(OBJEXT) rec-xfrtracker.$(OBJEXT) \
- rec-zonetocache.$(OBJEXT) recpacketcache.$(OBJEXT) \
- recursor_cache.$(OBJEXT) reczones-helpers.$(OBJEXT) \
- resolver.$(OBJEXT) rpzloader.$(OBJEXT) secpoll.$(OBJEXT) \
- settings/cxxsupport.$(OBJEXT) sillyrecords.$(OBJEXT) \
- sortlist.$(OBJEXT) svc-records.$(OBJEXT) syncres.$(OBJEXT) \
- taskqueue.$(OBJEXT) test-aggressive_nsec_cc.$(OBJEXT) \
- test-arguments_cc.$(OBJEXT) test-base32_cc.$(OBJEXT) \
- test-base64_cc.$(OBJEXT) test-credentials_cc.$(OBJEXT) \
- test-dns_random_hh.$(OBJEXT) test-dnsname_cc.$(OBJEXT) \
- test-dnsparser_hh.$(OBJEXT) test-dnsrecordcontent.$(OBJEXT) \
- test-dnsrecords_cc.$(OBJEXT) test-ednsoptions_cc.$(OBJEXT) \
+ pollmplexer.$(OBJEXT) protozero-trace.$(OBJEXT) \
+ qtype.$(OBJEXT) query-local-address.$(OBJEXT) \
+ rcpgenerator.$(OBJEXT) rec-eventtrace.$(OBJEXT) \
+ rec-nsspeeds.$(OBJEXT) rec-responsestats.$(OBJEXT) \
+ rec-rust-lib/cxxsupport.$(OBJEXT) rec-system-resolve.$(OBJEXT) \
+ rec-taskqueue.$(OBJEXT) rec-tcounters.$(OBJEXT) \
+ rec-xfrtracker.$(OBJEXT) rec-zonetocache.$(OBJEXT) \
+ recpacketcache.$(OBJEXT) recursor_cache.$(OBJEXT) \
+ reczones-helpers.$(OBJEXT) resolver.$(OBJEXT) \
+ rpzloader.$(OBJEXT) secpoll.$(OBJEXT) shuffle.$(OBJEXT) \
+ sillyrecords.$(OBJEXT) sortlist.$(OBJEXT) \
+ svc-records.$(OBJEXT) syncres.$(OBJEXT) taskqueue.$(OBJEXT) \
+ test-aggressive_nsec_cc.$(OBJEXT) test-arguments_cc.$(OBJEXT) \
+ test-base32_cc.$(OBJEXT) test-base64_cc.$(OBJEXT) \
+ test-credentials_cc.$(OBJEXT) test-dns_random_hh.$(OBJEXT) \
+ test-dnsname_cc.$(OBJEXT) test-dnsparser_hh.$(OBJEXT) \
+ test-dnsrecordcontent.$(OBJEXT) test-dnsrecords_cc.$(OBJEXT) \
+ test-ednscookie_cc.$(OBJEXT) test-ednsoptions_cc.$(OBJEXT) \
test-filterpo_cc.$(OBJEXT) test-histogram_hh.$(OBJEXT) \
test-iputils_hh.$(OBJEXT) test-ixfr_cc.$(OBJEXT) \
test-luawrapper.$(OBJEXT) test-misc_hh.$(OBJEXT) \
test-mplexer.$(OBJEXT) test-mtasker.$(OBJEXT) \
test-negcache_cc.$(OBJEXT) test-packetcache_hh.$(OBJEXT) \
- test-rcpgenerator_cc.$(OBJEXT) \
+ test-protozero-trace.$(OBJEXT) test-rcpgenerator_cc.$(OBJEXT) \
test-rec-system-resolve.$(OBJEXT) test-rec-taskqueue.$(OBJEXT) \
test-rec-tcounters_cc.$(OBJEXT) test-rec-zonetocache.$(OBJEXT) \
test-recpacketcache_cc.$(OBJEXT) \
test-recursorcache_cc.$(OBJEXT) \
test-reczones-helpers.$(OBJEXT) test-rpzloader_cc.$(OBJEXT) \
test-secpoll_cc.$(OBJEXT) test-settings.$(OBJEXT) \
- test-sholder_hh.$(OBJEXT) test-signers.$(OBJEXT) \
- test-syncres_cc.$(OBJEXT) test-syncres_cc1.$(OBJEXT) \
- test-syncres_cc10.$(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) \
- testrunner.$(OBJEXT) threadname.$(OBJEXT) \
+ test-sholder_hh.$(OBJEXT) test-shuffle_cc.$(OBJEXT) \
+ test-signers.$(OBJEXT) test-syncres_cc.$(OBJEXT) \
+ test-syncres_cc1.$(OBJEXT) test-syncres_cc10.$(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) testrunner.$(OBJEXT) threadname.$(OBJEXT) \
tsigverifier.$(OBJEXT) unix_utility.$(OBJEXT) \
- validate-recursor.$(OBJEXT) validate.$(OBJEXT) \
- version.$(OBJEXT) zonemd.$(OBJEXT) zoneparser-tng.$(OBJEXT) \
- $(am__objects_12) $(am__objects_2) $(am__objects_4) \
- $(am__objects_5) $(am__objects_6) $(am__objects_7) \
- $(am__objects_8) $(am__objects_10)
-nodist_testrunner_OBJECTS = settings/cxxsettings-generated.$(OBJEXT)
+ uuid-utils.$(OBJEXT) validate-recursor.$(OBJEXT) \
+ validate.$(OBJEXT) version.$(OBJEXT) zonemd.$(OBJEXT) \
+ zoneparser-tng.$(OBJEXT) $(am__objects_12) $(am__objects_2) \
+ $(am__objects_4) $(am__objects_5) $(am__objects_6) \
+ $(am__objects_7) $(am__objects_8) $(am__objects_10)
+nodist_testrunner_OBJECTS = \
+ rec-rust-lib/cxxsettings-generated.$(OBJEXT)
testrunner_OBJECTS = $(am_testrunner_OBJECTS) \
$(nodist_testrunner_OBJECTS)
testrunner_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -560,28 +574,29 @@
./$(DEPDIR)/nod.Po ./$(DEPDIR)/nsecrecords.Po \
./$(DEPDIR)/opensslsigners.Po ./$(DEPDIR)/pdns_recursor.Po \
./$(DEPDIR)/pollmplexer.Po ./$(DEPDIR)/portsmplexer.Po \
- ./$(DEPDIR)/protozero.Po ./$(DEPDIR)/proxy-protocol.Po \
- ./$(DEPDIR)/pubsuffix.Po ./$(DEPDIR)/pubsuffixloader.Po \
- ./$(DEPDIR)/qtype.Po ./$(DEPDIR)/query-local-address.Po \
- ./$(DEPDIR)/rcpgenerator.Po ./$(DEPDIR)/rec-carbon.Po \
+ ./$(DEPDIR)/protozero-trace.Po ./$(DEPDIR)/protozero.Po \
+ ./$(DEPDIR)/proxy-protocol.Po ./$(DEPDIR)/pubsuffix.Po \
+ ./$(DEPDIR)/pubsuffixloader.Po ./$(DEPDIR)/qtype.Po \
+ ./$(DEPDIR)/query-local-address.Po ./$(DEPDIR)/rcpgenerator.Po \
+ ./$(DEPDIR)/rec-carbon.Po ./$(DEPDIR)/rec-cookiestore.Po \
./$(DEPDIR)/rec-eventtrace.Po ./$(DEPDIR)/rec-lua-conf.Po \
- ./$(DEPDIR)/rec-main.Po ./$(DEPDIR)/rec-protozero.Po \
- ./$(DEPDIR)/rec-responsestats.Po ./$(DEPDIR)/rec-snmp.Po \
- ./$(DEPDIR)/rec-system-resolve.Po ./$(DEPDIR)/rec-taskqueue.Po \
- ./$(DEPDIR)/rec-tcounters.Po ./$(DEPDIR)/rec-tcp.Po \
- ./$(DEPDIR)/rec-tcpout.Po ./$(DEPDIR)/rec-xfr.Po \
- ./$(DEPDIR)/rec-xfrtracker.Po ./$(DEPDIR)/rec-zonetocache.Po \
- ./$(DEPDIR)/rec_channel.Po ./$(DEPDIR)/rec_channel_rec.Po \
- ./$(DEPDIR)/rec_control.Po ./$(DEPDIR)/recpacketcache.Po \
- ./$(DEPDIR)/recursor_cache.Po ./$(DEPDIR)/reczones-helpers.Po \
- ./$(DEPDIR)/reczones.Po ./$(DEPDIR)/remote_logger.Po \
- ./$(DEPDIR)/resolver.Po ./$(DEPDIR)/rpzloader.Po \
- ./$(DEPDIR)/secpoll-recursor.Po ./$(DEPDIR)/secpoll.Po \
- ./$(DEPDIR)/shuffle.Po ./$(DEPDIR)/sillyrecords.Po \
- ./$(DEPDIR)/snmp-agent.Po ./$(DEPDIR)/sodiumsigners.Po \
- ./$(DEPDIR)/sortlist.Po ./$(DEPDIR)/svc-records.Po \
- ./$(DEPDIR)/syncres.Po ./$(DEPDIR)/taskqueue.Po \
- ./$(DEPDIR)/tcpiohandler.Po \
+ ./$(DEPDIR)/rec-main.Po ./$(DEPDIR)/rec-nsspeeds.Po \
+ ./$(DEPDIR)/rec-protozero.Po ./$(DEPDIR)/rec-responsestats.Po \
+ ./$(DEPDIR)/rec-snmp.Po ./$(DEPDIR)/rec-system-resolve.Po \
+ ./$(DEPDIR)/rec-taskqueue.Po ./$(DEPDIR)/rec-tcounters.Po \
+ ./$(DEPDIR)/rec-tcp.Po ./$(DEPDIR)/rec-tcpout.Po \
+ ./$(DEPDIR)/rec-xfr.Po ./$(DEPDIR)/rec-xfrtracker.Po \
+ ./$(DEPDIR)/rec-zonetocache.Po ./$(DEPDIR)/rec_channel.Po \
+ ./$(DEPDIR)/rec_channel_rec.Po ./$(DEPDIR)/rec_control.Po \
+ ./$(DEPDIR)/recpacketcache.Po ./$(DEPDIR)/recursor_cache.Po \
+ ./$(DEPDIR)/reczones-helpers.Po ./$(DEPDIR)/reczones.Po \
+ ./$(DEPDIR)/remote_logger.Po ./$(DEPDIR)/resolver.Po \
+ ./$(DEPDIR)/rpzloader.Po ./$(DEPDIR)/secpoll-recursor.Po \
+ ./$(DEPDIR)/secpoll.Po ./$(DEPDIR)/shuffle.Po \
+ ./$(DEPDIR)/sillyrecords.Po ./$(DEPDIR)/snmp-agent.Po \
+ ./$(DEPDIR)/sodiumsigners.Po ./$(DEPDIR)/sortlist.Po \
+ ./$(DEPDIR)/svc-records.Po ./$(DEPDIR)/syncres.Po \
+ ./$(DEPDIR)/taskqueue.Po ./$(DEPDIR)/tcpiohandler.Po \
./$(DEPDIR)/test-aggressive_nsec_cc.Po \
./$(DEPDIR)/test-arguments_cc.Po ./$(DEPDIR)/test-base32_cc.Po \
./$(DEPDIR)/test-base64_cc.Po \
@@ -591,6 +606,7 @@
./$(DEPDIR)/test-dnsparser_hh.Po \
./$(DEPDIR)/test-dnsrecordcontent.Po \
./$(DEPDIR)/test-dnsrecords_cc.Po \
+ ./$(DEPDIR)/test-ednscookie_cc.Po \
./$(DEPDIR)/test-ednsoptions_cc.Po \
./$(DEPDIR)/test-filterpo_cc.Po \
./$(DEPDIR)/test-histogram_hh.Po \
@@ -599,6 +615,7 @@
./$(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-protozero-trace.Po \
./$(DEPDIR)/test-rcpgenerator_cc.Po \
./$(DEPDIR)/test-rec-system-resolve.Po \
./$(DEPDIR)/test-rec-taskqueue.Po \
@@ -609,8 +626,9 @@
./$(DEPDIR)/test-reczones-helpers.Po \
./$(DEPDIR)/test-rpzloader_cc.Po \
./$(DEPDIR)/test-secpoll_cc.Po ./$(DEPDIR)/test-settings.Po \
- ./$(DEPDIR)/test-sholder_hh.Po ./$(DEPDIR)/test-signers.Po \
- ./$(DEPDIR)/test-syncres_cc.Po ./$(DEPDIR)/test-syncres_cc1.Po \
+ ./$(DEPDIR)/test-sholder_hh.Po ./$(DEPDIR)/test-shuffle_cc.Po \
+ ./$(DEPDIR)/test-signers.Po ./$(DEPDIR)/test-syncres_cc.Po \
+ ./$(DEPDIR)/test-syncres_cc1.Po \
./$(DEPDIR)/test-syncres_cc10.Po \
./$(DEPDIR)/test-syncres_cc2.Po \
./$(DEPDIR)/test-syncres_cc3.Po \
@@ -627,8 +645,8 @@
./$(DEPDIR)/webserver.Po ./$(DEPDIR)/ws-api.Po \
./$(DEPDIR)/ws-recursor.Po ./$(DEPDIR)/zonemd.Po \
./$(DEPDIR)/zoneparser-tng.Po \
- settings/$(DEPDIR)/cxxsettings-generated.Po \
- settings/$(DEPDIR)/cxxsupport.Po
+ rec-rust-lib/$(DEPDIR)/cxxsettings-generated.Po \
+ rec-rust-lib/$(DEPDIR)/cxxsupport.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -706,10 +724,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
man1dir = $(mandir)/man1
NROFF = nroff
@@ -850,6 +867,7 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
+ $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -874,6 +892,11 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
+if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
+ am__collect_skipped_logs='--collect-skipped-logs no'; \
+else \
+ am__collect_skipped_logs=''; \
+fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -939,8 +962,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -969,7 +992,7 @@
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_ARCHIVES = $(distdir).tar.bz2
DIST_TARGETS = dist-bzip2
# Exists only to be overridden by the user if desired.
@@ -977,7 +1000,9 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) \
@@ -985,11 +1010,11 @@
$(SANITIZER_FLAGS) -O3 -Wall -pthread \
-DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS) \
-I$(top_srcdir)/ext/json11 \
- -I$(top_srcdir)/ext/protozero/include -I$(top_srcdir)/settings \
- -I$(top_builddir)/settings -I$(top_srcdir)/settings/rust/src \
- $(YAHTTP_CFLAGS) $(LIBCRYPTO_INCLUDES) \
- -DBOOST_CONTAINER_USE_STD_EXCEPTIONS $(am__append_1) \
- $(am__append_2) $(am__append_34)
+ -I$(top_srcdir)/ext/protozero/include \
+ -I$(top_srcdir)/rec-rust-lib -I$(top_builddir)/rec-rust-lib \
+ -I$(top_srcdir)/rec-rust-lib/rust/src $(YAHTTP_CFLAGS) \
+ $(LIBCRYPTO_INCLUDES) -DBOOST_CONTAINER_USE_STD_EXCEPTIONS \
+ $(am__append_1) $(am__append_2) $(am__append_34)
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -1134,8 +1159,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -1190,7 +1217,7 @@
JSON11_LIBS = $(top_builddir)/ext/json11/libjson11.la
PROBDS_LIBS = $(top_builddir)/ext/probds/libprobds.la
ARC4RANDOM_LIBS = $(top_builddir)/ext/arc4random/libarc4random.la
-RUST_LIBS = $(top_builddir)/settings/rust/libsettings.a $(LIBDL)
+RUST_LIBS = $(top_builddir)/rec-rust-lib/rust/librecrust.a $(LIBDL)
AM_CXXFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \
-DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"$(socketdir)\" \
-DNODCACHEDIRNOD=\"$(nodcachedir)/nod\" \
@@ -1205,8 +1232,8 @@
RECURSOR-MIB.txt $(am__append_4)
CLEANFILES = htmlfiles.h recursor.yml-dist lua.hpp $(am__append_40)
-# We explicitly build settings in two steps, as settings modifies files in the settings/rust subdir
-SUBDIRS = ext settings settings/rust
+# We explicitly build rec-rust-lib in two steps, as it modifies files in the rec-rust-lib/rust subdir
+SUBDIRS = ext rec-rust-lib rec-rust-lib/rust
EXTRA_DIST = \
contrib/* \
COPYING \
@@ -1214,7 +1241,6 @@
dnslabeltext.cc \
dnslabeltext.rl \
dnsmessage.proto \
- effective_tld_names.dat \
epollmplexer.cc \
kqueuemplexer.cc \
lua_hpp.mk \
@@ -1248,59 +1274,61 @@
coverage.cc coverage.hh credentials.cc credentials.hh dns.hh \
dns.cc dns_random.hh dnsbackend.hh dnslabeltext.cc dnsname.cc \
dnsname.hh dnspacket.hh dnsparser.hh dnsparser.cc \
- dnsrecords.cc dnsrecords.hh dnssecinfra.hh dnssecinfra.cc \
- dnsseckeeper.hh dnswriter.cc dnswriter.hh dolog.hh \
- ednsextendederror.cc ednsextendederror.hh ednsoptions.cc \
- ednsoptions.hh ednspadding.cc ednspadding.hh ednssubnet.cc \
- ednssubnet.hh filterpo.cc filterpo.hh fstrm_logger.cc \
- fstrm_logger.hh gettime.cc gettime.hh gss_context.cc \
- gss_context.hh histogram.hh iputils.hh iputils.cc ixfr.cc \
- ixfr.hh json.cc json.hh lazy_allocator.hh libssl.cc libssl.hh \
- lock.hh logger.hh logger.cc logging.hh logging.cc logr.hh \
- lua-base4.cc lua-base4.hh lua-recursor4-ffi.hh \
- lua-recursor4.cc lua-recursor4.hh lwres.cc lwres.hh misc.hh \
- misc.cc mplexer.hh mtasker.hh mtasker_context.cc \
- mtasker_context.hh namespaces.hh negcache.hh negcache.cc \
- noinitvector.hh nsecrecords.cc opensslsigners.cc \
- opensslsigners.hh packetcache.hh pdns_recursor.cc \
- pdnsexception.hh pollmplexer.cc protozero.cc protozero.hh \
- proxy-protocol.cc proxy-protocol.hh pubsuffix.hh pubsuffix.cc \
- pubsuffixloader.cc qtype.hh qtype.cc query-local-address.hh \
- query-local-address.cc ratelimitedlog.hh rcpgenerator.cc \
- rcpgenerator.hh rec-carbon.cc rec-eventtrace.cc \
- rec-eventtrace.hh rec-lua-conf.hh rec-lua-conf.cc rec-main.hh \
- rec-main.cc rec-protozero.cc rec-protozero.hh \
- rec-responsestats.hh rec-responsestats.cc rec-snmp.hh \
- rec-snmp.cc rec-system-resolve.hh rec-system-resolve.cc \
- rec-taskqueue.cc rec-taskqueue.hh rec-tcounters.cc \
- rec-tcounters.hh rec-tcp.cc rec-tcpout.cc rec-tcpout.hh \
- rec-xfr.cc rec-xfr.hh rec-xfrtracker.cc rec-zonetocache.cc \
- rec-zonetocache.hh rec_channel.cc rec_channel.hh \
- rec_metrics.hh rec_channel_rec.cc recpacketcache.cc \
- recpacketcache.hh recursor_cache.cc recursor_cache.hh \
- reczones-helpers.cc reczones-helpers.hh reczones.cc \
- remote_logger.cc remote_logger.hh resolve-context.hh \
- resolver.hh resolver.cc root-addresses.hh root-dnssec.hh \
- rpzloader.cc rpzloader.hh secpoll-recursor.cc \
- secpoll-recursor.hh secpoll.cc secpoll.hh \
- settings/cxxsupport.cc sha.hh sholder.hh shuffle.cc shuffle.hh \
+ dnsrecords.cc dnsrecords.hh dnssec.hh dnssecinfra.hh \
+ dnssecinfra.cc dnswriter.cc dnswriter.hh dolog.hh \
+ ednscookies.cc ednscookies.hh ednsextendederror.cc \
+ ednsextendederror.hh ednsoptions.cc ednsoptions.hh \
+ ednspadding.cc ednspadding.hh ednssubnet.cc ednssubnet.hh \
+ filterpo.cc filterpo.hh fstrm_logger.cc fstrm_logger.hh \
+ gettime.cc gettime.hh gss_context.cc gss_context.hh \
+ histogram.hh iputils.hh iputils.cc ixfr.cc ixfr.hh json.cc \
+ json.hh lazy_allocator.hh libssl.cc libssl.hh lock.hh \
+ logger.hh logger.cc logging.hh logging.cc logr.hh lua-base4.cc \
+ lua-base4.hh lua-recursor4-ffi.hh lua-recursor4.cc \
+ lua-recursor4.hh lwres.cc lwres.hh misc.hh misc.cc mplexer.hh \
+ mtasker.hh mtasker_context.cc mtasker_context.hh namespaces.hh \
+ negcache.hh negcache.cc noinitvector.hh nsecrecords.cc \
+ opensslsigners.cc opensslsigners.hh packetcache.hh \
+ pdns_recursor.cc pdnsexception.hh pollmplexer.cc \
+ protozero-helpers.hh protozero-trace.cc protozero-trace.hh \
+ protozero.cc protozero.hh proxy-protocol.cc proxy-protocol.hh \
+ pubsuffix.hh pubsuffix.cc pubsuffixloader.cc qtype.hh qtype.cc \
+ query-local-address.hh query-local-address.cc \
+ ratelimitedlog.hh rcpgenerator.cc rcpgenerator.hh \
+ rec-carbon.cc rec-cookiestore.cc rec-cookiestore.hh \
+ rec-eventtrace.cc rec-eventtrace.hh rec-lua-conf.hh \
+ rec-lua-conf.cc rec-main.hh rec-main.cc rec-nsspeeds.cc \
+ rec-nsspeeds.hh rec-protozero.cc rec-protozero.hh \
+ rec-responsestats.hh rec-responsestats.cc \
+ rec-rust-lib/cxxsupport.cc rec-snmp.hh rec-snmp.cc \
+ rec-system-resolve.hh rec-system-resolve.cc rec-taskqueue.cc \
+ rec-taskqueue.hh rec-tcounters.cc rec-tcounters.hh rec-tcp.cc \
+ rec-tcpout.cc rec-tcpout.hh rec-xfr.cc rec-xfr.hh \
+ rec-xfrtracker.cc rec-zonetocache.cc rec-zonetocache.hh \
+ rec_channel.cc rec_channel.hh rec_metrics.hh \
+ rec_channel_rec.cc recpacketcache.cc recpacketcache.hh \
+ recursor_cache.cc recursor_cache.hh reczones-helpers.cc \
+ reczones-helpers.hh reczones.cc remote_logger.cc \
+ remote_logger.hh resolve-context.hh resolver.hh resolver.cc \
+ root-addresses.hh root-dnssec.hh rpzloader.cc rpzloader.hh \
+ sanitizer.hh secpoll-recursor.cc secpoll-recursor.hh \
+ secpoll.cc secpoll.hh sha.hh sholder.hh shuffle.cc shuffle.hh \
sillyrecords.cc snmp-agent.hh snmp-agent.cc sortlist.cc \
sortlist.hh sstuff.hh stable-bloom.hh stat_t.hh svc-records.cc \
svc-records.hh syncres.cc syncres.hh taskqueue.cc taskqueue.hh \
tcounters.hh tcpiohandler.cc tcpiohandler.hh threadname.hh \
- threadname.cc tsigverifier.cc tsigverifier.hh ueberbackend.hh \
- unix_utility.cc utility.hh uuid-utils.hh uuid-utils.cc \
- validate.cc validate.hh validate-recursor.cc \
- validate-recursor.hh version.cc version.hh views.hh \
- webserver.cc webserver.hh ws-api.cc ws-api.hh ws-recursor.cc \
- ws-recursor.hh zonemd.cc zonemd.hh zoneparser-tng.cc \
- zoneparser-tng.hh $(am__append_6) $(am__append_12) \
- $(am__append_17) $(am__append_22) $(am__append_24) \
- $(am__append_26) $(am__append_28) $(am__append_30) \
- $(am__append_32) $(am__append_36)
-nodist_pdns_recursor_SOURCES = settings/cxxsettings-generated.cc \
+ threadname.cc tsigverifier.cc tsigverifier.hh unix_utility.cc \
+ utility.hh uuid-utils.hh uuid-utils.cc validate.cc validate.hh \
+ validate-recursor.cc validate-recursor.hh version.cc \
+ version.hh views.hh webserver.cc webserver.hh ws-api.cc \
+ ws-api.hh ws-recursor.cc ws-recursor.hh zonemd.cc zonemd.hh \
+ zoneparser-tng.cc zoneparser-tng.hh $(am__append_6) \
+ $(am__append_12) $(am__append_17) $(am__append_22) \
+ $(am__append_24) $(am__append_26) $(am__append_28) \
+ $(am__append_30) $(am__append_32) $(am__append_36)
+nodist_pdns_recursor_SOURCES = rec-rust-lib/cxxsettings-generated.cc \
$(am__append_5)
-pdns_recursor_LDADD = $(YAHTTP_LIBS) $(JSON11_LIBS) $(LIBCRYPTO_LIBS) \
+pdns_recursor_LDADD = $(JSON11_LIBS) $(LIBCRYPTO_LIBS) \
$(BOOST_CONTEXT_LIBS) $(NET_SNMP_LIBS) $(SYSTEMD_LIBS) \
$(RT_LIBS) $(BOOST_SYSTEM_LIBS) $(PROBDS_LIBS) $(LIBCAP_LIBS) \
$(ARC4RANDOM_LIBS) $(RUST_LIBS) $(am__append_7) \
@@ -1319,7 +1347,7 @@
base64.cc base64.hh circular_buffer.hh credentials.cc \
credentials.hh dns.cc dns.hh dns_random.hh dnslabeltext.cc \
dnsname.cc dnsname.hh dnsparser.hh dnsparser.cc dnsrecords.cc \
- dnssecinfra.cc dnsseckeeper.hh dnswriter.cc dnswriter.hh \
+ dnssec.hh dnssecinfra.cc dnswriter.cc dnswriter.hh \
ednscookies.cc ednscookies.hh ednsextendederror.cc \
ednsextendederror.hh ednsoptions.cc ednsoptions.hh \
ednspadding.cc ednspadding.hh ednssubnet.cc ednssubnet.hh \
@@ -1328,17 +1356,19 @@
logger.hh logging.hh logging.cc logr.hh misc.cc misc.hh \
mtasker_context.cc namespaces.hh negcache.hh negcache.cc \
nsecrecords.cc opensslsigners.cc opensslsigners.hh \
- pdnsexception.hh pollmplexer.cc qtype.cc qtype.hh \
- query-local-address.hh query-local-address.cc \
- ratelimitedlog.hh rcpgenerator.cc rec-eventtrace.cc \
- rec-eventtrace.hh rec-responsestats.hh rec-responsestats.cc \
- rec-system-resolve.hh rec-system-resolve.cc rec-taskqueue.cc \
- rec-taskqueue.hh rec-tcounters.cc rec-tcounters.hh \
+ pdnsexception.hh pollmplexer.cc protozero-trace.cc \
+ protozero-trace.hh qtype.cc qtype.hh query-local-address.hh \
+ query-local-address.cc ratelimitedlog.hh rcpgenerator.cc \
+ rec-eventtrace.cc rec-eventtrace.hh rec-nsspeeds.cc \
+ rec-nsspeeds.hh rec-responsestats.hh rec-responsestats.cc \
+ rec-rust-lib/cxxsupport.cc rec-system-resolve.hh \
+ rec-system-resolve.cc rec-taskqueue.cc rec-taskqueue.hh \
+ rec-tcounters.cc rec-tcounters.hh rec-web-stubs.hh \
rec-xfrtracker.cc rec-zonetocache.cc rec-zonetocache.hh \
recpacketcache.cc recpacketcache.hh recursor_cache.cc \
recursor_cache.hh reczones-helpers.cc reczones-helpers.hh \
resolver.hh resolver.cc root-dnssec.hh rpzloader.cc \
- rpzloader.hh secpoll.cc settings/cxxsupport.cc sholder.hh \
+ rpzloader.hh secpoll.cc sholder.hh shuffle.cc shuffle.hh \
sillyrecords.cc sortlist.cc sortlist.hh sstuff.hh \
stable-bloom.hh svc-records.cc svc-records.hh syncres.cc \
syncres.hh taskqueue.cc taskqueue.hh \
@@ -1347,29 +1377,31 @@
test-credentials_cc.cc test-dns_random_hh.cc \
test-dnsname_cc.cc test-dnsparser_hh.cc \
test-dnsrecordcontent.cc test-dnsrecords_cc.cc \
- test-ednsoptions_cc.cc test-filterpo_cc.cc \
- test-histogram_hh.cc test-iputils_hh.cc test-ixfr_cc.cc \
- test-luawrapper.cc test-misc_hh.cc test-mplexer.cc \
- test-mtasker.cc test-negcache_cc.cc test-packetcache_hh.cc \
+ test-ednscookie_cc.cc test-ednsoptions_cc.cc \
+ test-filterpo_cc.cc test-histogram_hh.cc test-iputils_hh.cc \
+ test-ixfr_cc.cc test-luawrapper.cc test-misc_hh.cc \
+ test-mplexer.cc test-mtasker.cc test-negcache_cc.cc \
+ test-packetcache_hh.cc test-protozero-trace.cc \
test-rcpgenerator_cc.cc test-rec-system-resolve.cc \
test-rec-taskqueue.cc test-rec-tcounters_cc.cc \
test-rec-zonetocache.cc test-recpacketcache_cc.cc \
test-recursorcache_cc.cc test-reczones-helpers.cc \
test-rpzloader_cc.cc test-secpoll_cc.cc test-settings.cc \
- test-sholder_hh.cc test-signers.cc test-syncres_cc.cc \
- test-syncres_cc.hh test-syncres_cc1.cc test-syncres_cc10.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 \
- testrunner.cc threadname.hh threadname.cc tsigverifier.cc \
- tsigverifier.hh unix_utility.cc validate-recursor.cc \
- validate-recursor.hh validate.cc validate.hh version.cc \
- version.hh zonemd.cc zonemd.hh zoneparser-tng.cc \
- zoneparser-tng.hh $(am__append_9) $(am__append_15) \
- $(am__append_23) $(am__append_25) $(am__append_27) \
- $(am__append_29) $(am__append_31) $(am__append_38)
+ test-sholder_hh.cc test-shuffle_cc.cc test-signers.cc \
+ test-syncres_cc.cc test-syncres_cc.hh test-syncres_cc1.cc \
+ test-syncres_cc10.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 testrunner.cc threadname.hh threadname.cc \
+ tsigverifier.cc tsigverifier.hh unix_utility.cc uuid-utils.hh \
+ uuid-utils.cc validate-recursor.cc validate-recursor.hh \
+ validate.cc validate.hh version.cc version.hh zonemd.cc \
+ zonemd.hh zoneparser-tng.cc zoneparser-tng.hh $(am__append_9) \
+ $(am__append_15) $(am__append_23) $(am__append_25) \
+ $(am__append_27) $(am__append_29) $(am__append_31) \
+ $(am__append_38)
nodist_testrunner_SOURCES = \
- settings/cxxsettings-generated.cc
+ rec-rust-lib/cxxsettings-generated.cc
testrunner_LDFLAGS = $(AM_LDFLAGS) $(BOOST_CONTEXT_LDFLAGS) \
$(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(LIBCRYPTO_LDFLAGS) \
@@ -1399,22 +1431,21 @@
qtype.cc \
rcpgenerator.cc rcpgenerator.hh \
rec-lua-conf.cc rec-lua-conf.hh \
+ rec-rust-lib/cxxsupport.cc \
rec-system-resolve.cc rec-system-resolve.hh \
+ rec-web-stubs.hh \
rec_channel.cc rec_channel.hh \
rec_control.cc \
- settings/cxxsupport.cc \
sillyrecords.cc \
sortlist.cc sortlist.hh \
svc-records.cc svc-records.hh \
threadname.cc threadname.hh \
- unix_utility.cc
+ unix_utility.cc \
+ uuid-utils.hh uuid-utils.cc
nodist_rec_control_SOURCES = \
- settings/cxxsettings-generated.cc
+ rec-rust-lib/cxxsettings-generated.cc
-curl_verbose = $(curl_verbose_$(V))
-curl_verbose_ = $(curl_verbose_$(AM_DEFAULT_VERBOSITY))
-curl_verbose_0 = @echo " CURL " $@;
sysconf_DATA = recursor.yml-dist
MANPAGES = pdns_recursor.1 \
rec_control.1
@@ -1470,12 +1501,12 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
+ $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_at)touch $@
distclean-hdr:
-rm -f config.h stamp-h1
@@ -1518,25 +1549,15 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(bin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(noinst_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(noinst_PROGRAMS:$(EXEEXT)=)
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
@@ -1576,26 +1597,22 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+ cd "$(DESTDIR)$(sbindir)" && $(am__rm_f) $$files
clean-sbinPROGRAMS:
- @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
-settings/$(am__dirstamp):
- @$(MKDIR_P) settings
- @: > settings/$(am__dirstamp)
-settings/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) settings/$(DEPDIR)
- @: > settings/$(DEPDIR)/$(am__dirstamp)
-settings/cxxsupport.$(OBJEXT): settings/$(am__dirstamp) \
- settings/$(DEPDIR)/$(am__dirstamp)
-settings/cxxsettings-generated.$(OBJEXT): settings/$(am__dirstamp) \
- settings/$(DEPDIR)/$(am__dirstamp)
+ $(am__rm_f) $(sbin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(sbin_PROGRAMS:$(EXEEXT)=)
+rec-rust-lib/$(am__dirstamp):
+ @$(MKDIR_P) rec-rust-lib
+ @: >>rec-rust-lib/$(am__dirstamp)
+rec-rust-lib/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) rec-rust-lib/$(DEPDIR)
+ @: >>rec-rust-lib/$(DEPDIR)/$(am__dirstamp)
+rec-rust-lib/cxxsupport.$(OBJEXT): rec-rust-lib/$(am__dirstamp) \
+ rec-rust-lib/$(DEPDIR)/$(am__dirstamp)
+rec-rust-lib/cxxsettings-generated.$(OBJEXT): \
+ rec-rust-lib/$(am__dirstamp) \
+ rec-rust-lib/$(DEPDIR)/$(am__dirstamp)
pdns_recursor$(EXEEXT): $(pdns_recursor_OBJECTS) $(pdns_recursor_DEPENDENCIES) $(EXTRA_pdns_recursor_DEPENDENCIES)
@rm -f pdns_recursor$(EXEEXT)
@@ -1611,7 +1628,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f settings/*.$(OBJEXT)
+ -rm -f rec-rust-lib/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -1665,6 +1682,7 @@
@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)/protozero-trace.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protozero.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy-protocol.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pubsuffix.Po@am__quote@ # am--include-marker
@@ -1673,9 +1691,11 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-local-address.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-cookiestore.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-eventtrace.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-main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-nsspeeds.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-protozero.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-responsestats.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rec-snmp.Po@am__quote@ # am--include-marker
@@ -1718,6 +1738,7 @@
@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-ednscookie_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-histogram_hh.Po@am__quote@ # am--include-marker
@@ -1730,6 +1751,7 @@
@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-protozero-trace.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-rec-system-resolve.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rec-taskqueue.Po@am__quote@ # am--include-marker
@@ -1742,6 +1764,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-secpoll_cc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-settings.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sholder_hh.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-shuffle_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
@@ -1768,12 +1791,12 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ws-recursor.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zonemd.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoneparser-tng.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@settings/$(DEPDIR)/cxxsettings-generated.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@settings/$(DEPDIR)/cxxsupport.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@rec-rust-lib/$(DEPDIR)/cxxsettings-generated.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@rec-rust-lib/$(DEPDIR)/cxxsupport.Po@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -2014,7 +2037,6 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
-
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -2090,10 +2112,37 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
+ output_system_information () \
+ { \
+ echo; \
+ { uname -a | $(AWK) '{ \
+ printf "System information (uname -a):"; \
+ for (i = 1; i < NF; ++i) \
+ { \
+ if (i != 2) \
+ printf " %s", $$i; \
+ } \
+ printf "\n"; \
+}'; } 2>&1; \
+ if test -r /etc/os-release; then \
+ echo "Distribution information (/etc/os-release):"; \
+ sed 8q /etc/os-release; \
+ elif test -r /etc/issue; then \
+ echo "Distribution information (/etc/issue):"; \
+ cat /etc/issue; \
+ fi; \
+ }; \
+ please_report () \
+ { \
+echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
+echo "together with the test-suite.log file (gzipped) and your system"; \
+echo "information. Thanks."; \
+ }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
+ output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -2113,26 +2162,25 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
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)
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ log_list=`echo $$log_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -2175,7 +2223,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -2288,7 +2336,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -2298,7 +2346,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -2402,23 +2450,23 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ -$(am__rm_f) $(TEST_LOGS)
+ -$(am__rm_f) $(TEST_LOGS:.log=.trs)
+ -$(am__rm_f) $(TEST_SUITE_LOG)
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(am__rm_f) $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f settings/$(DEPDIR)/$(am__dirstamp)
- -rm -f settings/$(am__dirstamp)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) rec-rust-lib/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) rec-rust-lib/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ -$(am__rm_f) $(BUILT_SOURCES)
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libtool \
@@ -2426,7 +2474,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f ./$(DEPDIR)/aggressive_nsec.Po
+ -rm -f ./$(DEPDIR)/aggressive_nsec.Po
-rm -f ./$(DEPDIR)/arguments.Po
-rm -f ./$(DEPDIR)/axfr-retriever.Po
-rm -f ./$(DEPDIR)/base32.Po
@@ -2475,6 +2523,7 @@
-rm -f ./$(DEPDIR)/pdns_recursor.Po
-rm -f ./$(DEPDIR)/pollmplexer.Po
-rm -f ./$(DEPDIR)/portsmplexer.Po
+ -rm -f ./$(DEPDIR)/protozero-trace.Po
-rm -f ./$(DEPDIR)/protozero.Po
-rm -f ./$(DEPDIR)/proxy-protocol.Po
-rm -f ./$(DEPDIR)/pubsuffix.Po
@@ -2483,9 +2532,11 @@
-rm -f ./$(DEPDIR)/query-local-address.Po
-rm -f ./$(DEPDIR)/rcpgenerator.Po
-rm -f ./$(DEPDIR)/rec-carbon.Po
+ -rm -f ./$(DEPDIR)/rec-cookiestore.Po
-rm -f ./$(DEPDIR)/rec-eventtrace.Po
-rm -f ./$(DEPDIR)/rec-lua-conf.Po
-rm -f ./$(DEPDIR)/rec-main.Po
+ -rm -f ./$(DEPDIR)/rec-nsspeeds.Po
-rm -f ./$(DEPDIR)/rec-protozero.Po
-rm -f ./$(DEPDIR)/rec-responsestats.Po
-rm -f ./$(DEPDIR)/rec-snmp.Po
@@ -2528,6 +2579,7 @@
-rm -f ./$(DEPDIR)/test-dnsparser_hh.Po
-rm -f ./$(DEPDIR)/test-dnsrecordcontent.Po
-rm -f ./$(DEPDIR)/test-dnsrecords_cc.Po
+ -rm -f ./$(DEPDIR)/test-ednscookie_cc.Po
-rm -f ./$(DEPDIR)/test-ednsoptions_cc.Po
-rm -f ./$(DEPDIR)/test-filterpo_cc.Po
-rm -f ./$(DEPDIR)/test-histogram_hh.Po
@@ -2540,6 +2592,7 @@
-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-protozero-trace.Po
-rm -f ./$(DEPDIR)/test-rcpgenerator_cc.Po
-rm -f ./$(DEPDIR)/test-rec-system-resolve.Po
-rm -f ./$(DEPDIR)/test-rec-taskqueue.Po
@@ -2552,6 +2605,7 @@
-rm -f ./$(DEPDIR)/test-secpoll_cc.Po
-rm -f ./$(DEPDIR)/test-settings.Po
-rm -f ./$(DEPDIR)/test-sholder_hh.Po
+ -rm -f ./$(DEPDIR)/test-shuffle_cc.Po
-rm -f ./$(DEPDIR)/test-signers.Po
-rm -f ./$(DEPDIR)/test-syncres_cc.Po
-rm -f ./$(DEPDIR)/test-syncres_cc1.Po
@@ -2578,8 +2632,8 @@
-rm -f ./$(DEPDIR)/ws-recursor.Po
-rm -f ./$(DEPDIR)/zonemd.Po
-rm -f ./$(DEPDIR)/zoneparser-tng.Po
- -rm -f settings/$(DEPDIR)/cxxsettings-generated.Po
- -rm -f settings/$(DEPDIR)/cxxsupport.Po
+ -rm -f rec-rust-lib/$(DEPDIR)/cxxsettings-generated.Po
+ -rm -f rec-rust-lib/$(DEPDIR)/cxxsupport.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -2628,7 +2682,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -f ./$(DEPDIR)/aggressive_nsec.Po
+ -rm -f ./$(DEPDIR)/aggressive_nsec.Po
-rm -f ./$(DEPDIR)/arguments.Po
-rm -f ./$(DEPDIR)/axfr-retriever.Po
-rm -f ./$(DEPDIR)/base32.Po
@@ -2677,6 +2731,7 @@
-rm -f ./$(DEPDIR)/pdns_recursor.Po
-rm -f ./$(DEPDIR)/pollmplexer.Po
-rm -f ./$(DEPDIR)/portsmplexer.Po
+ -rm -f ./$(DEPDIR)/protozero-trace.Po
-rm -f ./$(DEPDIR)/protozero.Po
-rm -f ./$(DEPDIR)/proxy-protocol.Po
-rm -f ./$(DEPDIR)/pubsuffix.Po
@@ -2685,9 +2740,11 @@
-rm -f ./$(DEPDIR)/query-local-address.Po
-rm -f ./$(DEPDIR)/rcpgenerator.Po
-rm -f ./$(DEPDIR)/rec-carbon.Po
+ -rm -f ./$(DEPDIR)/rec-cookiestore.Po
-rm -f ./$(DEPDIR)/rec-eventtrace.Po
-rm -f ./$(DEPDIR)/rec-lua-conf.Po
-rm -f ./$(DEPDIR)/rec-main.Po
+ -rm -f ./$(DEPDIR)/rec-nsspeeds.Po
-rm -f ./$(DEPDIR)/rec-protozero.Po
-rm -f ./$(DEPDIR)/rec-responsestats.Po
-rm -f ./$(DEPDIR)/rec-snmp.Po
@@ -2730,6 +2787,7 @@
-rm -f ./$(DEPDIR)/test-dnsparser_hh.Po
-rm -f ./$(DEPDIR)/test-dnsrecordcontent.Po
-rm -f ./$(DEPDIR)/test-dnsrecords_cc.Po
+ -rm -f ./$(DEPDIR)/test-ednscookie_cc.Po
-rm -f ./$(DEPDIR)/test-ednsoptions_cc.Po
-rm -f ./$(DEPDIR)/test-filterpo_cc.Po
-rm -f ./$(DEPDIR)/test-histogram_hh.Po
@@ -2742,6 +2800,7 @@
-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-protozero-trace.Po
-rm -f ./$(DEPDIR)/test-rcpgenerator_cc.Po
-rm -f ./$(DEPDIR)/test-rec-system-resolve.Po
-rm -f ./$(DEPDIR)/test-rec-taskqueue.Po
@@ -2754,6 +2813,7 @@
-rm -f ./$(DEPDIR)/test-secpoll_cc.Po
-rm -f ./$(DEPDIR)/test-settings.Po
-rm -f ./$(DEPDIR)/test-sholder_hh.Po
+ -rm -f ./$(DEPDIR)/test-shuffle_cc.Po
-rm -f ./$(DEPDIR)/test-signers.Po
-rm -f ./$(DEPDIR)/test-syncres_cc.Po
-rm -f ./$(DEPDIR)/test-syncres_cc1.Po
@@ -2780,8 +2840,8 @@
-rm -f ./$(DEPDIR)/ws-recursor.Po
-rm -f ./$(DEPDIR)/zonemd.Po
-rm -f ./$(DEPDIR)/zoneparser-tng.Po
- -rm -f settings/$(DEPDIR)/cxxsettings-generated.Po
- -rm -f settings/$(DEPDIR)/cxxsupport.Po
+ -rm -f rec-rust-lib/$(DEPDIR)/cxxsettings-generated.Po
+ -rm -f rec-rust-lib/$(DEPDIR)/cxxsupport.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -2835,12 +2895,12 @@
htmlfiles.h: incfiles ${srcdir}/html/* ${srcdir}/html/js/*
- $(AM_V_GEN)$(srcdir)/incfiles > $@.tmp
+ $(AM_V_GEN)$(srcdir)/incfiles ${srcdir} > $@.tmp
@mv $@.tmp $@
# Use patterns to avoid having two instances of generate run simultaneously, a well-known hack for GNU make
rec-metrics-gen%h rec-prometheus-gen%h rec-snmp-gen%h rec-oids-gen%h RECURSOR-MIB%txt: metrics.py metrics_table.py RECURSOR-MIB.in
- $(PYTHON) metrics.py
+ $(PYTHON) ${srcdir}/metrics.py ${srcdir} .
dist-hook:
for file in $$(find $(distdir)/docs -type l); do \
@@ -2853,14 +2913,12 @@
dnslabeltext.cc: dnslabeltext.rl
$(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
-$(srcdir)/effective_tld_names.dat:
- $(curl_verbose)if ! curl -s -S https://publicsuffix.org/list/public_suffix_list.dat > $@; then rm -f $@; exit 1; fi
-pubsuffix.cc: $(srcdir)/effective_tld_names.dat
- $(srcdir)/mkpubsuffixcc $< $@
+pubsuffix.cc:
+ $(srcdir)/mkpubsuffixcc $@
recursor.yml-dist: pdns_recursor
- dir=$$(mktemp -d) && touch "$$dir/recursor.yml" && ./pdns_recursor --config-dir="$$dir" --config=default 2> /dev/null > $@ && rm "$$dir/recursor.yml" && rmdir "$$dir"
+ ./pdns_recursor --config=default 2> /dev/null > $@
@HAVE_MANPAGES_FALSE@@HAVE_VENV_TRUE@$(MANPAGES): %: docs/manpages/%.rst .venv
@HAVE_MANPAGES_FALSE@@HAVE_VENV_TRUE@ $(builddir)/.venv/bin/python -msphinx -b man "$(srcdir)/docs" "$(builddir)" $<
@@ -2902,7 +2960,7 @@
@HAVE_VENV_FALSE@ exit 1
@HAVE_SYSTEMD_TRUE@pdns-recursor.service: pdns-recursor.service.in
-@HAVE_SYSTEMD_TRUE@ $(AM_V_GEN)sed -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
+@HAVE_SYSTEMD_TRUE@ $(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
@HAVE_SYSTEMD_PERCENT_T_TRUE@@HAVE_SYSTEMD_TRUE@@HAVE_SYSTEMD_WITH_RUNTIME_DIR_ENV_FALSE@ $(AM_V_GEN)sed -e 's!/pdns_recursor!& --socket-dir=%t/pdns-recursor!' -i $@
@HAVE_SYSTEMD_LOCK_PERSONALITY_FALSE@@HAVE_SYSTEMD_TRUE@ $(AM_V_GEN)perl -ni -e 'print unless /^LockPersonality/' $@
@HAVE_SYSTEMD_PRIVATE_DEVICES_FALSE@@HAVE_SYSTEMD_TRUE@ $(AM_V_GEN)perl -ni -e 'print unless /^PrivateDevices/' $@
@@ -2931,7 +2989,8 @@
@HAVE_SYSTEMD_TRUE@ -e 's!Recursor!& %i!' \
@HAVE_SYSTEMD_TRUE@ -e 's!SyslogIdentifier=.*!&-%i!' \
@HAVE_SYSTEMD_TRUE@ < $< > $@
-@HAVE_SYSTEMD_PERCENT_T_TRUE@@HAVE_SYSTEMD_TRUE@ $(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' -i $@
+@HAVE_SYSTEMD_PERCENT_T_TRUE@@HAVE_SYSTEMD_TRUE@ $(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' \
+@HAVE_SYSTEMD_PERCENT_T_TRUE@@HAVE_SYSTEMD_TRUE@ -e 's!--socket-dir=%t/pdns-recursor!--config-name=%i --socket-dir=%t/pdns-recursor-%i!' -i $@
@HAVE_SYSTEMD_PERCENT_T_TRUE@@HAVE_SYSTEMD_TRUE@@HAVE_SYSTEMD_WITH_RUNTIME_DIR_ENV_FALSE@ $(AM_V_GEN)sed -e 's!--socket-dir=[^ ]\+!&-%i !' -i $@
@HAVE_LUA_HPP_FALSE@lua.hpp:
@HAVE_LUA_HPP_FALSE@ $(AM_V_GEN)echo 'extern "C" {' > $@
@@ -2943,3 +3002,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
diff -Nru pdns-recursor-5.2.13/RECURSOR-MIB.in pdns-recursor-5.4.9/RECURSOR-MIB.in
--- pdns-recursor-5.2.13/RECURSOR-MIB.in 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/RECURSOR-MIB.in 2026-10-26 08:26:51.000000000 +0000
@@ -15,12 +15,16 @@
FROM SNMPv2-CONF;
rec MODULE-IDENTITY
- LAST-UPDATED "202408280000Z"
+
+ LAST-UPDATED "202509100000Z"
ORGANIZATION "PowerDNS BV"
CONTACT-INFO "support@powerdns.com"
DESCRIPTION
"This MIB module describes information gathered through PowerDNS Recursor."
+ REVISION "202509100000Z"
+ DESCRIPTION "Added metrics related to cookies"
+
REVISION "202505270000Z"
DESCRIPTION "Added metric for missing ECS in reply"
diff -Nru pdns-recursor-5.2.13/RECURSOR-MIB.txt pdns-recursor-5.4.9/RECURSOR-MIB.txt
--- pdns-recursor-5.2.13/RECURSOR-MIB.txt 2026-08-05 12:02:08.000000000 +0000
+++ pdns-recursor-5.4.9/RECURSOR-MIB.txt 2026-10-26 08:26:51.000000000 +0000
@@ -15,12 +15,16 @@
FROM SNMPv2-CONF;
rec MODULE-IDENTITY
- LAST-UPDATED "202408280000Z"
+
+ LAST-UPDATED "202509100000Z"
ORGANIZATION "PowerDNS BV"
CONTACT-INFO "support@powerdns.com"
DESCRIPTION
"This MIB module describes information gathered through PowerDNS Recursor."
+ REVISION "202509100000Z"
+ DESCRIPTION "Added metrics related to cookies"
+
REVISION "202505270000Z"
DESCRIPTION "Added metric for missing ECS in reply"
@@ -1302,6 +1306,70 @@
"Number of answers where ECS info was missing"
::= { stats 153 }
+cookieMalformed OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of malformed cookies received"
+ ::= { stats 154 }
+
+cookieMatched OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of matching cookies received"
+ ::= { stats 155 }
+
+cookieMismatchTcp OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of mismatched cookies received over TCP"
+ ::= { stats 156 }
+
+cookieMismatchUdp OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of mismatched cookies received over UDP"
+ ::= { stats 157 }
+
+cookieNotInReply OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of times an authoritative server sent a reply without a cookie"
+ ::= { stats 158 }
+
+cookieRetry OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of retries because authoritative server sent a BADCOOKIE reply"
+ ::= { stats 159 }
+
+cookiesSupported OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of authoritative server cookie probes resulting in success"
+ ::= { stats 160 }
+
+cookiesUnsupported OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of authoritative server cookie probes not resulting in success"
+ ::= { stats 161 }
+
---
--- Traps / Notifications
---
@@ -1501,7 +1569,15 @@
maxChainWeight,
chainLimits,
tcpOverflow,
- ecsMissing
+ ecsMissing,
+ cookieMalformed,
+ cookieMatched,
+ cookieMismatchTcp,
+ cookieMismatchUdp,
+ cookieNotInReply,
+ cookieRetry,
+ cookiesSupported,
+ cookiesUnsupported
}
STATUS current
DESCRIPTION "Objects conformance group for PowerDNS Recursor"
diff -Nru pdns-recursor-5.2.13/aclocal.m4 pdns-recursor-5.4.9/aclocal.m4
--- pdns-recursor-5.2.13/aclocal.m4 2026-08-05 12:01:43.000000000 +0000
+++ pdns-recursor-5.4.9/aclocal.m4 2026-10-26 09:47:07.395486800 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,8 +14,8 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
-[m4_warning([this file was generated for autoconf 2.71.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
+[m4_warning([this file was generated for autoconf 2.72.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
@@ -68,8 +68,8 @@
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------
dnl Since: 0.16
dnl
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
@@ -77,6 +77,12 @@
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
dnl used since that's the first version where most current features of
dnl pkg-config existed.
+dnl
+dnl If pkg-config is not found or older than specified, it will result
+dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
+dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.
+dnl You can specify [PKG_CONFIG=false] as an action instead, which would
+dnl result in pkg-config tests failing, but no bogus error messages.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -97,6 +103,9 @@
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
+fi
+if test -z "$PKG_CONFIG"; then
+ m4_default([$2], [AC_MSG_ERROR([pkg-config not found])])
fi[]dnl
])dnl PKG_PROG_PKG_CONFIG
@@ -364,7 +373,7 @@
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -376,10 +385,10 @@
# 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.16'
+[am__api_version='1.17'
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.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -395,14 +404,14 @@
# 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.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])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-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -454,7 +463,7 @@
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008-2021 Free Software Foundation, Inc.
+# Copyright (C) 2008-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -491,7 +500,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -522,7 +531,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -654,7 +663,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -713,7 +722,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -781,7 +790,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -915,7 +924,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -923,47 +932,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard:
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'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: .
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -996,7 +967,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1017,7 +988,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1038,7 +1009,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1081,7 +1052,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1115,7 +1086,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1144,7 +1115,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1191,7 +1162,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1225,10 +1196,12 @@
dnl Find a Python interpreter. Python versions prior to 2.0 are not
dnl supported. (2.0 was released on October 16, 2000).
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 dnl
+[python python3 dnl
+ python3.20 python3.19 python3.18 python3.17 python3.16 dnl
python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl
python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
python3.2 python3.1 python3.0 dnl
+ python2 dnl
python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
python2.0])
@@ -1423,15 +1396,29 @@
if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
can_use_sysconfig = 0
except ImportError:
- pass"
+ pass" # end of am_python_setup_sysconfig
+
+ # More repeated code, for figuring out the installation scheme to use.
+ am_python_setup_scheme="if hasattr(sysconfig, 'get_default_scheme'):
+ scheme = sysconfig.get_default_scheme()
+ else:
+ scheme = sysconfig._get_default_scheme()
+ if scheme == 'posix_local':
+ if '$am_py_prefix' == '/usr':
+ scheme = 'deb_system' # should only happen during Debian package builds
+ else:
+ # Debian's default scheme installs to /usr/local/ but we want to
+ # follow the prefix, as we always have.
+ # See bugs#54412, #64837, et al.
+ scheme = 'posix_prefix'" # end of am_python_setup_scheme
dnl emacs-page Set up 4 directories:
dnl 1. pythondir: where to install python scripts. This is the
dnl site-packages directory, not the python standard library
- dnl directory like in previous automake betas. This behavior
+ dnl directory as in early automake betas. This behavior
dnl is more consistent with lispdir.m4 for example.
- dnl Query distutils for this directory.
+ dnl Query sysconfig or distutils (per above) for this directory.
dnl
AC_CACHE_CHECK([for $am_display_PYTHON script directory (pythondir)],
[am_cv_python_pythondir],
@@ -1443,7 +1430,11 @@
am_cv_python_pythondir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+ try:
+ $am_python_setup_scheme
+ sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
+ except:
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
else:
from distutils import sysconfig
sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
@@ -1473,7 +1464,8 @@
dnl 3. pyexecdir: directory for installing python extension modules
dnl (shared libraries).
- dnl Query distutils for this directory.
+ dnl Query sysconfig or distutils for this directory.
+ dnl Much of this is the same as for prefix setup above.
dnl
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory (pyexecdir)],
[am_cv_python_pyexecdir],
@@ -1485,7 +1477,11 @@
am_cv_python_pyexecdir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
+ try:
+ $am_python_setup_scheme
+ sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
+ except:
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
else:
from distutils import sysconfig
sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
@@ -1536,7 +1532,23 @@
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 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_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1555,16 +1567,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 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_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# ; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -1583,49 +1748,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
+
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -1636,18 +1792,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 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_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -1655,11 +1811,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -1678,14 +1829,6 @@
else
am_cv_make_support_nested_variables=no
fi])
-if test $am_cv_make_support_nested_variables = yes; then
- dnl Using '$V' instead of '$(V)' breaks IRIX make.
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AC_SUBST([AM_V])dnl
AM_SUBST_NOTMAKE([AM_V])dnl
AC_SUBST([AM_DEFAULT_V])dnl
@@ -1694,9 +1837,33 @@
AM_BACKSLASH='\'
AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1724,7 +1891,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1743,7 +1910,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1789,15 +1956,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1874,6 +2045,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 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_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([m4/ac_pthread_set_name.m4])
m4_include([m4/ax_arg_default_enable_disable.m4])
m4_include([m4/ax_check_sign.m4])
diff -Nru pdns-recursor-5.2.13/aggressive_nsec.cc pdns-recursor-5.4.9/aggressive_nsec.cc
--- pdns-recursor-5.2.13/aggressive_nsec.cc 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/aggressive_nsec.cc 2026-10-26 08:26:51.000000000 +0000
@@ -172,7 +172,7 @@
auto& sidx = boost::multi_index::get(zoneEntry->d_entries);
const auto toTrimForThisZone = static_cast(std::round(static_cast(toErase) * static_cast(zoneSize) / static_cast(entriesCount)));
if (entriesCount < zoneSize) {
- throw std::runtime_error("Inconsistent agggressive cache " + std::to_string(entriesCount) + " " + std::to_string(zoneSize));
+ throw std::runtime_error("Inconsistent aggressive cache " + std::to_string(entriesCount) + " " + std::to_string(zoneSize));
}
// This is comparable to what cachecleaner.hh::pruneMutexCollectionsVector() is doing, look there for an explanation
entriesCount -= zoneSize;
@@ -262,18 +262,16 @@
{
size_t ret = sizeof(AggressiveNSECCache::ZoneEntry::CacheEntry);
if (d_record) {
- ret += d_record->serialize(g_rootdnsname, true).size();
+ ret += d_record->sizeEstimate();
}
for (const auto& entry : d_signatures) {
if (entry) {
- ret += sizeof(RRSIGRecordContent);
- ret += entry->d_signer.wirelength();
- ret += entry->d_signature.size();
+ ret += entry->sizeEstimate();
}
}
- ret += d_owner.wirelength();
- ret += d_next.wirelength();
- ret += d_qname.wirelength();
+ ret += d_owner.sizeEstimate();
+ ret += d_next.sizeEstimate();
+ ret += d_qname.sizeEstimate();
return ret;
}
@@ -457,7 +455,7 @@
return false;
}
-static void addToRRSet(const time_t now, std::vector& recordSet, std::vector> signatures, const DNSName& owner, bool doDNSSEC, std::vector& ret, DNSResourceRecord::Place place = DNSResourceRecord::AUTHORITY)
+static void addToRRSet(const time_t now, std::vector& recordSet, const MemRecursorCache::SigRecs& signatures, const DNSName& owner, bool doDNSSEC, std::vector& ret, DNSResourceRecord::Place place = DNSResourceRecord::AUTHORITY)
{
uint32_t ttl = 0;
@@ -474,12 +472,12 @@
}
if (doDNSSEC) {
- for (auto& signature : signatures) {
+ for (const auto& signature : *signatures) {
DNSRecord dr;
dr.d_type = QType::RRSIG;
dr.d_name = owner;
dr.d_ttl = ttl;
- dr.setContent(std::move(signature));
+ dr.setContent(signature);
dr.d_place = place;
dr.d_class = QClass::IN;
ret.push_back(std::move(dr));
@@ -517,9 +515,9 @@
vState cachedState;
std::vector wcSet;
- std::vector> wcSignatures;
+ MemRecursorCache::SigRecs wcSignatures = MemRecursorCache::s_emptySigRecs;
- if (g_recCache->get(now, wildcardName, type, MemRecursorCache::RequireAuth, &wcSet, ComboAddress("127.0.0.1"), boost::none, doDNSSEC ? &wcSignatures : nullptr, nullptr, nullptr, &cachedState) <= 0 || cachedState != vState::Secure) {
+ if (g_recCache->get(now, wildcardName, type, MemRecursorCache::RequireAuth, &wcSet, ComboAddress("127.0.0.1"), MemRecursorCache::NOTAG, doDNSSEC ? &wcSignatures : nullptr, nullptr, nullptr, &cachedState) <= 0 || cachedState != vState::Secure) {
VLOG(log, name << ": Unfortunately we don't have a valid entry for " << wildcardName << ", so we cannot synthesize from that wildcard" << endl);
return false;
}
@@ -541,14 +539,14 @@
vState cachedState;
std::vector wcSet;
- std::vector> wcSignatures;
+ MemRecursorCache::SigRecs wcSignatures = MemRecursorCache::s_emptySigRecs;
- if (g_recCache->get(now, wildcardName, type, MemRecursorCache::RequireAuth, &wcSet, ComboAddress("127.0.0.1"), boost::none, doDNSSEC ? &wcSignatures : nullptr, nullptr, nullptr, &cachedState) <= 0 || cachedState != vState::Secure) {
+ if (g_recCache->get(now, wildcardName, type, MemRecursorCache::RequireAuth, &wcSet, ComboAddress("127.0.0.1"), MemRecursorCache::NOTAG, doDNSSEC ? &wcSignatures : nullptr, nullptr, nullptr, &cachedState) <= 0 || cachedState != vState::Secure) {
VLOG(log, name << ": Unfortunately we don't have a valid entry for " << wildcardName << ", so we cannot synthesize from that wildcard" << endl);
return false;
}
- addToRRSet(now, wcSet, std::move(wcSignatures), name, doDNSSEC, ret, DNSResourceRecord::ANSWER);
+ addToRRSet(now, wcSet, wcSignatures, name, doDNSSEC, ret, DNSResourceRecord::ANSWER);
// coverity[store_truncates_time_t]
addRecordToRRSet(nsec.d_owner, QType::NSEC, nsec.d_ttd - now, nsec.d_record, nsec.d_signatures, doDNSSEC, ret);
@@ -558,7 +556,7 @@
return true;
}
-bool AggressiveNSECCache::getNSEC3Denial(time_t now, std::shared_ptr>& zoneEntry, std::vector& soaSet, std::vector>& soaSignatures, const DNSName& name, const QType& type, std::vector& ret, int& res, bool doDNSSEC, const OptLog& log, pdns::validation::ValidationContext& validationContext)
+bool AggressiveNSECCache::getNSEC3Denial(time_t now, std::shared_ptr>& zoneEntry, std::vector& soaSet, const MemRecursorCache::SigRecs& soaSignatures, const DNSName& name, const QType& type, std::vector& ret, int& res, bool doDNSSEC, const OptLog& log, pdns::validation::ValidationContext& validationContext)
{
DNSName zone;
std::string salt;
@@ -664,6 +662,20 @@
return false;
}
+ if (nsec3->isSet(QType::DNAME)) {
+ /* rfc6672 section 5.3.2: DNAME Bit in NSEC Type Map
+
+ In any negative response, the NSEC or NSEC3 [RFC5155] record type
+ bitmap SHOULD be checked to see that there was no DNAME that could
+ have been applied. If the DNAME bit in the type bitmap is set and
+ the query name is a subdomain of the closest encloser that is
+ asserted, then DNAME substitution should have been done, but the
+ substitution has not been done as specified.
+ */
+ VLOG_NO_PREFIX(log, " but this NSEC3 has the DNAME bit set");
+ return false;
+ }
+
found = true;
break;
}
@@ -796,7 +808,7 @@
return true;
}
-bool AggressiveNSECCache::getDenial(time_t now, const DNSName& name, const QType& type, std::vector& ret, int& res, const ComboAddress& who, const boost::optional& routingTag, bool doDNSSEC, pdns::validation::ValidationContext& validationContext, const OptLog& log)
+bool AggressiveNSECCache::getDenial(time_t now, const DNSName& name, const QType& type, std::vector& ret, int& res, const ComboAddress& who, const std::string& routingTag, bool doDNSSEC, pdns::validation::ValidationContext& validationContext, const OptLog& log)
{
std::shared_ptr> zoneEntry;
if (type == QType::DS) {
@@ -828,7 +840,7 @@
vState cachedState;
std::vector soaSet;
- std::vector> soaSignatures;
+ MemRecursorCache::SigRecs soaSignatures = MemRecursorCache::s_emptySigRecs;
/* we might not actually need the SOA if we find a matching wildcard, but let's not bother for now */
if (g_recCache->get(now, zone, QType::SOA, MemRecursorCache::RequireAuth, &soaSet, who, routingTag, doDNSSEC ? &soaSignatures : nullptr, nullptr, nullptr, &cachedState) <= 0 || cachedState != vState::Secure) {
VLOG(log, name << ": No valid SOA found for " << zone << ", which is the best match for " << name << endl);
@@ -917,9 +929,9 @@
return false;
}
- ret.reserve(ret.size() + soaSet.size() + soaSignatures.size() + /* NSEC */ 1 + entry.d_signatures.size() + (needWildcard ? (/* NSEC */ 1 + wcEntry.d_signatures.size()) : 0));
+ ret.reserve(ret.size() + soaSet.size() + soaSignatures->size() + /* NSEC */ 1 + entry.d_signatures.size() + (needWildcard ? (/* NSEC */ 1 + wcEntry.d_signatures.size()) : 0));
- addToRRSet(now, soaSet, std::move(soaSignatures), zone, doDNSSEC, ret);
+ addToRRSet(now, soaSet, soaSignatures, zone, doDNSSEC, ret);
// coverity[store_truncates_time_t]
addRecordToRRSet(entry.d_owner, QType::NSEC, entry.d_ttd - now, entry.d_record, entry.d_signatures, doDNSSEC, ret);
diff -Nru pdns-recursor-5.2.13/aggressive_nsec.hh pdns-recursor-5.4.9/aggressive_nsec.hh
--- pdns-recursor-5.2.13/aggressive_nsec.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/aggressive_nsec.hh 2026-10-26 08:26:51.000000000 +0000
@@ -38,6 +38,7 @@
#include "stat_t.hh"
#include "logger.hh"
#include "validate.hh"
+#include "recursor_cache.hh"
class AggressiveNSECCache
{
@@ -63,7 +64,7 @@
}
void insertNSEC(const DNSName& zone, const DNSName& owner, const DNSRecord& record, const std::vector>& signatures, bool nsec3, const DNSName& qname = g_rootdnsname, QType qtype = QType::ENT);
- bool getDenial(time_t, const DNSName& name, const QType& type, std::vector& ret, int& res, const ComboAddress& who, const boost::optional& routingTag, bool doDNSSEC, pdns::validation::ValidationContext& validationContext, const OptLog& log = std::nullopt);
+ bool getDenial(time_t, const DNSName& name, const QType& type, std::vector& ret, int& res, const ComboAddress& who, const MemRecursorCache::OptTag& routingTag, bool doDNSSEC, pdns::validation::ValidationContext& validationContext, const OptLog& log = std::nullopt);
void removeZoneInfo(const DNSName& zone, bool subzones);
@@ -157,7 +158,7 @@
std::shared_ptr> getBestZone(const DNSName& zone);
bool getNSECBefore(time_t now, std::shared_ptr>& zoneEntry, const DNSName& name, ZoneEntry::CacheEntry& entry);
bool getNSEC3(time_t now, std::shared_ptr>& zoneEntry, const DNSName& name, ZoneEntry::CacheEntry& entry);
- bool getNSEC3Denial(time_t now, std::shared_ptr>& zoneEntry, std::vector& soaSet, std::vector>& soaSignatures, const DNSName& name, const QType& type, std::vector& ret, int& res, bool doDNSSEC, const OptLog&, pdns::validation::ValidationContext& validationContext);
+ bool getNSEC3Denial(time_t now, std::shared_ptr>& zoneEntry, std::vector& soaSet, const MemRecursorCache::SigRecs& soaSignatures, const DNSName& name, const QType& type, std::vector& ret, int& res, bool doDNSSEC, const OptLog&, pdns::validation::ValidationContext& validationContext);
bool synthesizeFromNSEC3Wildcard(time_t now, const DNSName& name, const QType& type, std::vector& ret, int& res, bool doDNSSEC, ZoneEntry::CacheEntry& nextCloser, const DNSName& wildcardName, const OptLog&);
bool synthesizeFromNSECWildcard(time_t now, const DNSName& name, const QType& type, std::vector& ret, int& res, bool doDNSSEC, ZoneEntry::CacheEntry& nsec, const DNSName& wildcardName, const OptLog&);
diff -Nru pdns-recursor-5.2.13/arguments.cc pdns-recursor-5.4.9/arguments.cc
--- pdns-recursor-5.2.13/arguments.cc 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/arguments.cc 2026-10-26 09:46:36.000000000 +0000
@@ -111,7 +111,7 @@
vector parts;
stringtok(parts, param->second, ", \t");
- return std::any_of(parts.begin(), parts.end(), [&](const std::string& str) { return str == val; });
+ return std::find(parts.begin(), parts.end(), val) != parts.end();
}
string ArgvMap::helpstring(string prefix)
@@ -350,15 +350,6 @@
// ATM Shared between Recursor and Auth, is that a good idea?
static const map deprecateList = {
- {"stats-api-blacklist", "stats-api-disabled-list"},
- {"stats-carbon-blacklist", "stats-carbon-disabled-list"},
- {"stats-rec-control-blacklist", "stats-rec-control-disabled-list"},
- {"stats-snmp-blacklist", "stats-snmp-disabled-list"},
- {"edns-subnet-whitelist", "edns-subnet-allow-list"},
- {"new-domain-whitelist", "new-domain-ignore-list"},
- {"snmp-master-socket", "snmp-daemon-socket"},
- {"xpf-allow-from", "Proxy Protocol"},
- {"xpf-rr-code", "Proxy Protocol"},
{"domain-metadata-cache-ttl", "zone-metadata-cache-ttl"},
};
@@ -433,7 +424,7 @@
}
else {
d_params[var] = val;
- d_cleared.insert(var);
+ d_cleared.insert(std::move(var));
}
}
else {
@@ -583,14 +574,12 @@
// build name
string fullName = directory + "/" + std::string(name);
// ensure it's readable file
- struct stat statInfo
- {
- };
+ struct stat statInfo{};
if (stat(fullName.c_str(), &statInfo) != 0 || !S_ISREG(statInfo.st_mode)) {
string msg = fullName + " is not a regular file";
SLOG(g_log << Logger::Error << msg << std::endl,
d_log->info(Logr::Error, "Unable to open non-regular file", "name", Logging::Loggable(fullName)));
- throw ArgException(msg);
+ throw ArgException(std::move(msg));
}
vec.emplace_back(fullName);
}
@@ -602,7 +591,7 @@
string msg = directory + " is not accessible: " + stringerror(err);
SLOG(g_log << Logger::Error << msg << std::endl,
d_log->error(Logr::Error, err, "Directory is not accessible", "name", Logging::Loggable(directory)));
- throw ArgException(msg);
+ throw ArgException(std::move(msg));
}
std::sort(vec.begin(), vec.end(), CIStringComparePOSIX());
diff -Nru pdns-recursor-5.2.13/auth-catalogzone.hh pdns-recursor-5.4.9/auth-catalogzone.hh
--- pdns-recursor-5.2.13/auth-catalogzone.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/auth-catalogzone.hh 2026-10-26 09:46:36.000000000 +0000
@@ -28,7 +28,7 @@
struct DomainInfo;
-typedef map CatalogHashMap;
+typedef map CatalogHashMap;
class CatalogInfo
{
@@ -48,7 +48,7 @@
CatalogInfo() :
d_id(0), d_type(CatalogType::None) {}
- CatalogInfo(uint32_t id, const DNSName& zone, const std::string& options, CatalogType type)
+ CatalogInfo(uint32_t id, const ZoneName& zone, const std::string& options, CatalogType type)
{
d_id = id;
d_zone = zone;
@@ -60,9 +60,9 @@
void setType(CatalogType type) { d_type = type; }
void updateHash(CatalogHashMap& hashes, const DomainInfo& di) const;
- DNSName getUnique() const { return DNSName(toBase32Hex(hashQNameWithSalt(std::to_string(d_id), 0, d_zone))); } // salt with domain id to detect recreated zones
- static DNSZoneRecord getCatalogVersionRecord(const DNSName& zone);
- void toDNSZoneRecords(const DNSName& zone, vector& dzrs) const;
+ DNSName getUnique() const { return DNSName(toBase32Hex(hashQNameWithSalt(std::to_string(d_id), 0, DNSName(d_zone)))); } // salt with domain id to detect recreated zones
+ static DNSZoneRecord getCatalogVersionRecord(const ZoneName& zone);
+ void toDNSZoneRecords(const ZoneName& zone, vector& dzrs) const;
bool operator<(const CatalogInfo& rhs) const
{
@@ -70,7 +70,8 @@
}
uint32_t d_id;
- DNSName d_zone, d_coo, d_unique;
+ ZoneName d_zone;
+ DNSName d_coo, d_unique;
std::set d_group;
vector d_primaries;
diff -Nru pdns-recursor-5.2.13/axfr-retriever.cc pdns-recursor-5.4.9/axfr-retriever.cc
--- pdns-recursor-5.2.13/axfr-retriever.cc 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/axfr-retriever.cc 2026-10-26 09:46:36.000000000 +0000
@@ -30,12 +30,12 @@
using pdns::resolver::parseResult;
AXFRRetriever::AXFRRetriever(const ComboAddress& remote,
- const DNSName& domain,
- const TSIGTriplet& tt,
+ const ZoneName& domain,
+ const TSIGTriplet& tsigConf,
const ComboAddress* laddr,
size_t maxReceivedBytes,
- uint16_t timeout)
- : d_buf(65536), d_tsigVerifier(tt, remote, d_trc), d_receivedBytes(0), d_maxReceivedBytes(maxReceivedBytes)
+ uint16_t timeout) :
+ d_buf(65536), d_tsigVerifier(tsigConf, remote, d_trc), d_maxReceivedBytes(maxReceivedBytes)
{
ComboAddress local;
if (laddr != nullptr) {
@@ -57,19 +57,21 @@
d_soacount = 0;
vector packet;
- DNSPacketWriter pw(packet, domain, QType::AXFR);
- pw.getHeader()->id = dns_random_uint16();
-
- if(!tt.name.empty()) {
- if (tt.algo == DNSName("hmac-md5"))
- d_trc.d_algoName = tt.algo + DNSName("sig-alg.reg.int");
- else
- d_trc.d_algoName = tt.algo;
+ DNSPacketWriter pwriter(packet, DNSName(domain), QType::AXFR);
+ pwriter.getHeader()->id = dns_random_uint16();
+
+ if (!tsigConf.name.empty()) {
+ if (tsigConf.algo == g_hmacmd5dnsname) {
+ d_trc.d_algoName = g_hmacmd5dnsname_long;
+ }
+ else {
+ d_trc.d_algoName = tsigConf.algo;
+ }
d_trc.d_time = time(nullptr);
d_trc.d_fudge = 300;
- d_trc.d_origID=ntohs(pw.getHeader()->id);
+ d_trc.d_origID=ntohs(pwriter.getHeader()->id);
d_trc.d_eRcode=0;
- addTSIG(pw, d_trc, tt.name, tt.secret, "", false);
+ addTSIG(pwriter, d_trc, tsigConf.name, tsigConf.secret, "", false);
}
uint16_t replen=htons(packet.size());
@@ -103,7 +105,9 @@
AXFRRetriever::~AXFRRetriever()
{
- close(d_sock);
+ if (d_sock != -1) {
+ close(d_sock);
+ }
}
@@ -216,6 +220,7 @@
throw ResolverException("Error closing AXFR socket after connect() failed: "+e.reason);
}
+ d_sock = -1;
throw ResolverException("connect: "+stringerror());
}
diff -Nru pdns-recursor-5.2.13/axfr-retriever.hh pdns-recursor-5.4.9/axfr-retriever.hh
--- pdns-recursor-5.2.13/axfr-retriever.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/axfr-retriever.hh 2026-10-26 09:46:36.000000000 +0000
@@ -30,7 +30,7 @@
{
public:
AXFRRetriever(const ComboAddress& remote,
- const DNSName& zone,
+ const ZoneName& zone,
const TSIGTriplet& tt = TSIGTriplet(),
const ComboAddress* laddr = NULL,
size_t maxReceivedBytes=0,
@@ -51,6 +51,6 @@
TSIGRecordContent d_trc;
TSIGTCPVerifier d_tsigVerifier;
- size_t d_receivedBytes;
+ size_t d_receivedBytes{0};
size_t d_maxReceivedBytes;
};
diff -Nru pdns-recursor-5.2.13/base64.cc pdns-recursor-5.4.9/base64.cc
--- pdns-recursor-5.2.13/base64.cc 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/base64.cc 2026-10-26 09:46:36.000000000 +0000
@@ -19,36 +19,49 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
+
#include "config.h"
-#endif
+
#include "base64.hh"
+#include
+#include
#include
+
#include
#include
#include
-template int B64Decode(const std::string& src, Container& dst)
+template
+int B64Decode(const std::string& src, Container& dst)
{
- if (src.empty() ) {
+ if (src.empty()) {
dst.clear();
return 0;
}
- int dlen = ( src.length() * 6 + 7 ) / 8 ;
- ssize_t olen = 0;
+ // check if the dlen computation might overflow or it does not fit into an int (for IO_write)
+ if (src.length() > std::numeric_limits::max() / 7U || src.length() > std::numeric_limits::max()) {
+ throw std::runtime_error("B64Decode too large");
+ }
+ const size_t dlen = (src.length() * 6U + 7U) / 8U;
dst.resize(dlen);
- BIO *bio, *b64;
- bio = BIO_new(BIO_s_mem());
- BIO_write(bio, src.c_str(), src.length());
- b64 = BIO_new(BIO_f_base64());
- bio = BIO_push(b64, bio);
- BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL);
- olen = BIO_read(b64, &dst.at(0), dlen);
- if ((olen == 0 || olen == -1) && BIO_should_retry(bio)) {
- BIO_free_all(bio);
+ auto bio = std::unique_ptr(BIO_new(BIO_s_mem()), BIO_free_all);
+ if (!bio) {
+ throw std::runtime_error("BIO_new failed");
+ }
+ if (BIO_write(bio.get(), src.c_str(), src.length()) != static_cast(src.length())) {
+ throw std::runtime_error("BIO_write failed");
+ }
+ auto* b64 = BIO_new(BIO_f_base64());
+ if (b64 == nullptr) {
+ throw std::runtime_error("BIO_new failed");
+ }
+ bio = std::unique_ptr(BIO_push(b64, bio.release()), BIO_free_all);
+ BIO_set_flags(bio.get(), BIO_FLAGS_BASE64_NO_NL);
+ auto olen = BIO_read(b64, &dst.at(0), dlen);
+ if ((olen == 0 || olen == -1) && BIO_should_retry(bio.get())) {
throw std::runtime_error("BIO_read failed to read all data from memory buffer");
}
- BIO_free_all(bio);
+ bio.reset();
if (olen > 0) {
dst.resize(olen);
return 0;
@@ -61,25 +74,28 @@
std::string Base64Encode(const std::string& src)
{
if (!src.empty()) {
- size_t olen = 0;
- BIO *bio, *b64;
- b64 = BIO_new(BIO_f_base64());
- bio = BIO_new(BIO_s_mem());
- bio = BIO_push(b64, bio);
- BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL);
- int bioWriteRet = BIO_write(bio, src.c_str(), src.length());
- if (bioWriteRet < 0 || (size_t) bioWriteRet != src.length()) {
- BIO_free_all(bio);
+ auto bio = std::unique_ptr(BIO_new(BIO_s_mem()), BIO_free_all);
+ if (!bio) {
+ throw std::runtime_error("BIO_new failed");
+ }
+ auto* b64 = BIO_new(BIO_f_base64());
+ if (b64 == nullptr) {
+ throw std::runtime_error("BIO_new failed");
+ }
+ bio = std::unique_ptr(BIO_push(b64, bio.release()), BIO_free_all);
+ BIO_set_flags(bio.get(), BIO_FLAGS_BASE64_NO_NL);
+ int bioWriteRet = BIO_write(bio.get(), src.c_str(), src.length());
+ if (bioWriteRet < 0 || static_cast(bioWriteRet) != src.length()) {
throw std::runtime_error("BIO_write failed to write all data to memory buffer");
}
- (void)BIO_flush(bio);
+ (void)BIO_flush(bio.get());
char* pp;
std::string out;
- olen = BIO_get_mem_data(bio, &pp);
+ auto olen = BIO_get_mem_data(bio.get(), &pp);
if (olen > 0) {
out = std::string(pp, olen);
}
- BIO_free_all(bio);
+ bio.reset();
return out;
}
return "";
diff -Nru pdns-recursor-5.2.13/base64.hh pdns-recursor-5.4.9/base64.hh
--- pdns-recursor-5.2.13/base64.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/base64.hh 2026-10-26 09:46:36.000000000 +0000
@@ -22,5 +22,6 @@
#pragma once
#include
-template int B64Decode(const std::string& strInput, Container& strOutput);
-std::string Base64Encode (const std::string& src);
+template
+int B64Decode(const std::string& strInput, Container& strOutput);
+std::string Base64Encode(const std::string& src);
diff -Nru pdns-recursor-5.2.13/build-aux/compile pdns-recursor-5.4.9/build-aux/compile
--- pdns-recursor-5.2.13/build-aux/compile 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/compile 2026-10-26 09:47:08.729288300 +0000
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -143,7 +143,7 @@
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
- *.o | *.[oO][bB][jJ])
+ *.o | *.lo | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
@@ -248,14 +248,17 @@
right script to run: please start by reading the file 'INSTALL'.
Report bugs to .
+GNU Automake home page: .
+General help using GNU software: .
EOF
exit $?
;;
-v | --v*)
- echo "compile $scriptversion"
+ echo "compile (GNU Automake) $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
diff -Nru pdns-recursor-5.2.13/build-aux/config.guess pdns-recursor-5.4.9/build-aux/config.guess
--- pdns-recursor-5.2.13/build-aux/config.guess 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/config.guess 2026-10-26 09:47:08.730288300 +0000
@@ -1,14 +1,14 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2024 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2021-06-03'
+timestamp='2024-01-01'
# 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
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -47,7 +47,7 @@
usage="\
Usage: $0 [OPTION]
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
Options:
-h, --help print this help, then exit
@@ -60,13 +60,13 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2024 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."
help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
@@ -102,8 +102,8 @@
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
+# use 'HOST_CC' if defined, but it is deprecated.
# Portable tmp directory creation inspired by the Autoconf team.
@@ -155,6 +155,9 @@
set_cc_for_build
cat <<-EOF > "$dummy.c"
+ #if defined(__ANDROID__)
+ LIBC=android
+ #else
#include
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -162,6 +165,8 @@
LIBC=dietlibc
#elif defined(__GLIBC__)
LIBC=gnu
+ #elif defined(__LLVM_LIBC__)
+ LIBC=llvm
#else
#include
/* First heuristic to detect musl libc. */
@@ -169,6 +174,7 @@
LIBC=musl
#endif
#endif
+ #endif
EOF
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
eval "$cc_set_libc"
@@ -437,7 +443,7 @@
# This test works for both compilers.
if test "$CC_FOR_BUILD" != no_compiler_found; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
SUN_ARCH=x86_64
@@ -459,7 +465,7 @@
UNAME_RELEASE=`uname -v`
;;
esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
+ # Japanese Language versions have a version number like '4.1.3-JL'.
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
GUESS=sparc-sun-sunos$SUN_REL
;;
@@ -904,7 +910,7 @@
fi
;;
*:FreeBSD:*:*)
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ UNAME_PROCESSOR=`uname -p`
case $UNAME_PROCESSOR in
amd64)
UNAME_PROCESSOR=x86_64 ;;
@@ -929,6 +935,9 @@
i*:PW*:*)
GUESS=$UNAME_MACHINE-pc-pw32
;;
+ *:SerenityOS:*:*)
+ GUESS=$UNAME_MACHINE-pc-serenity
+ ;;
*:Interix*:*)
case $UNAME_MACHINE in
x86)
@@ -963,11 +972,37 @@
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
;;
+ x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
+ GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+ ;;
+ *:[Mm]anagarm:*:*)
+ GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+ ;;
*:Minix:*:*)
GUESS=$UNAME_MACHINE-unknown-minix
;;
aarch64:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ set_cc_for_build
+ CPU=$UNAME_MACHINE
+ LIBCABI=$LIBC
+ if test "$CC_FOR_BUILD" != no_compiler_found; then
+ ABI=64
+ sed 's/^ //' << EOF > "$dummy.c"
+ #ifdef __ARM_EABI__
+ #ifdef __ARM_PCS_VFP
+ ABI=eabihf
+ #else
+ ABI=eabi
+ #endif
+ #endif
+EOF
+ cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+ eval "$cc_set_abi"
+ case $ABI in
+ eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
+ esac
+ fi
+ GUESS=$CPU-unknown-linux-$LIBCABI
;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
@@ -1033,7 +1068,16 @@
k1om:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
- loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+ kvx:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ kvx:cos:*:*)
+ GUESS=$UNAME_MACHINE-unknown-cos
+ ;;
+ kvx:mbr:*:*)
+ GUESS=$UNAME_MACHINE-unknown-mbr
+ ;;
+ loongarch32:Linux:*:* | loongarch64:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
m32r*:Linux:*:*)
@@ -1148,16 +1192,27 @@
;;
x86_64:Linux:*:*)
set_cc_for_build
+ CPU=$UNAME_MACHINE
LIBCABI=$LIBC
if test "$CC_FOR_BUILD" != no_compiler_found; then
- if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_X32 >/dev/null
- then
- LIBCABI=${LIBC}x32
- fi
+ ABI=64
+ sed 's/^ //' << EOF > "$dummy.c"
+ #ifdef __i386__
+ ABI=x86
+ #else
+ #ifdef __ILP32__
+ ABI=x32
+ #endif
+ #endif
+EOF
+ cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+ eval "$cc_set_abi"
+ case $ABI in
+ x86) CPU=i686 ;;
+ x32) LIBCABI=${LIBC}x32 ;;
+ esac
fi
- GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+ GUESS=$CPU-pc-linux-$LIBCABI
;;
xtensa*:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1177,7 +1232,7 @@
GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
;;
i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
+ # If we were able to find 'uname', then EMX Unix compatibility
# is probably installed.
GUESS=$UNAME_MACHINE-pc-os2-emx
;;
@@ -1318,7 +1373,7 @@
GUESS=ns32k-sni-sysv
fi
;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
# says
GUESS=i586-unisys-sysv4
;;
@@ -1364,8 +1419,11 @@
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
GUESS=i586-pc-haiku
;;
- x86_64:Haiku:*:*)
- GUESS=x86_64-unknown-haiku
+ ppc:Haiku:*:*) # Haiku running on Apple PowerPC
+ GUESS=powerpc-apple-haiku
+ ;;
+ *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat)
+ GUESS=$UNAME_MACHINE-unknown-haiku
;;
SX-4:SUPER-UX:*:*)
GUESS=sx4-nec-superux$UNAME_RELEASE
@@ -1522,6 +1580,9 @@
i*86:rdos:*:*)
GUESS=$UNAME_MACHINE-pc-rdos
;;
+ i*86:Fiwix:*:*)
+ GUESS=$UNAME_MACHINE-pc-fiwix
+ ;;
*:AROS:*:*)
GUESS=$UNAME_MACHINE-unknown-aros
;;
@@ -1534,6 +1595,9 @@
*:Unleashed:*:*)
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
;;
+ *:Ironclad:*:*)
+ GUESS=$UNAME_MACHINE-unknown-ironclad
+ ;;
esac
# Do we have a guess based on uname results?
diff -Nru pdns-recursor-5.2.13/build-aux/config.sub pdns-recursor-5.4.9/build-aux/config.sub
--- pdns-recursor-5.2.13/build-aux/config.sub 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/config.sub 2026-10-26 09:47:08.731288400 +0000
@@ -1,14 +1,14 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2024 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2021-08-14'
+timestamp='2024-01-01'
# 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
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -76,13 +76,13 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2024 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."
help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
@@ -130,7 +130,7 @@
# Separate into logical components for further validation
case $1 in
*-*-*-*-*)
- echo Invalid configuration \`"$1"\': more than four components >&2
+ echo "Invalid configuration '$1': more than four components" >&2
exit 1
;;
*-*-*-*)
@@ -145,7 +145,8 @@
nto-qnx* | linux-* | uclinux-uclibc* \
| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
- | storm-chaos* | os2-emx* | rtmk-nova*)
+ | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+ | windows-* )
basic_machine=$field1
basic_os=$maybe_os
;;
@@ -943,7 +944,7 @@
EOF
IFS=$saved_IFS
;;
- # We use `pc' rather than `unknown'
+ # We use 'pc' rather than 'unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64)
@@ -1020,6 +1021,11 @@
;;
# Here we normalize CPU types with a missing or matching vendor
+ armh-unknown | armh-alt)
+ cpu=armv7l
+ vendor=alt
+ basic_os=${basic_os:-linux-gnueabihf}
+ ;;
dpx20-unknown | dpx20-bull)
cpu=rs6000
vendor=bull
@@ -1070,7 +1076,7 @@
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
cpu=i586
;;
- pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
cpu=i686
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1121,7 +1127,7 @@
xscale-* | xscalee[bl]-*)
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
- arm64-*)
+ arm64-* | aarch64le-*)
cpu=aarch64
;;
@@ -1175,7 +1181,7 @@
case $cpu in
1750a | 580 \
| a29k \
- | aarch64 | aarch64_be \
+ | aarch64 | aarch64_be | aarch64c | arm64ec \
| abacus \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
@@ -1194,50 +1200,29 @@
| d10v | d30v | dlx | dsp16xx \
| e2k | elxsi | epiphany \
| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+ | javascript \
| h8300 | h8500 \
| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i*86 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
+ | kvx \
| le32 | le64 \
| lm32 \
- | loongarch32 | loongarch64 | loongarchx32 \
+ | loongarch32 | loongarch64 \
| m32c | m32r | m32rle \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
| m88110 | m88k | maxq | mb | mcore | mep | metag \
| microblaze | microblazeel \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64eb | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa32r3 | mipsisa32r3el \
- | mipsisa32r5 | mipsisa32r5el \
- | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64r3 | mipsisa64r3el \
- | mipsisa64r5 | mipsisa64r5el \
- | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
+ | mips* \
| mmix \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
+ | nanomips* \
| nds32 | nds32le | nds32be \
| nfp \
| nios | nios2 | nios2eb | nios2el \
@@ -1269,6 +1254,7 @@
| ubicom32 \
| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
| vax \
+ | vc4 \
| visium \
| w65 \
| wasm32 | wasm64 \
@@ -1280,7 +1266,7 @@
;;
*)
- echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+ echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
exit 1
;;
esac
@@ -1301,11 +1287,12 @@
# Decode manufacturer-specific aliases for certain operating systems.
-if test x$basic_os != x
+if test x"$basic_os" != x
then
-# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
# set os.
+obj=
case $basic_os in
gnu/linux*)
kernel=linux
@@ -1336,6 +1323,10 @@
kernel=linux
os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
;;
+ managarm*)
+ kernel=managarm
+ os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
+ ;;
*)
kernel=
os=$basic_os
@@ -1501,10 +1492,16 @@
os=eabi
;;
*)
- os=elf
+ os=
+ obj=elf
;;
esac
;;
+ aout* | coff* | elf* | pe*)
+ # These are machine code file formats, not OSes
+ obj=$os
+ os=
+ ;;
*)
# No normalization, but not necessarily accepted, that comes below.
;;
@@ -1523,12 +1520,15 @@
# system, and we'll never get to this point.
kernel=
+obj=
case $cpu-$vendor in
score-*)
- os=elf
+ os=
+ obj=elf
;;
spu-*)
- os=elf
+ os=
+ obj=elf
;;
*-acorn)
os=riscix1.2
@@ -1538,28 +1538,35 @@
os=gnu
;;
arm*-semi)
- os=aout
+ os=
+ obj=aout
;;
c4x-* | tic4x-*)
- os=coff
+ os=
+ obj=coff
;;
c8051-*)
- os=elf
+ os=
+ obj=elf
;;
clipper-intergraph)
os=clix
;;
hexagon-*)
- os=elf
+ os=
+ obj=elf
;;
tic54x-*)
- os=coff
+ os=
+ obj=coff
;;
tic55x-*)
- os=coff
+ os=
+ obj=coff
;;
tic6x-*)
- os=coff
+ os=
+ obj=coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1581,19 +1588,24 @@
os=sunos3
;;
m68*-cisco)
- os=aout
+ os=
+ obj=aout
;;
mep-*)
- os=elf
+ os=
+ obj=elf
;;
mips*-cisco)
- os=elf
+ os=
+ obj=elf
;;
- mips*-*)
- os=elf
+ mips*-*|nanomips*-*)
+ os=
+ obj=elf
;;
or32-*)
- os=coff
+ os=
+ obj=coff
;;
*-tti) # must be before sparc entry or we get the wrong os.
os=sysv3
@@ -1602,7 +1614,8 @@
os=sunos4.1.1
;;
pru-*)
- os=elf
+ os=
+ obj=elf
;;
*-be)
os=beos
@@ -1683,10 +1696,12 @@
os=uxpv
;;
*-rom68k)
- os=coff
+ os=
+ obj=coff
;;
*-*bug)
- os=coff
+ os=
+ obj=coff
;;
*-apple)
os=macos
@@ -1704,10 +1719,11 @@
fi
-# Now, validate our (potentially fixed-up) OS.
+# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
+
case $os in
# Sometimes we do "kernel-libc", so those need to count as OSes.
- musl* | newlib* | relibc* | uclibc*)
+ llvm* | musl* | newlib* | relibc* | uclibc*)
;;
# Likewise for "kernel-abi"
eabi* | gnueabi*)
@@ -1715,6 +1731,9 @@
# VxWorks passes extra cpu info in the 4th filed.
simlinux | simwindows | spe)
;;
+ # See `case $cpu-$os` validation below
+ ghcjs)
+ ;;
# Now accept the basic system types.
# The portable systems comes first.
# Each alternative MUST end in a * to match a version number.
@@ -1723,7 +1742,7 @@
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
| sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
| hiux* | abug | nacl* | netware* | windows* \
- | os9* | macos* | osx* | ios* \
+ | os9* | macos* | osx* | ios* | tvos* | watchos* \
| mpw* | magic* | mmixware* | mon960* | lnews* \
| amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
| aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -1732,11 +1751,11 @@
| mirbsd* | netbsd* | dicos* | openedition* | ose* \
| bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
| ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
- | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
- | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+ | bosx* | nextstep* | cxux* | oabi* \
+ | ptx* | ecoff* | winnt* | domain* | vsta* \
| udi* | lites* | ieee* | go32* | aux* | hcos* \
| chorusrdb* | cegcc* | glidix* | serenity* \
- | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+ | cygwin* | msys* | moss* | proelf* | rtems* \
| midipix* | mingw32* | mingw64* | mint* \
| uxpv* | beos* | mpeix* | udk* | moxiebox* \
| interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1748,49 +1767,117 @@
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+ | fiwix* | mlibc* | cos* | mbr* | ironclad* )
;;
# This one is extra strict with allowed versions
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
;;
+ # This refers to builds using the UEFI calling convention
+ # (which depends on the architecture) and PE file format.
+ # Note that this is both a different calling convention and
+ # different file format than that of GNU-EFI
+ # (x86_64-w64-mingw32).
+ uefi)
+ ;;
none)
;;
+ kernel* | msvc* )
+ # Restricted further below
+ ;;
+ '')
+ if test x"$obj" = x
+ then
+ echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
+ fi
+ ;;
*)
- echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+ echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
+ exit 1
+ ;;
+esac
+
+case $obj in
+ aout* | coff* | elf* | pe*)
+ ;;
+ '')
+ # empty is fine
+ ;;
+ *)
+ echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we handle the constraint that a (synthetic) cpu and os are
+# valid only in combination with each other and nowhere else.
+case $cpu-$os in
+ # The "javascript-unknown-ghcjs" triple is used by GHC; we
+ # accept it here in order to tolerate that, but reject any
+ # variations.
+ javascript-ghcjs)
+ ;;
+ javascript-* | *-ghcjs)
+ echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
exit 1
;;
esac
# As a final step for OS-related things, validate the OS-kernel combination
# (given a valid OS), if there is a kernel.
-case $kernel-$os in
- linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
- | linux-musl* | linux-relibc* | linux-uclibc* )
+case $kernel-$os-$obj in
+ linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+ | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+ | linux-relibc*- | linux-uclibc*- )
+ ;;
+ uclinux-uclibc*- )
+ ;;
+ managarm-mlibc*- | managarm-kernel*- )
;;
- uclinux-uclibc* )
+ windows*-msvc*-)
;;
- -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+ -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
+ | -uclibc*- )
# These are just libc implementations, not actual OSes, and thus
# require a kernel.
- echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+ echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
exit 1
;;
- kfreebsd*-gnu* | kopensolaris*-gnu*)
+ -kernel*- )
+ echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
+ exit 1
;;
- vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+ *-kernel*- )
+ echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
+ exit 1
;;
- nto-qnx*)
+ *-msvc*- )
+ echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
+ exit 1
;;
- os2-emx)
+ kfreebsd*-gnu*- | kopensolaris*-gnu*-)
+ ;;
+ vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
+ ;;
+ nto-qnx*-)
+ ;;
+ os2-emx-)
;;
- *-eabi* | *-gnueabi*)
+ *-eabi*- | *-gnueabi*-)
;;
- -*)
+ none--*)
+ # None (no kernel, i.e. freestanding / bare metal),
+ # can be paired with an machine code file format
+ ;;
+ -*-)
# Blank kernel with real OS is always fine.
;;
- *-*)
- echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+ --*)
+ # Blank kernel and OS with real machine code file format is always fine.
+ ;;
+ *-*-*)
+ echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
exit 1
;;
esac
@@ -1873,7 +1960,7 @@
;;
esac
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
exit
# Local variables:
diff -Nru pdns-recursor-5.2.13/build-aux/depcomp pdns-recursor-5.4.9/build-aux/depcomp
--- pdns-recursor-5.2.13/build-aux/depcomp 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/depcomp 2026-10-26 09:47:08.762288800 +0000
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -47,11 +47,13 @@
libtool Whether libtool is used (yes/no).
Report bugs to .
+GNU Automake home page: .
+General help using GNU software: .
EOF
exit $?
;;
-v | --v*)
- echo "depcomp $scriptversion"
+ echo "depcomp (GNU Automake) $scriptversion"
exit $?
;;
esac
@@ -113,7 +115,6 @@
# These definitions help.
upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
alpha=${upper}${lower}
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
@@ -128,7 +129,7 @@
rm -f "$tmpdepfile"
-# Avoid interferences from the environment.
+# Avoid interference from the environment.
gccflag= dashmflag=
# Some modes work just like other modes, but use different flags. We
@@ -198,8 +199,8 @@
;;
gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
+## but also to in-use compilers like IBM xlc/xlC and the HP C compiler.
## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
diff -Nru pdns-recursor-5.2.13/build-aux/gen-version pdns-recursor-5.4.9/build-aux/gen-version
--- pdns-recursor-5.2.13/build-aux/gen-version 1970-01-01 00:00:00.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/gen-version 2026-10-26 09:46:36.000000000 +0000
@@ -0,0 +1,77 @@
+#!/bin/sh
+if [ ! -z "${BUILDER_VERSION}" ]; then
+ printf ${BUILDER_VERSION}
+ exit 0
+fi
+
+VERSION="unknown"
+
+DIRTY=""
+git status | grep -q clean || DIRTY='.dirty'
+
+# Special environment variable to signal that we are building a release, as this
+# has consequences for the version number.
+if [ "${IS_RELEASE}" = "YES" ]; then
+ TAG="$(git describe --tags --exact-match 2> /dev/null | cut -d- -f 2-)"
+ if [ -n "${TAG}" ]; then
+ # We're on a tag
+ echo "${TAG}${DIRTY}" > .version
+ printf "${TAG}${DIRTY}"
+ exit 0
+ fi
+ echo 'This is not a tag, either tag this commit or do not set $IS_RELEASE' >&2
+ exit 1
+fi
+
+#
+# Generate the version number based on the branch
+#
+if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then
+ if [ -n "${BUILDER_MODULES}" ]; then
+ match=${BUILDER_MODULES}
+ [ $match = "authoritative" ] && match='auth'
+ [ $match = "recursor" ] && match='rec'
+ GIT_VERSION="$(git describe --match=${match}-* --tags | cut -d- -f2-)"
+ if [ $(echo ${GIT_VERSION} | awk -F"-" '{print NF-1}') = '3' ]; then
+ # A prerelease happened before
+ LAST_TAG="$(echo ${GIT_VERSION} | cut -d- -f1-2)"
+ COMMITS_SINCE_TAG="$(echo ${GIT_VERSION} | cut -d- -f3)"
+ GIT_HASH="$(echo ${GIT_VERSION} | cut -d- -f4)"
+ elif [ $(echo ${GIT_VERSION} | awk -F"-" '{print NF-1}') = '1' ]; then
+ # Exactly on a pre-release
+ LAST_TAG="$(echo ${GIT_VERSION} | cut -d- -f1-2)"
+ else
+ LAST_TAG="$(echo ${GIT_VERSION} | cut -d- -f1)"
+ COMMITS_SINCE_TAG="$(echo ${GIT_VERSION} | cut -d- -f2)"
+ GIT_HASH="$(echo ${GIT_VERSION} | cut -d- -f3)"
+ fi
+ fi
+
+ if [ -z "${GIT_VERSION}" ]; then
+ # BUILDER_SUPPORT has more than one product listed, fall back to the 0.0.0 logic
+
+ # We used 0.0.XXXXgHASH for master in the previous incarnation of our build pipeline.
+ # This now becomes 0.0.XXXX.0.gHASH, as 0.0.0.XXXX.gHASH (which is more correct)
+ # would break upgrades for those running master
+ # This _should_ be ok for forever if we stick to X.Y.Z for version numbers
+ LAST_TAG=0.0
+ COMMITS_SINCE_TAG="$(git rev-list --count 12c868770afc20b6cc0da439d881105151d557dd..HEAD 2> /dev/null).0"
+ [ "${COMMITS_SINCE_TAG}" = ".0" ] && COMMITS_SINCE_TAG=0.0
+ GIT_HASH="g$(git rev-parse HEAD | cut -c1-10 2> /dev/null)"
+ fi
+
+ BRANCH=".$(git rev-parse --abbrev-ref HEAD | perl -p -e 's/[^[:alnum:]]//g;')"
+
+ TAG="$(git describe --tags --exact-match 2> /dev/null | cut -d- -f 2-)"
+ if [ -n "${TAG}" ]; then # We're exactly on a tag
+ COMMITS_SINCE_TAG="0"
+ GIT_HASH="g$(git show --no-patch --format=format:%h HEAD 2>/dev/null)"
+ if [ -z "$GIT_HASH" ]; then
+ GIT_HASH="g$(git show --format=format:%h HEAD | head -n1)"
+ fi
+ fi
+
+ VERSION="${LAST_TAG}.${COMMITS_SINCE_TAG}${BRANCH}.${GIT_HASH}${DIRTY}"
+fi
+
+printf $VERSION
diff -Nru pdns-recursor-5.2.13/build-aux/install-sh pdns-recursor-5.4.9/build-aux/install-sh
--- pdns-recursor-5.2.13/build-aux/install-sh 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/install-sh 2026-10-26 09:47:08.732288400 +0000
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2020-11-14.01; # UTC
+scriptversion=2024-06-19.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -124,9 +124,9 @@
If -S is not specified, no backups are attempted.
-Email bug reports to bug-automake@gnu.org.
-Automake home page: https://www.gnu.org/software/automake/
-"
+Report bugs to .
+GNU Automake home page: .
+General help using GNU software: ."
while test $# -ne 0; do
case $1 in
@@ -170,7 +170,7 @@
-T) is_target_a_directory=never;;
- --version) echo "$0 $scriptversion"; exit $?;;
+ --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
--) shift
break;;
@@ -345,7 +345,7 @@
' 0
# Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directly in world-writable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
@@ -353,7 +353,7 @@
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
+ # Check for POSIX incompatibility with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
diff -Nru pdns-recursor-5.2.13/build-aux/missing pdns-recursor-5.4.9/build-aux/missing
--- pdns-recursor-5.2.13/build-aux/missing 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/missing 2026-10-26 09:47:08.733288300 +0000
@@ -1,9 +1,11 @@
#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common wrapper for a few potentially missing GNU and other programs.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-07.14; # UTC
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
+
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -54,18 +56,20 @@
-v, --version output version information and exit
Supported PROGRAM values:
- aclocal autoconf autoheader autom4te automake makeinfo
- bison yacc flex lex help2man
+aclocal autoconf autogen autoheader autom4te automake autoreconf
+bison flex help2man lex makeinfo perl yacc
Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
'g' are ignored when checking the name.
-Send bug reports to ."
+Report bugs to .
+GNU Automake home page: .
+General help using GNU software: ."
exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
+ echo "missing (GNU Automake) $scriptversion"
exit $?
;;
@@ -108,7 +112,7 @@
program_details ()
{
case $1 in
- aclocal|automake)
+ aclocal|automake|autoreconf)
echo "The '$1' program is part of the GNU Automake package:"
echo "<$gnu_software_URL/automake>"
echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
@@ -123,6 +127,9 @@
echo "<$gnu_software_URL/m4/>"
echo "<$perl_URL>"
;;
+ *)
+ :
+ ;;
esac
}
@@ -137,48 +144,55 @@
printf '%s\n' "'$1' is $msg."
configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ autoheader_deps="'acconfig.h'"
+ automake_deps="'Makefile.am'"
+ aclocal_deps="'acinclude.m4'"
case $normalized_program in
+ aclocal*)
+ echo "You should only need it if you modified $aclocal_deps or"
+ echo "$configure_deps."
+ ;;
autoconf*)
- echo "You should only need it if you modified 'configure.ac',"
- echo "or m4 files included by it."
- program_details 'autoconf'
+ echo "You should only need it if you modified $configure_deps."
+ ;;
+ autogen*)
+ echo "You should only need it if you modified a '.def' or '.tpl' file."
+ echo "You may want to install the GNU AutoGen package:"
+ echo "<$gnu_software_URL/autogen/>"
;;
autoheader*)
- echo "You should only need it if you modified 'acconfig.h' or"
+ echo "You should only need it if you modified $autoheader_deps or"
echo "$configure_deps."
- program_details 'autoheader'
;;
automake*)
- echo "You should only need it if you modified 'Makefile.am' or"
- echo "$configure_deps."
- program_details 'automake'
- ;;
- aclocal*)
- echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "You should only need it if you modified $automake_deps or"
echo "$configure_deps."
- program_details 'aclocal'
;;
- autom4te*)
+ autom4te*)
echo "You might have modified some maintainer files that require"
echo "the 'autom4te' program to be rebuilt."
- program_details 'autom4te'
+ ;;
+ autoreconf*)
+ echo "You should only need it if you modified $aclocal_deps or"
+ echo "$automake_deps or $autoheader_deps or $automake_deps or"
+ echo "$configure_deps."
;;
bison*|yacc*)
echo "You should only need it if you modified a '.y' file."
echo "You may want to install the GNU Bison package:"
echo "<$gnu_software_URL/bison/>"
;;
- lex*|flex*)
- echo "You should only need it if you modified a '.l' file."
- echo "You may want to install the Fast Lexical Analyzer package:"
- echo "<$flex_URL>"
- ;;
help2man*)
echo "You should only need it if you modified a dependency" \
"of a man page."
echo "You may want to install the GNU Help2man package:"
echo "<$gnu_software_URL/help2man/>"
;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
makeinfo*)
echo "You should only need it if you modified a '.texi' file, or"
echo "any other file indirectly affecting the aspect of the manual."
@@ -189,6 +203,12 @@
echo "want to install GNU make:"
echo "<$gnu_software_URL/make/>"
;;
+ perl*)
+ echo "You should only need it to run GNU Autoconf, GNU Automake, "
+ echo " assorted other tools, or if you modified a Perl source file."
+ echo "You may want to install the Perl 5 language interpreter:"
+ echo "<$perl_URL>"
+ ;;
*)
echo "You might have modified some files without having the proper"
echo "tools for further handling them. Check the 'README' file, it"
@@ -197,6 +217,7 @@
echo "case some other package contains this missing '$1' program."
;;
esac
+ program_details "$normalized_program"
}
give_advice "$1" | sed -e '1s/^/WARNING: /' \
diff -Nru pdns-recursor-5.2.13/build-aux/test-driver pdns-recursor-5.4.9/build-aux/test-driver
--- pdns-recursor-5.2.13/build-aux/test-driver 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/build-aux/test-driver 2026-10-26 09:47:08.773289000 +0000
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
-# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2024 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -44,11 +44,16 @@
Usage:
test-driver --test-name NAME --log-file PATH --trs-file PATH
[--expect-failure {yes|no}] [--color-tests {yes|no}]
+ [--collect-skipped-logs {yes|no}]
[--enable-hard-errors {yes|no}] [--]
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
See the GNU Automake documentation for information.
+
+Report bugs to .
+GNU Automake home page: .
+General help using GNU software: .
END
}
@@ -57,15 +62,17 @@
trs_file= # Where to save the metadata of the test run.
expect_failure=no
color_tests=no
+collect_skipped_logs=yes
enable_hard_errors=yes
while test $# -gt 0; do
case $1 in
--help) print_usage; exit $?;;
- --version) echo "test-driver $scriptversion"; exit $?;;
+ --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;;
--test-name) test_name=$2; shift;;
--log-file) log_file=$2; shift;;
--trs-file) trs_file=$2; shift;;
--color-tests) color_tests=$2; shift;;
+ --collect-skipped-logs) collect_skipped_logs=$2; shift;;
--expect-failure) expect_failure=$2; shift;;
--enable-hard-errors) enable_hard_errors=$2; shift;;
--) shift; break;;
@@ -121,7 +128,7 @@
case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
- 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
+ 77:*) col=$blu res=SKIP recheck=no gcopy=$collect_skipped_logs;;
99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
*:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
diff -Nru pdns-recursor-5.2.13/builder-support/gen-version pdns-recursor-5.4.9/builder-support/gen-version
--- pdns-recursor-5.2.13/builder-support/gen-version 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/builder-support/gen-version 2026-10-26 08:26:51.000000000 +0000
@@ -10,7 +10,7 @@
git status | grep -q clean || DIRTY='.dirty'
# Special environment variable to signal that we are building a release, as this
-# has consequenses for the version number.
+# has consequences for the version number.
if [ "${IS_RELEASE}" = "YES" ]; then
TAG="$(git describe --tags --exact-match 2> /dev/null | cut -d- -f 2-)"
if [ -n "${TAG}" ]; then
@@ -53,7 +53,7 @@
# We used 0.0.XXXXgHASH for master in the previous incarnation of our build pipeline.
# This now becomes 0.0.XXXX.0.gHASH, as 0.0.0.XXXX.gHASH (which is more correct)
# would break upgrades for those running master
- # This _should_ be ok for forever is we stick to X.Y.Z for version numbers
+ # This _should_ be ok for forever if we stick to X.Y.Z for version numbers
LAST_TAG=0.0
COMMITS_SINCE_TAG="$(git rev-list --count 12c868770afc20b6cc0da439d881105151d557dd..HEAD 2> /dev/null).0"
[ "${COMMITS_SINCE_TAG}" = ".0" ] && COMMITS_SINCE_TAG=0.0
diff -Nru pdns-recursor-5.2.13/burtle.hh pdns-recursor-5.4.9/burtle.hh
--- pdns-recursor-5.2.13/burtle.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/burtle.hh 2026-10-26 09:46:36.000000000 +0000
@@ -178,3 +178,9 @@
/*-------------------------------------------- report the result */
return c;
}
+
+template
+inline uint32_t burtleCI(const T& k, uint32_t initval)
+{
+ return burtleCI(reinterpret_cast(k.data()), k.length(), initval); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): can't static_cast because of sign difference
+}
diff -Nru pdns-recursor-5.2.13/cachecleaner.hh pdns-recursor-5.4.9/cachecleaner.hh
--- pdns-recursor-5.2.13/cachecleaner.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/cachecleaner.hh 2026-10-26 09:46:36.000000000 +0000
@@ -197,7 +197,7 @@
//
// Suppose we have 10 perfectly balanced shards, each filled with
// 100 entries. So cacheSize is 1000. When cleaning 10%, after shard
- // 0 we still need to processs 900 entries, spread out of 9
+ // 0 we still need to process 900 entries, spread out of 9
// shards. So cacheSize becomes 900, and toTrim 90, since we cleaned
// 10 items from shard 0. Our fraction remains 10%. For the last
// shard, we would end up with cacheSize 100, and to clean 10.
diff -Nru pdns-recursor-5.2.13/channel.hh pdns-recursor-5.4.9/channel.hh
--- pdns-recursor-5.2.13/channel.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/channel.hh 2026-10-26 09:46:36.000000000 +0000
@@ -24,29 +24,7 @@
#include
#include "misc.hh"
-
-/* g++ defines __SANITIZE_THREAD__
- clang++ supports the nice __has_feature(thread_sanitizer),
- let's merge them */
-#if defined(__has_feature)
-#if __has_feature(thread_sanitizer)
-#define __SANITIZE_THREAD__ 1
-#endif
-#endif
-
-#if __SANITIZE_THREAD__
-#if defined __has_include
-#if __has_include()
-#include
-#else /* __has_include() */
-extern "C" void __tsan_acquire(void* addr);
-extern "C" void __tsan_release(void* addr);
-#endif /* __has_include() */
-#else /* defined __has_include */
-extern "C" void __tsan_acquire(void* addr);
-extern "C" void __tsan_release(void* addr);
-#endif /* defined __has_include */
-#endif /* __SANITIZE_THREAD__ */
+#include "sanitizer.hh"
namespace pdns
{
@@ -243,7 +221,7 @@
not even to release it, so let's transfer it to a local object */
auto localObj = std::move(object);
auto ptr = localObj.get();
- static_assert(sizeof(ptr) <= PIPE_BUF, "Writes up to PIPE_BUF are guaranted not to interleaved and to either fully succeed or fail");
+ static_assert(sizeof(ptr) <= PIPE_BUF, "Writes up to PIPE_BUF are guaranteed not to interleaved and to either fully succeed or fail");
while (true) {
#if __SANITIZE_THREAD__
__tsan_release(ptr);
diff -Nru pdns-recursor-5.2.13/comment.hh pdns-recursor-5.4.9/comment.hh
--- pdns-recursor-5.2.13/comment.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/comment.hh 2026-10-26 09:46:36.000000000 +0000
@@ -27,15 +27,12 @@
class Comment
{
public:
- Comment() : modified_at(0), domain_id(0) {};
- ~Comment() = default;
-
// data
DNSName qname; //!< the name of the associated RRset, for example: www.powerdns.com
- time_t modified_at;
+ time_t modified_at{0};
string account; //!< account last updating this comment
string content; //!< The actual comment. Example: blah blah
- int domain_id;
+ domainid_t domain_id{0};
QType qtype; //!< qtype of the associated RRset, ie A, CNAME, MX etc
};
diff -Nru pdns-recursor-5.2.13/config.h.in pdns-recursor-5.4.9/config.h.in
--- pdns-recursor-5.2.13/config.h.in 2026-08-05 12:01:45.000000000 +0000
+++ pdns-recursor-5.4.9/config.h.in 2026-10-26 09:47:08.545204200 +0000
@@ -3,16 +3,16 @@
/* Set to the user and host that builds PowerDNS */
#undef BUILD_HOST
-/* Define to 1 if you have the `accept4' function. */
+/* Define to 1 if you have the 'accept4' function. */
#undef HAVE_ACCEPT4
-/* Define to 1 if you have the `arc4random' function. */
+/* Define to 1 if you have the 'arc4random' function. */
#undef HAVE_ARC4RANDOM
-/* Define to 1 if you have the `arc4random_buf' function. */
+/* Define to 1 if you have the 'arc4random_buf' function. */
#undef HAVE_ARC4RANDOM_BUF
-/* Define to 1 if you have the `arc4random_uniform' function. */
+/* Define to 1 if you have the 'arc4random_uniform' function. */
#undef HAVE_ARC4RANDOM_UNIFORM
/* Defined if the requested minimum BOOST version is satisfied */
@@ -57,43 +57,43 @@
/* Define to 1 if you have clock_gettime */
#undef HAVE_CLOCK_GETTIME
-/* Define to 1 if you have the `crypto_box_curve25519xchacha20poly1305_easy'
+/* Define to 1 if you have the 'crypto_box_curve25519xchacha20poly1305_easy'
function. */
#undef HAVE_CRYPTO_BOX_CURVE25519XCHACHA20POLY1305_EASY
-/* Define to 1 if you have the `crypto_box_easy_afternm' function. */
+/* Define to 1 if you have the 'crypto_box_easy_afternm' function. */
#undef HAVE_CRYPTO_BOX_EASY_AFTERNM
-/* Define to 1 if you have the `CRYPTO_memcmp' function. */
+/* Define to 1 if you have the 'CRYPTO_memcmp' function. */
#undef HAVE_CRYPTO_MEMCMP
-/* Define to 1 if you have the `crypto_shorthash' function. */
+/* Define to 1 if you have the 'crypto_shorthash' function. */
#undef HAVE_CRYPTO_SHORTHASH
/* define if the compiler supports basic C++17 syntax */
#undef HAVE_CXX17
-/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you
+/* Define to 1 if you have the declaration of 'NID_ED25519', and to 0 if you
don't. */
#undef HAVE_DECL_NID_ED25519
-/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you
+/* Define to 1 if you have the declaration of 'NID_ED448', and to 0 if you
don't. */
#undef HAVE_DECL_NID_ED448
-/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you
+/* Define to 1 if you have the declaration of 'NID_secp384r1', and to 0 if you
don't. */
#undef HAVE_DECL_NID_SECP384R1
-/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0
+/* Define to 1 if you have the declaration of 'NID_X9_62_prime256v1', and to 0
if you don't. */
#undef HAVE_DECL_NID_X9_62_PRIME256V1
-/* Define to 1 if you have the declaration of `snmp_select_info2', and to 0 if
+/* Define to 1 if you have the declaration of 'snmp_select_info2', and to 0 if
you don't. */
#undef HAVE_DECL_SNMP_SELECT_INFO2
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+/* Define to 1 if you have the declaration of 'strerror_r', and to 0 if you
don't. */
#undef HAVE_DECL_STRERROR_R
@@ -103,19 +103,19 @@
/* Define to 1 if you enable DNS over TLS support */
#undef HAVE_DNS_OVER_TLS
-/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
+/* Define to 1 if you have the 'EVP_MD_CTX_free' function. */
#undef HAVE_EVP_MD_CTX_FREE
-/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
+/* Define to 1 if you have the 'EVP_MD_CTX_new' function. */
#undef HAVE_EVP_MD_CTX_NEW
/* Define to 1 if you have EVP_PKEY_CTX_set1_scrypt_salt */
#undef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
-/* Define to 1 if you have the `explicit_bzero' function. */
+/* Define to 1 if you have the 'explicit_bzero' function. */
#undef HAVE_EXPLICIT_BZERO
-/* Define to 1 if you have the `explicit_memset' function. */
+/* Define to 1 if you have the 'explicit_memset' function. */
#undef HAVE_EXPLICIT_MEMSET
/* Define if ASAN fiber annotation interface is available. */
@@ -124,19 +124,19 @@
/* Define to 1 if you have libfstrm */
#undef HAVE_FSTRM
-/* Define to 1 if you have the `fstrm_tcp_writer_init' function. */
+/* Define to 1 if you have the 'fstrm_tcp_writer_init' function. */
#undef HAVE_FSTRM_TCP_WRITER_INIT
-/* Define to 1 if you have the `getentropy' function. */
+/* Define to 1 if you have the 'getentropy' function. */
#undef HAVE_GETENTROPY
/* Define to 1 if you have getifaddrs */
#undef HAVE_GETIFADDRS
-/* Define to 1 if you have the `getrandom' function. */
+/* Define to 1 if you have the 'getrandom' function. */
#undef HAVE_GETRANDOM
-/* Define to 1 if you have the `gmtime_r' function. */
+/* Define to 1 if you have the 'gmtime_r' function. */
#undef HAVE_GMTIME_R
/* Define to 1 if you have the header file. */
@@ -172,13 +172,13 @@
/* Define to 1 if you have OpenSSL libssl */
#undef HAVE_LIBSSL
-/* Define to 1 if you have the `localtime_r' function. */
+/* Define to 1 if you have the 'localtime_r' function. */
#undef HAVE_LOCALTIME_R
/* Define to 1 if you have lua */
#undef HAVE_LUA
-/* Define to 1 if you have the `memset_s' function. */
+/* Define to 1 if you have the 'memset_s' function. */
#undef HAVE_MEMSET_S
/* Define to 1 if you have the header file. */
@@ -187,10 +187,10 @@
/* Define if using Net SNMP. */
#undef HAVE_NET_SNMP
-/* Define to 1 if you have the `OCSP_basic_sign' function. */
+/* Define to 1 if you have the 'OCSP_basic_sign' function. */
#undef HAVE_OCSP_BASIC_SIGN
-/* Define to 1 if you have the `OPENSSL_init_crypto' function. */
+/* Define to 1 if you have the 'OPENSSL_init_crypto' function. */
#undef HAVE_OPENSSL_INIT_CRYPTO
/* Define to 1 if you have pthread_getattr_np */
@@ -223,19 +223,19 @@
/* 2-arg void pthread_set_name_np */
#undef HAVE_PTHREAD_SET_NAME_NP_2_VOID
-/* Define to 1 if you have the `randombytes_stir' function. */
+/* Define to 1 if you have the 'randombytes_stir' function. */
#undef HAVE_RANDOMBYTES_STIR
-/* Define to 1 if you have the `RAND_bytes' function. */
+/* Define to 1 if you have the 'RAND_bytes' function. */
#undef HAVE_RAND_BYTES
-/* Define to 1 if you have the `RAND_pseudo_bytes' function. */
+/* Define to 1 if you have the 'RAND_pseudo_bytes' function. */
#undef HAVE_RAND_PSEUDO_BYTES
-/* Define to 1 if you have the `recvmmsg' function. */
+/* Define to 1 if you have the 'recvmmsg' function. */
#undef HAVE_RECVMMSG
-/* Define to 1 if you have the `RSA_get0_key' function. */
+/* Define to 1 if you have the 'RSA_get0_key' function. */
#undef HAVE_RSA_GET0_KEY
/* Define to 1 if you have the header
@@ -251,49 +251,49 @@
/* Define to 1 if you have the header file. */
#undef HAVE_SANITIZER_LSAN_INTERFACE_H
-/* Define to 1 if you have the `sendmmsg' function. */
+/* Define to 1 if you have the 'sendmmsg' function. */
#undef HAVE_SENDMMSG
/* define to 1 if snmp_select_info2 is available. */
#undef HAVE_SNMP_SELECT_INFO2
-/* Define to 1 if you have the `sodium_memcmp' function. */
+/* Define to 1 if you have the 'sodium_memcmp' function. */
#undef HAVE_SODIUM_MEMCMP
-/* Define to 1 if you have the `SSL_CTX_get0_privatekey' function. */
+/* Define to 1 if you have the 'SSL_CTX_get0_privatekey' function. */
#undef HAVE_SSL_CTX_GET0_PRIVATEKEY
-/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */
+/* Define to 1 if you have the 'SSL_CTX_set_alpn_protos' function. */
#undef HAVE_SSL_CTX_SET_ALPN_PROTOS
-/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */
+/* Define to 1 if you have the 'SSL_CTX_set_alpn_select_cb' function. */
#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */
+/* Define to 1 if you have the 'SSL_CTX_set_ciphersuites' function. */
#undef HAVE_SSL_CTX_SET_CIPHERSUITES
-/* Define to 1 if you have the `SSL_CTX_set_keylog_callback' function. */
+/* Define to 1 if you have the 'SSL_CTX_set_keylog_callback' function. */
#undef HAVE_SSL_CTX_SET_KEYLOG_CALLBACK
-/* Define to 1 if you have the `SSL_CTX_set_min_proto_version' function. */
+/* Define to 1 if you have the 'SSL_CTX_set_min_proto_version' function. */
#undef HAVE_SSL_CTX_SET_MIN_PROTO_VERSION
-/* Define to 1 if you have the `SSL_CTX_set_next_proto_select_cb' function. */
+/* Define to 1 if you have the 'SSL_CTX_set_next_proto_select_cb' function. */
#undef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
-/* Define to 1 if you have the `SSL_CTX_set_num_tickets' function. */
+/* Define to 1 if you have the 'SSL_CTX_set_num_tickets' function. */
#undef HAVE_SSL_CTX_SET_NUM_TICKETS
-/* Define to 1 if you have the `SSL_CTX_use_cert_and_key' function. */
+/* Define to 1 if you have the 'SSL_CTX_use_cert_and_key' function. */
#undef HAVE_SSL_CTX_USE_CERT_AND_KEY
-/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */
+/* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */
#undef HAVE_SSL_GET0_ALPN_SELECTED
-/* Define to 1 if you have the `SSL_get0_next_proto_negotiated' function. */
+/* Define to 1 if you have the 'SSL_get0_next_proto_negotiated' function. */
#undef HAVE_SSL_GET0_NEXT_PROTO_NEGOTIATED
-/* Define to 1 if you have the `SSL_set_hostflags' function. */
+/* Define to 1 if you have the 'SSL_set_hostflags' function. */
#undef HAVE_SSL_SET_HOSTFLAGS
/* Define to 1 if you have the header file. */
@@ -305,10 +305,7 @@
/* Define to 1 if you have the header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strcasestr' function. */
-#undef HAVE_STRCASESTR
-
-/* Define if you have `strerror_r'. */
+/* Define if you have 'strerror_r'. */
#undef HAVE_STRERROR_R
/* Define to 1 if you have the header file. */
@@ -443,16 +440,13 @@
/* Define if using Valgrind. */
#undef PDNS_USE_VALGRIND
-/* This is the PowerDNS Recursor */
-#undef RECURSOR
-
/* Define to 1 for reproducible builds */
#undef REPRODUCIBLE
/* The number of bytes in type time_t */
#undef SIZEOF_TIME_T
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
backward compatibility; new code need not use it. */
#undef STDC_HEADERS
@@ -460,7 +454,7 @@
/* Define to 1 if strerror_r returns char *. */
#undef STRERROR_R_CHAR_P
-/* Enable extensions on AIX 3, Interix. */
+/* Enable extensions on AIX, Interix, z/OS. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
@@ -521,11 +515,15 @@
#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
# undef __STDC_WANT_IEC_60559_DFP_EXT__
#endif
+/* Enable extensions specified by C23 Annex F. */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
#endif
-/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */
#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
# undef __STDC_WANT_IEC_60559_TYPES_EXT__
#endif
diff -Nru pdns-recursor-5.2.13/configure pdns-recursor-5.4.9/configure
--- pdns-recursor-5.2.13/configure 2026-08-05 12:01:44.000000000 +0000
+++ pdns-recursor-5.4.9/configure 2026-10-26 09:47:08.032277300 +0000
@@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for pdns-recursor 5.2.13.
+# Generated by GNU Autoconf 2.72 for pdns-recursor 5.4.9.
#
#
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
# Inc.
#
#
@@ -15,7 +15,6 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
@@ -24,12 +23,13 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else $as_nop
- case `(set -o) 2>/dev/null` in #(
+else case e in #(
+ e) case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
*) :
;;
+esac ;;
esac
fi
@@ -101,7 +101,7 @@
;;
esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
# in which case we are not to be found in the path.
if test "x$as_myself" = x; then
as_myself=$0
@@ -131,15 +131,14 @@
esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
+# out after a failed 'exec'.
printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
exit 255
fi
# We don't want this to propagate to other subprocesses.
{ _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+ as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
NULLCMD=:
@@ -147,12 +146,13 @@
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
-else \$as_nop
- case \`(set -o) 2>/dev/null\` in #(
+else case e in #(
+ e) case \`(set -o) 2>/dev/null\` in #(
*posix*) :
set -o posix ;; #(
*) :
;;
+esac ;;
esac
fi
"
@@ -170,8 +170,9 @@
if ( set x; as_fn_ret_success y && test x = \"\$1\" )
then :
-else \$as_nop
- exitcode=1; echo positional parameters were not saved.
+else case e in #(
+ e) exitcode=1; echo positional parameters were not saved. ;;
+esac
fi
test x\$exitcode = x0 || exit 1
blah=\$(echo \$(echo blah))
@@ -193,14 +194,15 @@
if (eval "$as_required") 2>/dev/null
then :
as_have_required=yes
-else $as_nop
- as_have_required=no
+else case e in #(
+ e) as_have_required=no ;;
+esac
fi
if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
then :
-else $as_nop
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
@@ -233,12 +235,13 @@
if $as_found
then :
-else $as_nop
- if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+else case e in #(
+ e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
then :
CONFIG_SHELL=$SHELL as_have_required=yes
-fi
+fi ;;
+esac
fi
@@ -260,7 +263,7 @@
esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
+# out after a failed 'exec'.
printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
exit 255
fi
@@ -279,7 +282,8 @@
$0: the script under such a shell if you do have one."
fi
exit 1
-fi
+fi ;;
+esac
fi
fi
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -318,14 +322,6 @@
as_fn_set_status $1
exit $1
} # as_fn_exit
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
- return $?
-}
-as_nop=as_fn_nop
# as_fn_mkdir_p
# -------------
@@ -394,11 +390,12 @@
{
eval $1+=\$2
}'
-else $as_nop
- as_fn_append ()
+else case e in #(
+ e) as_fn_append ()
{
eval $1=\$$1\$2
- }
+ } ;;
+esac
fi # as_fn_append
# as_fn_arith ARG...
@@ -412,21 +409,14 @@
{
as_val=$(( $* ))
}'
-else $as_nop
- as_fn_arith ()
+else case e in #(
+ e) as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
- }
+ } ;;
+esac
fi # as_fn_arith
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
- return $?
-}
-as_nop=as_fn_nop
# as_fn_error STATUS ERROR [LINENO LOG_FD]
# ----------------------------------------
@@ -500,6 +490,8 @@
/[$]LINENO/=
' <$as_myself |
sed '
+ t clear
+ :clear
s/[$]LINENO.*/&-/
t lineno
b
@@ -548,7 +540,6 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
-
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
@@ -560,9 +551,9 @@
if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
# ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+ # In both cases, we have to default to 'cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -587,10 +578,12 @@
as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -618,8 +611,8 @@
# Identity of this package.
PACKAGE_NAME='pdns-recursor'
PACKAGE_TARNAME='pdns-recursor'
-PACKAGE_VERSION='5.2.13'
-PACKAGE_STRING='pdns-recursor 5.2.13'
+PACKAGE_VERSION='5.4.9'
+PACKAGE_STRING='pdns-recursor 5.4.9'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -851,12 +844,12 @@
DUMPBIN
LD
FGREP
+EGREP
+GREP
LIBTOOL
CARGO
SED
HAVE_CXX17
-EGREP
-GREP
CXXCPP
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
@@ -889,6 +882,8 @@
LDFLAGS
CFLAGS
CC
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -1148,7 +1143,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: \`$ac_useropt'"
+ as_fn_error $? "invalid feature name: '$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1174,7 +1169,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: \`$ac_useropt'"
+ as_fn_error $? "invalid feature name: '$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1387,7 +1382,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: \`$ac_useropt'"
+ as_fn_error $? "invalid package name: '$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1403,7 +1398,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: \`$ac_useropt'"
+ as_fn_error $? "invalid package name: '$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1433,8 +1428,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error $? "unrecognized option: '$ac_option'
+Try '$0 --help' for more information"
;;
*=*)
@@ -1442,7 +1437,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1492,7 +1487,7 @@
as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
-# There might be people who depend on the old broken behavior: `$host'
+# There might be people who depend on the old broken behavior: '$host'
# used to hold the argument of --host etc.
# FIXME: To remove some day.
build=$build_alias
@@ -1560,7 +1555,7 @@
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
ac_abs_confdir=`(
cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
@@ -1588,7 +1583,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pdns-recursor 5.2.13 to adapt to many kinds of systems.
+'configure' configures pdns-recursor 5.4.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1602,11 +1597,11 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print 'checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
+ -C, --config-cache alias for '--cache-file=config.cache'
-n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
+ --srcdir=DIR find the sources in DIR [configure dir or '..']
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -1614,10 +1609,10 @@
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[PREFIX]
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
+By default, 'make install' will install all the files in
+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than '$ac_default_prefix' using '--prefix',
+for instance '--prefix=\$HOME'.
For better control, use the options below.
@@ -1659,7 +1654,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pdns-recursor 5.2.13:";;
+ short | recursive ) echo "Configuration of pdns-recursor 5.4.9:";;
esac
cat <<\_ACEOF
@@ -1792,7 +1787,7 @@
linker flags for SYSTEMD, overriding pkg-config
PYTHON the Python interpreter
-Use these variables to override the choices made by `configure' or to help
+Use these variables to override the choices made by 'configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to the package provider.
@@ -1859,10 +1854,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pdns-recursor configure 5.2.13
-generated by GNU Autoconf 2.71
+pdns-recursor configure 5.4.9
+generated by GNU Autoconf 2.72
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1901,11 +1896,12 @@
} && test -s conftest.$ac_objext
then :
ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_retval=1 ;;
+esac
fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
@@ -1924,8 +1920,8 @@
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
#include <$2>
@@ -1933,10 +1929,12 @@
if ac_fn_c_try_compile "$LINENO"
then :
eval "$3=yes"
-else $as_nop
- eval "$3=no"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1973,11 +1971,12 @@
} && test -s conftest.$ac_objext
then :
ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_retval=1 ;;
+esac
fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
@@ -2011,11 +2010,12 @@
}
then :
ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_retval=1 ;;
+esac
fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
@@ -2053,11 +2053,12 @@
}
then :
ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_retval=1 ;;
+esac
fi
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -2080,15 +2081,15 @@
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Define $2 to an innocuous variant, in case declares $2.
For example, HP-UX 11i declares gettimeofday. */
#define $2 innocuous_$2
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below. */
+ which can conflict with char $2 (void); below. */
#include
#undef $2
@@ -2099,7 +2100,7 @@
#ifdef __cplusplus
extern "C"
#endif
-char $2 ();
+char $2 (void);
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
@@ -2118,11 +2119,13 @@
if ac_fn_c_try_link "$LINENO"
then :
eval "$3=yes"
-else $as_nop
- eval "$3=no"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+ conftest$ac_exeext conftest.$ac_ext ;;
+esac
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2162,11 +2165,12 @@
}
then :
ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_retval=1 ;;
+esac
fi
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -2189,15 +2193,15 @@
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Define $2 to an innocuous variant, in case declares $2.
For example, HP-UX 11i declares gettimeofday. */
#define $2 innocuous_$2
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below. */
+ which can conflict with char $2 (void); below. */
#include
#undef $2
@@ -2208,7 +2212,7 @@
#ifdef __cplusplus
extern "C"
#endif
-char $2 ();
+char $2 (void);
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
@@ -2227,11 +2231,13 @@
if ac_fn_cxx_try_link "$LINENO"
then :
eval "$3=yes"
-else $as_nop
- eval "$3=no"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+ conftest$ac_exeext conftest.$ac_ext ;;
+esac
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2253,8 +2259,8 @@
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+else case e in #(
+ e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
eval ac_save_FLAGS=\$$6
as_fn_append $6 " $5"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2278,12 +2284,14 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
eval "$3=yes"
-else $as_nop
- eval "$3=no"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
eval $6=\$ac_save_FLAGS
-
+ ;;
+esac
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2304,8 +2312,8 @@
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
#include <$2>
@@ -2313,10 +2321,12 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
eval "$3=yes"
-else $as_nop
- eval "$3=no"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2348,8 +2358,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pdns-recursor $as_me 5.2.13, which was
-generated by GNU Autoconf 2.71. Invocation command line was
+It was created by pdns-recursor $as_me 5.4.9, which was
+generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2595,10 +2605,10 @@
printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file" \
- || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
fi
done
@@ -2635,9 +2645,7 @@
/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
struct buf { int x; };
struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
+static char *e (char **p, int i)
{
return p[i];
}
@@ -2651,6 +2659,21 @@
return s;
}
+/* C89 style stringification. */
+#define noexpand_stringify(a) #a
+const char *stringified = noexpand_stringify(arbitrary+token=sequence);
+
+/* C89 style token pasting. Exercises some of the corner cases that
+ e.g. old MSVC gets wrong, but not very hard. */
+#define noexpand_concat(a,b) a##b
+#define expand_concat(a,b) noexpand_concat(a,b)
+extern int vA;
+extern int vbee;
+#define aye A
+#define bee B
+int *pvA = &expand_concat(v,aye);
+int *pvbee = &noexpand_concat(v,bee);
+
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not \xHH hex character constants.
These do not provoke an error unfortunately, instead are silently treated
@@ -2678,16 +2701,19 @@
# Test code for whether the C compiler supports C99 (global declarations)
ac_c_conftest_c99_globals='
-// Does the compiler advertise C99 conformance?
+/* Does the compiler advertise C99 conformance? */
#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
# error "Compiler does not advertise C99 conformance"
#endif
+// See if C++-style comments work.
+
#include
extern int puts (const char *);
extern int printf (const char *, ...);
extern int dprintf (int, const char *, ...);
extern void *malloc (size_t);
+extern void free (void *);
// Check varargs macros. These examples are taken from C99 6.10.3.5.
// dprintf is used instead of fprintf to avoid needing to declare
@@ -2737,7 +2763,6 @@
static inline int
test_restrict (ccp restrict text)
{
- // See if C++-style comments work.
// Iterate through items via the restricted pointer.
// Also check for declarations in for loops.
for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
@@ -2803,6 +2828,8 @@
ia->datasize = 10;
for (int i = 0; i < ia->datasize; ++i)
ia->data[i] = i * 1.234;
+ // Work around memory leak warnings.
+ free (ia);
// Check named initializers.
struct named_init ni = {
@@ -2824,7 +2851,7 @@
# Test code for whether the C compiler supports C11 (global declarations)
ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
+/* Does the compiler advertise C11 conformance? */
#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
# error "Compiler does not advertise C11 conformance"
#endif
@@ -3156,7 +3183,6 @@
as_fn_append ac_func_cxx_list " localtime_r HAVE_LOCALTIME_R"
as_fn_append ac_func_cxx_list " gmtime_r HAVE_GMTIME_R"
-as_fn_append ac_func_cxx_list " strcasestr HAVE_STRCASESTR"
as_fn_append ac_func_cxx_list " getrandom HAVE_GETRANDOM"
as_fn_append ac_func_cxx_list " getentropy HAVE_GETENTROPY"
as_fn_append ac_func_cxx_list " arc4random HAVE_ARC4RANDOM"
@@ -3241,8 +3267,9 @@
if $as_found
then :
-else $as_nop
- as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+else case e in #(
+ e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
+esac
fi
@@ -3270,12 +3297,12 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
@@ -3284,18 +3311,18 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;}
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5
+printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5
+printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
@@ -3311,11 +3338,11 @@
fi
done
if $ac_cache_corrupted; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+ as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
and start over" "$LINENO" 5
fi
## -------------------- ##
@@ -3330,7 +3357,7 @@
-am__api_version='1.16'
+am__api_version='1.17'
@@ -3354,8 +3381,8 @@
if test ${ac_cv_path_install+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
@@ -3409,7 +3436,8 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-
+ ;;
+esac
fi
if test ${ac_cv_path_install+y}; then
INSTALL=$ac_cv_path_install
@@ -3432,6 +3460,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# ; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -3452,49 +3639,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -3505,7 +3688,7 @@
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
+# By default was 's,x,x', remove it if useless.
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
@@ -3548,8 +3731,8 @@
if test ${ac_cv_prog_STRIP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$STRIP"; then
+else case e in #(
+ e) if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3571,7 +3754,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -3593,8 +3777,8 @@
if test ${ac_cv_prog_ac_ct_STRIP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_STRIP"; then
+else case e in #(
+ e) if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3616,7 +3800,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -3652,8 +3837,8 @@
if test ${ac_cv_path_mkdir+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
@@ -3667,7 +3852,7 @@
as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir ('*'coreutils) '* | \
- 'BusyBox '* | \
+ *'BusyBox '* | \
'mkdir (fileutils) '4.1*)
ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
break 3;;
@@ -3676,18 +3861,17 @@
done
done
IFS=$as_save_IFS
-
+ ;;
+esac
fi
test -d ./--version && rmdir ./--version
if test ${ac_cv_path_mkdir+y}; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- MKDIR_P="$ac_install_sh -d"
+ # As a last resort, use plain mkdir -p,
+ # in the hope it doesn't have the bugs of ancient mkdir.
+ MKDIR_P='mkdir -p'
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
@@ -3702,8 +3886,8 @@
if test ${ac_cv_prog_AWK+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$AWK"; then
+else case e in #(
+ e) if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3725,7 +3909,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -3747,8 +3932,8 @@
if eval test \${ac_cv_prog_make_${ac_make}_set+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat >conftest.make <<\_ACEOF
+else case e in #(
+ e) cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
@@ -3760,7 +3945,8 @@
*)
eval ac_cv_prog_make_${ac_make}_set=no;;
esac
-rm -f conftest.make
+rm -f conftest.make ;;
+esac
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3781,25 +3967,21 @@
fi
rmdir .tst 2>/dev/null
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
if test ${am_cv_make_support_nested_variables+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if printf "%s\n" 'TRUE=$(BAR$(V))
+else case e in #(
+ e) if printf "%s\n" 'TRUE=$(BAR$(V))
BAR0=false
BAR1=true
V=1
@@ -3809,19 +3991,50 @@
am_cv_make_support_nested_variables=yes
else
am_cv_make_support_nested_variables=no
-fi
+fi ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -3844,7 +4057,7 @@
# Define the identity of the package.
PACKAGE='pdns-recursor'
- VERSION='5.2.13'
+ VERSION='5.4.9'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3898,18 +4111,24 @@
am_gid=`id -g || echo unknown`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
- if test $am_uid -le $am_max_uid; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ if test x$am_uid = xunknown; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
+printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
+ elif test $am_uid -le $am_max_uid; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- _am_tools=none
+ _am_tools=none
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
- if test $am_gid -le $am_max_gid; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ if test x$gm_gid = xunknown; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
+printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
+ elif test $am_gid -le $am_max_gid; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -3996,8 +4215,9 @@
if test ${am_cv_prog_tar_ustar+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- am_cv_prog_tar_ustar=$_am_tool
+else case e in #(
+ e) am_cv_prog_tar_ustar=$_am_tool ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
@@ -4022,89 +4242,12 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard:
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'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: .
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-# Check whether --enable-silent-rules was given.
-if test ${enable_silent_rules+y}
-then :
- enableval=$enable_silent_rules;
-fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=0;;
-esac
-am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-printf %s "checking whether $am_make supports nested variables... " >&6; }
-if test ${am_cv_make_support_nested_variables+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if printf "%s\n" 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
- @$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
+AM_DEFAULT_VERBOSITY=0
@@ -4194,8 +4337,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4217,7 +4360,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4239,8 +4383,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CC"; then
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4262,7 +4406,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -4297,8 +4442,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4320,7 +4465,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4342,8 +4488,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
ac_prog_rejected=no
@@ -4382,7 +4528,8 @@
ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
fi
fi
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4406,8 +4553,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4429,7 +4576,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4455,8 +4603,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CC"; then
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4478,7 +4626,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -4516,8 +4665,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4539,7 +4688,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4561,8 +4711,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CC"; then
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4584,7 +4734,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -4613,10 +4764,10 @@
fi
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4688,8 +4839,8 @@
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+ # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
+# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -4709,7 +4860,7 @@
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
# We set ac_cv_exeext here because the later test for it is not
- # safe: cross compilers may not add the suffix if given an `-o'
+ # safe: cross compilers may not add the suffix if given an '-o'
# argument, so we may need to know it at that point already.
# Even if this section looks crufty: it has the advantage of
# actually working.
@@ -4720,8 +4871,9 @@
done
test "$ac_cv_exeext" = no && ac_cv_exeext=
-else $as_nop
- ac_file=''
+else case e in #(
+ e) ac_file='' ;;
+esac
fi
if test -z "$ac_file"
then :
@@ -4730,13 +4882,14 @@
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; } ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
printf %s "checking for C compiler default output file name... " >&6; }
@@ -4760,10 +4913,10 @@
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
+ # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
+# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will
+# work properly (i.e., refer to 'conftest.exe'), while it won't with
+# 'rm'.
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -4773,11 +4926,12 @@
* ) break;;
esac
done
-else $as_nop
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
fi
rm -f conftest conftest$ac_cv_exeext
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4793,6 +4947,8 @@
main (void)
{
FILE *f = fopen ("conftest.out", "w");
+ if (!f)
+ return 1;
return ferror (f) || fclose (f) != 0;
;
@@ -4832,26 +4988,27 @@
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error 77 "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+If you meant to cross compile, use '--host'.
+See 'config.log' for more details" "$LINENO" 5; }
fi
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
printf "%s\n" "$cross_compiling" >&6; }
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext \
+ conftest.o conftest.obj conftest.out
ac_clean_files=$ac_clean_files_save
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
printf %s "checking for suffix of object files... " >&6; }
if test ${ac_cv_objext+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4883,16 +5040,18 @@
break;;
esac
done
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
printf "%s\n" "$ac_cv_objext" >&6; }
@@ -4903,8 +5062,8 @@
if test ${ac_cv_c_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4921,12 +5080,14 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else $as_nop
- ac_compiler_gnu=no
+else case e in #(
+ e) ac_compiler_gnu=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
@@ -4944,8 +5105,8 @@
if test ${ac_cv_prog_cc_g+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_save_c_werror_flag=$ac_c_werror_flag
+else case e in #(
+ e) ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
@@ -4963,8 +5124,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_prog_cc_g=yes
-else $as_nop
- CFLAGS=""
+else case e in #(
+ e) CFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4979,8 +5140,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
-else $as_nop
- ac_c_werror_flag=$ac_save_c_werror_flag
+else case e in #(
+ e) ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4997,12 +5158,15 @@
then :
ac_cv_prog_cc_g=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
+ ac_c_werror_flag=$ac_save_c_werror_flag ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
@@ -5029,8 +5193,8 @@
if test ${ac_cv_prog_cc_c11+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c11=no
+else case e in #(
+ e) ac_cv_prog_cc_c11=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5047,25 +5211,28 @@
test "x$ac_cv_prog_cc_c11" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
fi
if test "x$ac_cv_prog_cc_c11" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c11" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c11" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
- CC="$CC $ac_cv_prog_cc_c11"
+ CC="$CC $ac_cv_prog_cc_c11" ;;
+esac
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
- ac_prog_cc_stdc=c11
+ ac_prog_cc_stdc=c11 ;;
+esac
fi
fi
if test x$ac_prog_cc_stdc = xno
@@ -5075,8 +5242,8 @@
if test ${ac_cv_prog_cc_c99+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c99=no
+else case e in #(
+ e) ac_cv_prog_cc_c99=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5093,25 +5260,28 @@
test "x$ac_cv_prog_cc_c99" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
fi
if test "x$ac_cv_prog_cc_c99" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c99" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c99" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
- CC="$CC $ac_cv_prog_cc_c99"
+ CC="$CC $ac_cv_prog_cc_c99" ;;
+esac
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
- ac_prog_cc_stdc=c99
+ ac_prog_cc_stdc=c99 ;;
+esac
fi
fi
if test x$ac_prog_cc_stdc = xno
@@ -5121,8 +5291,8 @@
if test ${ac_cv_prog_cc_c89+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c89=no
+else case e in #(
+ e) ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5139,25 +5309,28 @@
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
fi
if test "x$ac_cv_prog_cc_c89" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c89" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c89" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
- CC="$CC $ac_cv_prog_cc_c89"
+ CC="$CC $ac_cv_prog_cc_c89" ;;
+esac
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
- ac_prog_cc_stdc=c89
+ ac_prog_cc_stdc=c89 ;;
+esac
fi
fi
@@ -5178,8 +5351,8 @@
if test ${am_cv_prog_cc_c_o+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -5209,7 +5382,8 @@
fi
done
rm -f core conftest*
- unset am_i
+ unset am_i ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
@@ -5235,8 +5409,8 @@
if test ${am_cv_CC_dependencies_compiler_type+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+else case e in #(
+ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
@@ -5323,7 +5497,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -5340,7 +5514,8 @@
else
am_cv_CC_dependencies_compiler_type=none
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
@@ -5398,8 +5573,8 @@
if test ${ac_cv_safe_to_define___extensions__+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
# define __EXTENSIONS__ 1
@@ -5415,10 +5590,12 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_safe_to_define___extensions__=yes
-else $as_nop
- ac_cv_safe_to_define___extensions__=no
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
@@ -5428,8 +5605,8 @@
if test ${ac_cv_should_define__xopen_source+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_should_define__xopen_source=no
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
if test $ac_cv_header_wchar_h = yes
then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5448,8 +5625,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _XOPEN_SOURCE 500
@@ -5467,10 +5644,12 @@
then :
ac_cv_should_define__xopen_source=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+fi ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
@@ -5495,6 +5674,8 @@
printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
@@ -5514,8 +5695,9 @@
printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
-else $as_nop
- MINIX=
+else case e in #(
+ e) MINIX= ;;
+esac
fi
if test $ac_cv_safe_to_define___extensions__ = yes
then :
@@ -5542,15 +5724,16 @@
if test ${ac_cv_build+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_build_alias=$build_alias
+else case e in #(
+ e) ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
test "x$ac_build_alias" = x &&
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
printf "%s\n" "$ac_cv_build" >&6; }
@@ -5577,14 +5760,15 @@
if test ${ac_cv_host+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test "x$host_alias" = x; then
+else case e in #(
+ e) if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
printf "%s\n" "$ac_cv_host" >&6; }
@@ -5629,8 +5813,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5652,7 +5836,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5674,8 +5859,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CC"; then
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5697,7 +5882,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -5732,8 +5918,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5755,7 +5941,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5777,8 +5964,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
ac_prog_rejected=no
@@ -5817,7 +6004,8 @@
ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
fi
fi
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5841,8 +6029,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5864,7 +6052,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5890,8 +6079,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CC"; then
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5913,7 +6102,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -5951,8 +6141,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
+else case e in #(
+ e) if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5974,7 +6164,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5996,8 +6187,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CC"; then
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6019,7 +6210,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -6048,10 +6240,10 @@
fi
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -6083,8 +6275,8 @@
if test ${ac_cv_c_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -6101,12 +6293,14 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else $as_nop
- ac_compiler_gnu=no
+else case e in #(
+ e) ac_compiler_gnu=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
@@ -6124,8 +6318,8 @@
if test ${ac_cv_prog_cc_g+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_save_c_werror_flag=$ac_c_werror_flag
+else case e in #(
+ e) ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
@@ -6143,8 +6337,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_prog_cc_g=yes
-else $as_nop
- CFLAGS=""
+else case e in #(
+ e) CFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6159,8 +6353,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
-else $as_nop
- ac_c_werror_flag=$ac_save_c_werror_flag
+else case e in #(
+ e) ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6177,12 +6371,15 @@
then :
ac_cv_prog_cc_g=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
+ ac_c_werror_flag=$ac_save_c_werror_flag ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
@@ -6209,8 +6406,8 @@
if test ${ac_cv_prog_cc_c11+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c11=no
+else case e in #(
+ e) ac_cv_prog_cc_c11=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6227,25 +6424,28 @@
test "x$ac_cv_prog_cc_c11" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
fi
if test "x$ac_cv_prog_cc_c11" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c11" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c11" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
- CC="$CC $ac_cv_prog_cc_c11"
+ CC="$CC $ac_cv_prog_cc_c11" ;;
+esac
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
- ac_prog_cc_stdc=c11
+ ac_prog_cc_stdc=c11 ;;
+esac
fi
fi
if test x$ac_prog_cc_stdc = xno
@@ -6255,8 +6455,8 @@
if test ${ac_cv_prog_cc_c99+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c99=no
+else case e in #(
+ e) ac_cv_prog_cc_c99=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6273,25 +6473,28 @@
test "x$ac_cv_prog_cc_c99" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
fi
if test "x$ac_cv_prog_cc_c99" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c99" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c99" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
- CC="$CC $ac_cv_prog_cc_c99"
+ CC="$CC $ac_cv_prog_cc_c99" ;;
+esac
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
- ac_prog_cc_stdc=c99
+ ac_prog_cc_stdc=c99 ;;
+esac
fi
fi
if test x$ac_prog_cc_stdc = xno
@@ -6301,8 +6504,8 @@
if test ${ac_cv_prog_cc_c89+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c89=no
+else case e in #(
+ e) ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6319,25 +6522,28 @@
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
fi
if test "x$ac_cv_prog_cc_c89" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c89" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c89" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
- CC="$CC $ac_cv_prog_cc_c89"
+ CC="$CC $ac_cv_prog_cc_c89" ;;
+esac
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
- ac_prog_cc_stdc=c89
+ ac_prog_cc_stdc=c89 ;;
+esac
fi
fi
@@ -6358,8 +6564,8 @@
if test ${am_cv_prog_cc_c_o+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -6389,7 +6595,8 @@
fi
done
rm -f core conftest*
- unset am_i
+ unset am_i ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
@@ -6415,8 +6622,8 @@
if test ${am_cv_CC_dependencies_compiler_type+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+else case e in #(
+ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
@@ -6503,7 +6710,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -6520,7 +6727,8 @@
else
am_cv_CC_dependencies_compiler_type=none
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
@@ -6562,8 +6770,8 @@
if test ${ac_cv_prog_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CXX"; then
+else case e in #(
+ e) if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6585,7 +6793,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
@@ -6611,8 +6820,8 @@
if test ${ac_cv_prog_ac_ct_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CXX"; then
+else case e in #(
+ e) if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6634,7 +6843,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
@@ -6694,8 +6904,8 @@
if test ${ac_cv_cxx_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -6712,12 +6922,14 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else $as_nop
- ac_compiler_gnu=no
+else case e in #(
+ e) ac_compiler_gnu=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
@@ -6735,8 +6947,8 @@
if test ${ac_cv_prog_cxx_g+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+else case e in #(
+ e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
ac_cv_prog_cxx_g=no
CXXFLAGS="-g"
@@ -6754,8 +6966,8 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_cv_prog_cxx_g=yes
-else $as_nop
- CXXFLAGS=""
+else case e in #(
+ e) CXXFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6770,8 +6982,8 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
-else $as_nop
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else case e in #(
+ e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
CXXFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6788,12 +7000,15 @@
then :
ac_cv_prog_cxx_g=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
@@ -6817,11 +7032,11 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cxx_11=no
+else case e in #(
+ e) ac_cv_prog_cxx_cxx11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6838,36 +7053,39 @@
test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
done
rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
+CXX=$ac_save_CXX ;;
+esac
fi
if test "x$ac_cv_prog_cxx_cxx11" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cxx_cxx11" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cxx_cxx11" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
- CXX="$CXX $ac_cv_prog_cxx_cxx11"
+ CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
+esac
fi
ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
- ac_prog_cxx_stdcxx=cxx11
+ ac_prog_cxx_stdcxx=cxx11 ;;
+esac
fi
fi
if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cxx_98=no
+else case e in #(
+ e) ac_cv_prog_cxx_cxx98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6884,25 +7102,28 @@
test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
done
rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
+CXX=$ac_save_CXX ;;
+esac
fi
if test "x$ac_cv_prog_cxx_cxx98" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cxx_cxx98" = x
+else case e in #(
+ e) if test "x$ac_cv_prog_cxx_cxx98" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
- CXX="$CXX $ac_cv_prog_cxx_cxx98"
+ CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
+esac
fi
ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
- ac_prog_cxx_stdcxx=cxx98
+ ac_prog_cxx_stdcxx=cxx98 ;;
+esac
fi
fi
@@ -6919,8 +7140,8 @@
if test ${am_cv_CXX_dependencies_compiler_type+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+else case e in #(
+ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
@@ -7007,7 +7228,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -7024,7 +7245,8 @@
else
am_cv_CXX_dependencies_compiler_type=none
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; }
@@ -7060,8 +7282,8 @@
if test ${ac_cv_prog_CXXCPP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- # Double quotes because $CXX needs to be expanded
+else case e in #(
+ e) # Double quotes because $CXX needs to be expanded
for CXXCPP in "$CXX -E" cpp /lib/cpp
do
ac_preproc_ok=false
@@ -7079,9 +7301,10 @@
if ac_fn_cxx_try_cpp "$LINENO"
then :
-else $as_nop
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
@@ -7095,15 +7318,16 @@
then :
# Broken: success on invalid input.
continue
-else $as_nop
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
ac_preproc_ok=:
-break
+break ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok
then :
@@ -7112,7 +7336,8 @@
done
ac_cv_prog_CXXCPP=$CXXCPP
-
+ ;;
+esac
fi
CXXCPP=$ac_cv_prog_CXXCPP
else
@@ -7135,9 +7360,10 @@
if ac_fn_cxx_try_cpp "$LINENO"
then :
-else $as_nop
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
@@ -7151,24 +7377,26 @@
then :
# Broken: success on invalid input.
continue
-else $as_nop
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
ac_preproc_ok=:
-break
+break ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok
then :
-else $as_nop
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
fi
ac_ext=cpp
@@ -7178,14 +7406,14 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+printf %s "checking for egrep -e... " >&6; }
+if test ${ac_cv_path_EGREP_TRADITIONAL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -z "$GREP"; then
- ac_path_GREP_found=false
+else case e in #(
+ e) if test -z "$EGREP_TRADITIONAL"; then
+ ac_path_EGREP_TRADITIONAL_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
@@ -7199,13 +7427,14 @@
for ac_prog in grep ggrep
do
for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
+ ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+ # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -7214,14 +7443,14 @@
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- printf "%s\n" 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+ "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
# Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+ ac_path_EGREP_TRADITIONAL_max=$ac_count
fi
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
@@ -7229,35 +7458,24 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
- $ac_path_GREP_found && break 3
+ $ac_path_EGREP_TRADITIONAL_found && break 3
done
done
done
IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
+ :
fi
else
- ac_cv_path_GREP=$GREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
+ if test "$ac_cv_path_EGREP_TRADITIONAL"
then :
- printf %s "(cached) " >&6
-else $as_nop
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
+ ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
+else case e in #(
+ e) if test -z "$EGREP_TRADITIONAL"; then
+ ac_path_EGREP_TRADITIONAL_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
@@ -7271,13 +7489,14 @@
for ac_prog in egrep
do
for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
+ ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+ # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -7286,14 +7505,14 @@
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- printf "%s\n" 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+ "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
# Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+ ac_path_EGREP_TRADITIONAL_max=$ac_count
fi
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
@@ -7301,33 +7520,35 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_TRADITIONAL_found && break 3
done
done
done
IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
+ if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
- ac_cv_path_EGREP=$EGREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
fi
-
- fi
+ ;;
+esac
+fi ;;
+esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+ EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
# Check whether --enable-experimental_64bit_time_t_support_on_glibc was given.
if test ${enable_experimental_64bit_time_t_support_on_glibc+y}
then :
enableval=$enable_experimental_64bit_time_t_support_on_glibc; enable_experimental_64bit_time_t_support_on_glibc=$enableval
-else $as_nop
- enable_experimental_64bit_time_t_support_on_glibc=no
-
+else case e in #(
+ e) enable_experimental_64bit_time_t_support_on_glibc=no
+ ;;
+esac
fi
if test "x$enable_experimental_64bit_time_t_support_on_glibc" != "xno"
@@ -7343,7 +7564,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1
+ $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
then :
CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64"
@@ -7359,8 +7580,8 @@
if test ${ac_cv_sizeof_time_t+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
+else case e in #(
+ e) for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -7382,7 +7603,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
if test x$ac_cv_sizeof_time_t != x ; then break; fi
done
-
+ ;;
+esac
fi
if test x$ac_cv_sizeof_time_t = x ; then
@@ -7405,8 +7627,8 @@
if eval test \${ax_cv_decl_${typename}_signed+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -7423,11 +7645,13 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
eval "ax_cv_decl_${typename}_signed=\"yes\""
-else $as_nop
- eval "ax_cv_decl_${typename}_signed=\"no\""
+else case e in #(
+ e) eval "ax_cv_decl_${typename}_signed=\"no\"" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+ ;;
+esac
fi
eval ac_res=\$ax_cv_decl_${typename}_signed
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -7441,9 +7665,7 @@
-
-printf "%s\n" "#define RECURSOR 1" >>confdefs.h
-
+CPPFLAGS="-DRECURSOR $CPPFLAGS"
# Warn when pkg.m4 is missing
@@ -7458,17 +7680,24 @@
+
+
if test x$ac_success = xno; then
- for alternative in ${ax_cxx_compile_alternatives}; do
- for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
- cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
+ for alternative in ${ax_cxx_compile_alternatives}; do
+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do
+ if test x"$switch" = xMSVC; then
+ switch=-std:c++${alternative}
+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_${switch}_MSVC" | sed "$as_sed_sh"`
+ else
+ cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"`
+ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; }
if eval test \${$cachevar+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_save_CXX="$CXX"
+else case e in #(
+ e) ac_save_CXX="$CXX"
CXX="$CXX $switch"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -7481,7 +7710,11 @@
#error "This is not a C++ compiler"
-#elif __cplusplus < 201103L
+// MSVC always sets __cplusplus to 199711L in older versions; newer versions
+// only set it correctly if /Zc:__cplusplus is specified as well as a
+// /std:c++NN switch:
+// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
+#elif __cplusplus < 201103L && !defined _MSC_VER
#error "This is not a C++11 compiler"
@@ -7768,7 +8001,7 @@
#error "This is not a C++ compiler"
-#elif __cplusplus < 201402L
+#elif __cplusplus < 201402L && !defined _MSC_VER
#error "This is not a C++14 compiler"
@@ -7888,7 +8121,7 @@
#error "This is not a C++ compiler"
-#elif __cplusplus < 201703L
+#elif __cplusplus < 201703L && !defined _MSC_VER
#error "This is not a C++17 compiler"
@@ -7903,7 +8136,8 @@
namespace test_constexpr_lambdas
{
- [[maybe_unused]] constexpr int foo = [](){return 42;}();
+
+ constexpr int foo = [](){return 42;}();
}
@@ -8253,7 +8487,7 @@
} // namespace cxx17
-#endif // __cplusplus < 201703L
+#endif // __cplusplus < 201703L && !defined _MSC_VER
@@ -8261,11 +8495,13 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
eval $cachevar=yes
-else $as_nop
- eval $cachevar=no
+else case e in #(
+ e) eval $cachevar=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- CXX="$ac_save_CXX"
+ CXX="$ac_save_CXX" ;;
+esac
fi
eval ac_res=\$$cachevar
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -8312,8 +8548,8 @@
if test ${ac_cv_path_SED+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+else case e in #(
+ e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
done
@@ -8338,9 +8574,10 @@
as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
+case `"$ac_path_SED" --version 2>&1` in #(
*GNU*)
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -8375,7 +8612,8 @@
else
ac_cv_path_SED=$SED
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
printf "%s\n" "$ac_cv_path_SED" >&6; }
@@ -8392,8 +8630,8 @@
if test ${ac_cv_prog_CARGO+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CARGO"; then
+else case e in #(
+ e) if test -n "$CARGO"; then
ac_cv_prog_CARGO="$CARGO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8416,7 +8654,8 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_CARGO" && ac_cv_prog_CARGO="$CARGO"
-fi
+fi ;;
+esac
fi
CARGO=$ac_cv_prog_CARGO
if test -n "$CARGO"; then
@@ -8575,8 +8814,8 @@
if test ${ac_cv_path_SED+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+else case e in #(
+ e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
done
@@ -8601,9 +8840,10 @@
as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
+case `"$ac_path_SED" --version 2>&1` in #(
*GNU*)
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -8638,7 +8878,8 @@
else
ac_cv_path_SED=$SED
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
printf "%s\n" "$ac_cv_path_SED" >&6; }
@@ -8658,13 +8899,161 @@
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_prog in grep ggrep
+ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in #(
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+#(
+*)
+ ac_count=0
+ printf %s 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ printf "%s\n" 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_prog in egrep
+ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in #(
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+#(
+*)
+ ac_count=0
+ printf %s 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ printf "%s\n" 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+ EGREP_TRADITIONAL=$EGREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
printf %s "checking for fgrep... " >&6; }
if test ${ac_cv_path_FGREP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+else case e in #(
+ e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
then ac_cv_path_FGREP="$GREP -F"
else
if test -z "$FGREP"; then
@@ -8686,9 +9075,10 @@
as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
+case `"$ac_path_FGREP" --version 2>&1` in #(
*GNU*)
ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -8724,7 +9114,8 @@
ac_cv_path_FGREP=$FGREP
fi
- fi
+ fi ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
printf "%s\n" "$ac_cv_path_FGREP" >&6; }
@@ -8755,8 +9146,9 @@
if test ${with_gnu_ld+y}
then :
withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else $as_nop
- with_gnu_ld=no
+else case e in #(
+ e) with_gnu_ld=no ;;
+esac
fi
ac_prog=ld
@@ -8801,8 +9193,8 @@
if test ${lt_cv_path_LD+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -z "$LD"; then
+else case e in #(
+ e) if test -z "$LD"; then
lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
IFS=$lt_save_ifs
@@ -8825,7 +9217,8 @@
IFS=$lt_save_ifs
else
lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
+fi ;;
+esac
fi
LD=$lt_cv_path_LD
@@ -8842,8 +9235,8 @@
if test ${lt_cv_prog_gnu_ld+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else case e in #(
+ e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 &5
@@ -8870,8 +9264,8 @@
if test ${lt_cv_path_NM+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$NM"; then
+else case e in #(
+ e) if test -n "$NM"; then
# Let the user override the test.
lt_cv_path_NM=$NM
else
@@ -8918,7 +9312,8 @@
IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
-fi
+fi ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
printf "%s\n" "$lt_cv_path_NM" >&6; }
@@ -8939,8 +9334,8 @@
if test ${ac_cv_prog_DUMPBIN+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$DUMPBIN"; then
+else case e in #(
+ e) if test -n "$DUMPBIN"; then
ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8962,7 +9357,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
DUMPBIN=$ac_cv_prog_DUMPBIN
if test -n "$DUMPBIN"; then
@@ -8988,8 +9384,8 @@
if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_DUMPBIN"; then
+else case e in #(
+ e) if test -n "$ac_ct_DUMPBIN"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9011,7 +9407,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
if test -n "$ac_ct_DUMPBIN"; then
@@ -9065,8 +9462,8 @@
if test ${lt_cv_nm_interface+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_nm_interface="BSD nm"
+else case e in #(
+ e) lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
@@ -9079,7 +9476,8 @@
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
fi
- rm -f conftest*
+ rm -f conftest* ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
printf "%s\n" "$lt_cv_nm_interface" >&6; }
@@ -9101,8 +9499,8 @@
if test ${lt_cv_sys_max_cmd_len+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- i=0
+else case e in #(
+ e) i=0
teststring=ABCD
case $build_os in
@@ -9224,7 +9622,8 @@
fi
;;
esac
-
+ ;;
+esac
fi
if test -n "$lt_cv_sys_max_cmd_len"; then
@@ -9281,8 +9680,8 @@
if test ${lt_cv_to_host_file_cmd+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $host in
+else case e in #(
+ e) case $host in
*-*-mingw* )
case $build in
*-*-mingw* ) # actually msys
@@ -9313,7 +9712,8 @@
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
esac
-
+ ;;
+esac
fi
to_host_file_cmd=$lt_cv_to_host_file_cmd
@@ -9329,8 +9729,8 @@
if test ${lt_cv_to_tool_file_cmd+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- #assume ordinary cross tools, or native build.
+else case e in #(
+ e) #assume ordinary cross tools, or native build.
lt_cv_to_tool_file_cmd=func_convert_file_noop
case $host in
*-*-mingw* )
@@ -9341,7 +9741,8 @@
esac
;;
esac
-
+ ;;
+esac
fi
to_tool_file_cmd=$lt_cv_to_tool_file_cmd
@@ -9357,8 +9758,9 @@
if test ${lt_cv_ld_reload_flag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_ld_reload_flag='-r'
+else case e in #(
+ e) lt_cv_ld_reload_flag='-r' ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
@@ -9399,8 +9801,8 @@
if test ${ac_cv_prog_FILECMD+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$FILECMD"; then
+else case e in #(
+ e) if test -n "$FILECMD"; then
ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9422,7 +9824,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
FILECMD=$ac_cv_prog_FILECMD
if test -n "$FILECMD"; then
@@ -9444,8 +9847,8 @@
if test ${ac_cv_prog_ac_ct_FILECMD+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_FILECMD"; then
+else case e in #(
+ e) if test -n "$ac_ct_FILECMD"; then
ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9467,7 +9870,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
if test -n "$ac_ct_FILECMD"; then
@@ -9507,8 +9911,8 @@
if test ${ac_cv_prog_OBJDUMP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$OBJDUMP"; then
+else case e in #(
+ e) if test -n "$OBJDUMP"; then
ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9530,7 +9934,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
@@ -9552,8 +9957,8 @@
if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_OBJDUMP"; then
+else case e in #(
+ e) if test -n "$ac_ct_OBJDUMP"; then
ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9575,7 +9980,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
@@ -9616,8 +10022,8 @@
if test ${lt_cv_deplibs_check_method+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_file_magic_cmd='$MAGIC_CMD'
+else case e in #(
+ e) lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
@@ -9810,7 +10216,8 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
@@ -9862,8 +10269,8 @@
if test ${ac_cv_prog_DLLTOOL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$DLLTOOL"; then
+else case e in #(
+ e) if test -n "$DLLTOOL"; then
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9885,7 +10292,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
DLLTOOL=$ac_cv_prog_DLLTOOL
if test -n "$DLLTOOL"; then
@@ -9907,8 +10315,8 @@
if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_DLLTOOL"; then
+else case e in #(
+ e) if test -n "$ac_ct_DLLTOOL"; then
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9930,7 +10338,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
if test -n "$ac_ct_DLLTOOL"; then
@@ -9972,8 +10381,8 @@
if test ${lt_cv_sharedlib_from_linklib_cmd+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_sharedlib_from_linklib_cmd='unknown'
+else case e in #(
+ e) lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
@@ -9993,7 +10402,8 @@
lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
@@ -10016,8 +10426,8 @@
if test ${ac_cv_prog_AR+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$AR"; then
+else case e in #(
+ e) if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10039,7 +10449,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
@@ -10065,8 +10476,8 @@
if test ${ac_cv_prog_ac_ct_AR+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_AR"; then
+else case e in #(
+ e) if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10088,7 +10499,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
@@ -10150,8 +10562,8 @@
if test ${lt_cv_ar_at_file+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_ar_at_file=no
+else case e in #(
+ e) lt_cv_ar_at_file=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -10188,7 +10600,8 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
printf "%s\n" "$lt_cv_ar_at_file" >&6; }
@@ -10213,8 +10626,8 @@
if test ${ac_cv_prog_STRIP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$STRIP"; then
+else case e in #(
+ e) if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10236,7 +10649,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -10258,8 +10672,8 @@
if test ${ac_cv_prog_ac_ct_STRIP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_STRIP"; then
+else case e in #(
+ e) if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10281,7 +10695,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -10322,8 +10737,8 @@
if test ${ac_cv_prog_RANLIB+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$RANLIB"; then
+else case e in #(
+ e) if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10345,7 +10760,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
@@ -10367,8 +10783,8 @@
if test ${ac_cv_prog_ac_ct_RANLIB+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_RANLIB"; then
+else case e in #(
+ e) if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10390,7 +10806,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
@@ -10501,8 +10918,8 @@
if test ${lt_cv_sys_global_symbol_pipe+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
# These are sane defaults that work on at least a few old systems.
# [They come from Ultrix. What could be older than Ultrix?!! ;)]
@@ -10757,7 +11174,8 @@
lt_cv_sys_global_symbol_pipe=
fi
done
-
+ ;;
+esac
fi
if test -z "$lt_cv_sys_global_symbol_pipe"; then
@@ -10821,8 +11239,9 @@
if test ${with_sysroot+y}
then :
withval=$with_sysroot;
-else $as_nop
- with_sysroot=no
+else case e in #(
+ e) with_sysroot=no ;;
+esac
fi
@@ -10857,8 +11276,8 @@
if test ${ac_cv_path_lt_DD+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- printf 0123456789abcdef0123456789abcdef >conftest.i
+else case e in #(
+ e) printf 0123456789abcdef0123456789abcdef >conftest.i
cat conftest.i conftest.i >conftest2.i
: ${lt_DD:=$DD}
if test -z "$lt_DD"; then
@@ -10894,7 +11313,8 @@
ac_cv_path_lt_DD=$lt_DD
fi
-rm -f conftest.i conftest2.i conftest.out
+rm -f conftest.i conftest2.i conftest.out ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
@@ -10905,8 +11325,8 @@
if test ${lt_cv_truncate_bin+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- printf 0123456789abcdef0123456789abcdef >conftest.i
+else case e in #(
+ e) printf 0123456789abcdef0123456789abcdef >conftest.i
cat conftest.i conftest.i >conftest2.i
lt_cv_truncate_bin=
if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then
@@ -10914,7 +11334,8 @@
&& lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
fi
rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
printf "%s\n" "$lt_cv_truncate_bin" >&6; }
@@ -11124,8 +11545,8 @@
if test ${lt_cv_cc_needs_belf+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_ext=c
+else case e in #(
+ e) ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -11145,8 +11566,9 @@
if ac_fn_c_try_link "$LINENO"
then :
lt_cv_cc_needs_belf=yes
-else $as_nop
- lt_cv_cc_needs_belf=no
+else case e in #(
+ e) lt_cv_cc_needs_belf=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -11155,7 +11577,8 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
@@ -11213,8 +11636,8 @@
if test ${ac_cv_prog_MANIFEST_TOOL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$MANIFEST_TOOL"; then
+else case e in #(
+ e) if test -n "$MANIFEST_TOOL"; then
ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11236,7 +11659,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
if test -n "$MANIFEST_TOOL"; then
@@ -11258,8 +11682,8 @@
if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_MANIFEST_TOOL"; then
+else case e in #(
+ e) if test -n "$ac_ct_MANIFEST_TOOL"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11281,7 +11705,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -11313,15 +11738,16 @@
if test ${lt_cv_path_mainfest_tool+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_path_mainfest_tool=no
+else case e in #(
+ e) lt_cv_path_mainfest_tool=no
echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
$MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
cat conftest.err >&5
if $GREP 'Manifest Tool' conftest.out > /dev/null; then
lt_cv_path_mainfest_tool=yes
fi
- rm -f conftest*
+ rm -f conftest* ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
@@ -11344,8 +11770,8 @@
if test ${ac_cv_prog_DSYMUTIL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$DSYMUTIL"; then
+else case e in #(
+ e) if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11367,7 +11793,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
@@ -11389,8 +11816,8 @@
if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_DSYMUTIL"; then
+else case e in #(
+ e) if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11412,7 +11839,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
@@ -11446,8 +11874,8 @@
if test ${ac_cv_prog_NMEDIT+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$NMEDIT"; then
+else case e in #(
+ e) if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11469,7 +11897,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
@@ -11491,8 +11920,8 @@
if test ${ac_cv_prog_ac_ct_NMEDIT+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_NMEDIT"; then
+else case e in #(
+ e) if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11514,7 +11943,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
@@ -11548,8 +11978,8 @@
if test ${ac_cv_prog_LIPO+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$LIPO"; then
+else case e in #(
+ e) if test -n "$LIPO"; then
ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11571,7 +12001,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
LIPO=$ac_cv_prog_LIPO
if test -n "$LIPO"; then
@@ -11593,8 +12024,8 @@
if test ${ac_cv_prog_ac_ct_LIPO+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_LIPO"; then
+else case e in #(
+ e) if test -n "$ac_ct_LIPO"; then
ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11616,7 +12047,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
if test -n "$ac_ct_LIPO"; then
@@ -11650,8 +12082,8 @@
if test ${ac_cv_prog_OTOOL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$OTOOL"; then
+else case e in #(
+ e) if test -n "$OTOOL"; then
ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11673,7 +12105,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
OTOOL=$ac_cv_prog_OTOOL
if test -n "$OTOOL"; then
@@ -11695,8 +12128,8 @@
if test ${ac_cv_prog_ac_ct_OTOOL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_OTOOL"; then
+else case e in #(
+ e) if test -n "$ac_ct_OTOOL"; then
ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11718,7 +12151,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
if test -n "$ac_ct_OTOOL"; then
@@ -11752,8 +12186,8 @@
if test ${ac_cv_prog_OTOOL64+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$OTOOL64"; then
+else case e in #(
+ e) if test -n "$OTOOL64"; then
ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11775,7 +12209,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
OTOOL64=$ac_cv_prog_OTOOL64
if test -n "$OTOOL64"; then
@@ -11797,8 +12232,8 @@
if test ${ac_cv_prog_ac_ct_OTOOL64+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_OTOOL64"; then
+else case e in #(
+ e) if test -n "$ac_ct_OTOOL64"; then
ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11820,7 +12255,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
if test -n "$ac_ct_OTOOL64"; then
@@ -11877,8 +12313,8 @@
if test ${lt_cv_apple_cc_single_mod+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_apple_cc_single_mod=no
+else case e in #(
+ e) lt_cv_apple_cc_single_mod=no
if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
@@ -11904,7 +12340,8 @@
fi
rm -rf libconftest.dylib*
rm -f conftest.*
- fi
+ fi ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
@@ -11914,8 +12351,8 @@
if test ${lt_cv_ld_exported_symbols_list+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_ld_exported_symbols_list=no
+else case e in #(
+ e) lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
echo "_main" > conftest.sym
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
@@ -11933,13 +12370,15 @@
if ac_fn_c_try_link "$LINENO"
then :
lt_cv_ld_exported_symbols_list=yes
-else $as_nop
- lt_cv_ld_exported_symbols_list=no
+else case e in #(
+ e) lt_cv_ld_exported_symbols_list=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -11949,8 +12388,8 @@
if test ${lt_cv_ld_force_load+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_ld_force_load=no
+else case e in #(
+ e) lt_cv_ld_force_load=no
cat > conftest.c << _LT_EOF
int forced_loaded() { return 2;}
_LT_EOF
@@ -11975,7 +12414,8 @@
fi
rm -f conftest.err libconftest.a conftest conftest.c
rm -rf conftest.dSYM
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
printf "%s\n" "$lt_cv_ld_force_load" >&6; }
@@ -12095,8 +12535,9 @@
IFS=$lt_save_ifs
;;
esac
-else $as_nop
- enable_shared=yes
+else case e in #(
+ e) enable_shared=yes ;;
+esac
fi
@@ -12127,8 +12568,9 @@
IFS=$lt_save_ifs
;;
esac
-else $as_nop
- enable_static=yes
+else case e in #(
+ e) enable_static=yes ;;
+esac
fi
@@ -12159,8 +12601,9 @@
IFS=$lt_save_ifs
;;
esac
-else $as_nop
- pic_mode=default
+else case e in #(
+ e) pic_mode=default ;;
+esac
fi
@@ -12190,8 +12633,9 @@
IFS=$lt_save_ifs
;;
esac
-else $as_nop
- enable_fast_install=yes
+else case e in #(
+ e) enable_fast_install=yes ;;
+esac
fi
@@ -12218,15 +12662,17 @@
;;
esac
lt_cv_with_aix_soname=$with_aix_soname
-else $as_nop
- if test ${lt_cv_with_aix_soname+y}
+else case e in #(
+ e) if test ${lt_cv_with_aix_soname+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_with_aix_soname=aix
+else case e in #(
+ e) lt_cv_with_aix_soname=aix ;;
+esac
fi
- with_aix_soname=$lt_cv_with_aix_soname
+ with_aix_soname=$lt_cv_with_aix_soname ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
@@ -12317,8 +12763,8 @@
if test ${lt_cv_objdir+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- rm -f .libs 2>/dev/null
+else case e in #(
+ e) rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
lt_cv_objdir=.libs
@@ -12326,7 +12772,8 @@
# MS-DOS does not allow filenames that begin with a dot.
lt_cv_objdir=_libs
fi
-rmdir .libs 2>/dev/null
+rmdir .libs 2>/dev/null ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
printf "%s\n" "$lt_cv_objdir" >&6; }
@@ -12387,8 +12834,8 @@
if test ${lt_cv_path_MAGIC_CMD+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $MAGIC_CMD in
+else case e in #(
+ e) case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
@@ -12431,6 +12878,7 @@
IFS=$lt_save_ifs
MAGIC_CMD=$lt_save_MAGIC_CMD
;;
+esac ;;
esac
fi
@@ -12454,8 +12902,8 @@
if test ${lt_cv_path_MAGIC_CMD+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $MAGIC_CMD in
+else case e in #(
+ e) case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
@@ -12498,6 +12946,7 @@
IFS=$lt_save_ifs
MAGIC_CMD=$lt_save_MAGIC_CMD
;;
+esac ;;
esac
fi
@@ -12597,8 +13046,8 @@
if test ${lt_cv_prog_compiler_rtti_exceptions+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_rtti_exceptions=no
+else case e in #(
+ e) lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
@@ -12626,7 +13075,8 @@
fi
fi
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
@@ -12991,8 +13441,9 @@
if test ${lt_cv_prog_compiler_pic+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+else case e in #(
+ e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
@@ -13007,8 +13458,8 @@
if test ${lt_cv_prog_compiler_pic_works+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_pic_works=no
+else case e in #(
+ e) lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
@@ -13036,7 +13487,8 @@
fi
fi
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
@@ -13072,8 +13524,8 @@
if test ${lt_cv_prog_compiler_static_works+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_static_works=no
+else case e in #(
+ e) lt_cv_prog_compiler_static_works=no
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -13094,7 +13546,8 @@
fi
$RM -r conftest*
LDFLAGS=$save_LDFLAGS
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
@@ -13116,8 +13569,8 @@
if test ${lt_cv_prog_compiler_c_o+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_c_o=no
+else case e in #(
+ e) lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
@@ -13157,7 +13610,8 @@
cd ..
$RM -r conftest
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
@@ -13172,8 +13626,8 @@
if test ${lt_cv_prog_compiler_c_o+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_c_o=no
+else case e in #(
+ e) lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
@@ -13213,7 +13667,8 @@
cd ..
$RM -r conftest
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
@@ -13808,8 +14263,8 @@
if test ${lt_cv_aix_libpath_+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13841,7 +14296,8 @@
if test -z "$lt_cv_aix_libpath_"; then
lt_cv_aix_libpath_=/usr/lib:/lib
fi
-
+ ;;
+esac
fi
aix_libpath=$lt_cv_aix_libpath_
@@ -13863,8 +14319,8 @@
if test ${lt_cv_aix_libpath_+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13896,7 +14352,8 @@
if test -z "$lt_cv_aix_libpath_"; then
lt_cv_aix_libpath_=/usr/lib:/lib
fi
-
+ ;;
+esac
fi
aix_libpath=$lt_cv_aix_libpath_
@@ -14147,8 +14604,8 @@
if test ${lt_cv_prog_compiler__b+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler__b=no
+else case e in #(
+ e) lt_cv_prog_compiler__b=no
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -b"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -14169,7 +14626,8 @@
fi
$RM -r conftest*
LDFLAGS=$save_LDFLAGS
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
@@ -14217,8 +14675,8 @@
if test ${lt_cv_irix_exported_symbol+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- save_LDFLAGS=$LDFLAGS
+else case e in #(
+ e) save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14227,12 +14685,14 @@
if ac_fn_c_try_link "$LINENO"
then :
lt_cv_irix_exported_symbol=yes
-else $as_nop
- lt_cv_irix_exported_symbol=no
+else case e in #(
+ e) lt_cv_irix_exported_symbol=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
+ LDFLAGS=$save_LDFLAGS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
@@ -14558,8 +15018,8 @@
if test ${lt_cv_archive_cmds_need_lc+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- $RM conftest*
+else case e in #(
+ e) $RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -14595,7 +15055,8 @@
cat conftest.err 1>&5
fi
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
@@ -15322,8 +15783,8 @@
if test ${lt_cv_shlibpath_overrides_runpath+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_shlibpath_overrides_runpath=no
+else case e in #(
+ e) lt_cv_shlibpath_overrides_runpath=no
save_LDFLAGS=$LDFLAGS
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
@@ -15350,7 +15811,8 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-
+ ;;
+esac
fi
shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
@@ -15775,16 +16237,22 @@
if test ${ac_cv_lib_dl_dlopen+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
int
main (void)
{
@@ -15796,24 +16264,27 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dl_dlopen=yes
-else $as_nop
- ac_cv_lib_dl_dlopen=no
+else case e in #(
+ e) ac_cv_lib_dl_dlopen=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes
then :
lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
-
+else case e in #(
+ e)
lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
-
+ ;;
+esac
fi
;;
@@ -15831,22 +16302,28 @@
if test "x$ac_cv_func_shl_load" = xyes
then :
lt_cv_dlopen=shl_load
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
printf %s "checking for shl_load in -ldld... " >&6; }
if test ${ac_cv_lib_dld_shl_load+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char shl_load ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load (void);
int
main (void)
{
@@ -15858,39 +16335,47 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dld_shl_load=yes
-else $as_nop
- ac_cv_lib_dld_shl_load=no
+else case e in #(
+ e) ac_cv_lib_dld_shl_load=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes
then :
lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else $as_nop
- ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+else case e in #(
+ e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes
then :
lt_cv_dlopen=dlopen
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
printf %s "checking for dlopen in -ldl... " >&6; }
if test ${ac_cv_lib_dl_dlopen+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
int
main (void)
{
@@ -15902,34 +16387,42 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dl_dlopen=yes
-else $as_nop
- ac_cv_lib_dl_dlopen=no
+else case e in #(
+ e) ac_cv_lib_dl_dlopen=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes
then :
lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
printf %s "checking for dlopen in -lsvld... " >&6; }
if test ${ac_cv_lib_svld_dlopen+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
int
main (void)
{
@@ -15941,34 +16434,42 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_svld_dlopen=yes
-else $as_nop
- ac_cv_lib_svld_dlopen=no
+else case e in #(
+ e) ac_cv_lib_svld_dlopen=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes
then :
lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
printf %s "checking for dld_link in -ldld... " >&6; }
if test ${ac_cv_lib_dld_dld_link+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dld_link ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link (void);
int
main (void)
{
@@ -15980,12 +16481,14 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dld_dld_link=yes
-else $as_nop
- ac_cv_lib_dld_dld_link=no
+else case e in #(
+ e) ac_cv_lib_dld_dld_link=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
@@ -15994,19 +16497,24 @@
lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
-
+ ;;
+esac
fi
-
+ ;;
+esac
fi
-
+ ;;
+esac
fi
-
+ ;;
+esac
fi
-
+ ;;
+esac
fi
;;
@@ -16034,8 +16542,8 @@
if test ${lt_cv_dlopen_self+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test yes = "$cross_compiling"; then :
+else case e in #(
+ e) if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -16129,7 +16637,8 @@
fi
rm -fr conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
printf "%s\n" "$lt_cv_dlopen_self" >&6; }
@@ -16141,8 +16650,8 @@
if test ${lt_cv_dlopen_self_static+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test yes = "$cross_compiling"; then :
+else case e in #(
+ e) if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -16236,7 +16745,8 @@
fi
rm -fr conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
@@ -16394,8 +16904,8 @@
if test ${ac_cv_prog_CXXCPP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- # Double quotes because $CXX needs to be expanded
+else case e in #(
+ e) # Double quotes because $CXX needs to be expanded
for CXXCPP in "$CXX -E" cpp /lib/cpp
do
ac_preproc_ok=false
@@ -16413,9 +16923,10 @@
if ac_fn_cxx_try_cpp "$LINENO"
then :
-else $as_nop
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
@@ -16429,15 +16940,16 @@
then :
# Broken: success on invalid input.
continue
-else $as_nop
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
ac_preproc_ok=:
-break
+break ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok
then :
@@ -16446,7 +16958,8 @@
done
ac_cv_prog_CXXCPP=$CXXCPP
-
+ ;;
+esac
fi
CXXCPP=$ac_cv_prog_CXXCPP
else
@@ -16469,9 +16982,10 @@
if ac_fn_cxx_try_cpp "$LINENO"
then :
-else $as_nop
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
@@ -16485,24 +16999,26 @@
then :
# Broken: success on invalid input.
continue
-else $as_nop
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
ac_preproc_ok=:
-break
+break ;;
+esac
fi
rm -f conftest.err conftest.i conftest.$ac_ext
done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok
then :
-else $as_nop
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
fi
ac_ext=cpp
@@ -16639,8 +17155,9 @@
if test ${with_gnu_ld+y}
then :
withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else $as_nop
- with_gnu_ld=no
+else case e in #(
+ e) with_gnu_ld=no ;;
+esac
fi
ac_prog=ld
@@ -16685,8 +17202,8 @@
if test ${lt_cv_path_LD+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -z "$LD"; then
+else case e in #(
+ e) if test -z "$LD"; then
lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
IFS=$lt_save_ifs
@@ -16709,7 +17226,8 @@
IFS=$lt_save_ifs
else
lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
+fi ;;
+esac
fi
LD=$lt_cv_path_LD
@@ -16726,8 +17244,8 @@
if test ${lt_cv_prog_gnu_ld+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else case e in #(
+ e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 &5
@@ -16934,8 +17453,8 @@
if test ${lt_cv_aix_libpath__CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16967,7 +17486,8 @@
if test -z "$lt_cv_aix_libpath__CXX"; then
lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
-
+ ;;
+esac
fi
aix_libpath=$lt_cv_aix_libpath__CXX
@@ -16990,8 +17510,8 @@
if test ${lt_cv_aix_libpath__CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -17023,7 +17543,8 @@
if test -z "$lt_cv_aix_libpath__CXX"; then
lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
-
+ ;;
+esac
fi
aix_libpath=$lt_cv_aix_libpath__CXX
@@ -18395,8 +18916,9 @@
if test ${lt_cv_prog_compiler_pic_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+else case e in #(
+ e) lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; }
@@ -18411,8 +18933,8 @@
if test ${lt_cv_prog_compiler_pic_works_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_pic_works_CXX=no
+else case e in #(
+ e) lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment
@@ -18440,7 +18962,8 @@
fi
fi
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
@@ -18470,8 +18993,8 @@
if test ${lt_cv_prog_compiler_static_works_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_static_works_CXX=no
+else case e in #(
+ e) lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -18492,7 +19015,8 @@
fi
$RM -r conftest*
LDFLAGS=$save_LDFLAGS
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; }
@@ -18511,8 +19035,8 @@
if test ${lt_cv_prog_compiler_c_o_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_c_o_CXX=no
+else case e in #(
+ e) lt_cv_prog_compiler_c_o_CXX=no
$RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
@@ -18552,7 +19076,8 @@
cd ..
$RM -r conftest
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
@@ -18564,8 +19089,8 @@
if test ${lt_cv_prog_compiler_c_o_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_prog_compiler_c_o_CXX=no
+else case e in #(
+ e) lt_cv_prog_compiler_c_o_CXX=no
$RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
@@ -18605,7 +19130,8 @@
cd ..
$RM -r conftest
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
@@ -18710,8 +19236,8 @@
if test ${lt_cv_archive_cmds_need_lc_CXX+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- $RM conftest*
+else case e in #(
+ e) $RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -18747,7 +19273,8 @@
cat conftest.err 1>&5
fi
$RM conftest*
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
printf "%s\n" "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
@@ -19311,8 +19838,8 @@
if test ${lt_cv_shlibpath_overrides_runpath+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- lt_cv_shlibpath_overrides_runpath=no
+else case e in #(
+ e) lt_cv_shlibpath_overrides_runpath=no
save_LDFLAGS=$LDFLAGS
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
@@ -19339,7 +19866,8 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-
+ ;;
+esac
fi
shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
@@ -19822,8 +20350,8 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
-else $as_nop
- LIBS="$LIBS -latomic"
+else case e in #(
+ e) LIBS="$LIBS -latomic"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include
@@ -19840,16 +20368,18 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else $as_nop
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "libatomic needed, but linking with -latomic failed, cannot continue
-See \`config.log' for more details" "$LINENO" 5; }
-
+See 'config.log' for more details" "$LINENO" 5; }
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -19863,8 +20393,8 @@
if test ${ac_cv_cxx_undeclared_builtin_options+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_save_CFLAGS=$CFLAGS
+else case e in #(
+ e) ac_save_CFLAGS=$CFLAGS
ac_cv_cxx_undeclared_builtin_options='cannot detect'
for ac_arg in '' -fno-builtin; do
CFLAGS="$ac_save_CFLAGS $ac_arg"
@@ -19883,8 +20413,8 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
-else $as_nop
- # This test program should compile successfully.
+else case e in #(
+ e) # This test program should compile successfully.
# No library function is consistently available on
# freestanding implementations, so test against a dummy
# declaration. Include always-available headers on the
@@ -19912,26 +20442,29 @@
if test x"$ac_arg" = x
then :
ac_cv_cxx_undeclared_builtin_options='none needed'
-else $as_nop
- ac_cv_cxx_undeclared_builtin_options=$ac_arg
+else case e in #(
+ e) ac_cv_cxx_undeclared_builtin_options=$ac_arg ;;
+esac
fi
break
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
done
CFLAGS=$ac_save_CFLAGS
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_undeclared_builtin_options" >&5
printf "%s\n" "$ac_cv_cxx_undeclared_builtin_options" >&6; }
case $ac_cv_cxx_undeclared_builtin_options in #(
'cannot detect') :
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "cannot make $CXX report undeclared builtins
-See \`config.log' for more details" "$LINENO" 5; } ;; #(
+See 'config.log' for more details" "$LINENO" 5; } ;; #(
'none needed') :
ac_cxx_undeclared_builtin_options='' ;; #(
*) :
@@ -19944,8 +20477,8 @@
if test ${ac_cv_search_inet_aton+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -19982,11 +20515,13 @@
if test ${ac_cv_search_inet_aton+y}
then :
-else $as_nop
- ac_cv_search_inet_aton=no
+else case e in #(
+ e) ac_cv_search_inet_aton=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
printf "%s\n" "$ac_cv_search_inet_aton" >&6; }
@@ -20002,8 +20537,8 @@
if test ${ac_cv_search_gethostbyname+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20040,11 +20575,13 @@
if test ${ac_cv_search_gethostbyname+y}
then :
-else $as_nop
- ac_cv_search_gethostbyname=no
+else case e in #(
+ e) ac_cv_search_gethostbyname=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
printf "%s\n" "$ac_cv_search_gethostbyname" >&6; }
@@ -20060,8 +20597,8 @@
if test ${ac_cv_search_socket+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20098,11 +20635,13 @@
if test ${ac_cv_search_socket+y}
then :
-else $as_nop
- ac_cv_search_socket=no
+else case e in #(
+ e) ac_cv_search_socket=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
printf "%s\n" "$ac_cv_search_socket" >&6; }
@@ -20118,8 +20657,8 @@
if test ${ac_cv_search_gethostent+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20156,11 +20695,13 @@
if test ${ac_cv_search_gethostent+y}
then :
-else $as_nop
- ac_cv_search_gethostent=no
+else case e in #(
+ e) ac_cv_search_gethostent=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostent" >&5
printf "%s\n" "$ac_cv_search_gethostent" >&6; }
@@ -20204,8 +20745,8 @@
if test ${ac_cv_search_res_query+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20242,11 +20783,13 @@
if test ${ac_cv_search_res_query+y}
then :
-else $as_nop
- ac_cv_search_res_query=no
+else case e in #(
+ e) ac_cv_search_res_query=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_query" >&5
printf "%s\n" "$ac_cv_search_res_query" >&6; }
@@ -20255,14 +20798,14 @@
then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing __res_query" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing __res_query" >&5
printf %s "checking for library containing __res_query... " >&6; }
if test ${ac_cv_search___res_query+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20299,11 +20842,13 @@
if test ${ac_cv_search___res_query+y}
then :
-else $as_nop
- ac_cv_search___res_query=no
+else case e in #(
+ e) ac_cv_search___res_query=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_query" >&5
printf "%s\n" "$ac_cv_search___res_query" >&6; }
@@ -20313,7 +20858,8 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-
+ ;;
+esac
fi
# macOS uses an alternative name internally
@@ -20322,8 +20868,8 @@
if test ${ac_cv_search_res_9_query+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20360,11 +20906,13 @@
if test ${ac_cv_search_res_9_query+y}
then :
-else $as_nop
- ac_cv_search_res_9_query=no
+else case e in #(
+ e) ac_cv_search_res_9_query=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_query" >&5
printf "%s\n" "$ac_cv_search_res_9_query" >&6; }
@@ -20418,8 +20966,8 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -20453,8 +21001,8 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -20488,8 +21036,8 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -20523,8 +21071,8 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -20558,27 +21106,32 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -20588,8 +21141,9 @@
if test "x$ac_cv_have_decl_strerror_r" = xyes
then :
ac_have_decl=1
-else $as_nop
- ac_have_decl=0
+else case e in #(
+ e) ac_have_decl=0 ;;
+esac
fi
printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
@@ -20608,8 +21162,8 @@
if test ${ac_cv_func_strerror_r_char_p+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
ac_cv_func_strerror_r_char_p=no
if test $ac_cv_have_decl_strerror_r = yes; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20635,7 +21189,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
@@ -20653,8 +21208,8 @@
if test ${ac_cv_search_clock_gettime+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20691,11 +21246,13 @@
if test ${ac_cv_search_clock_gettime+y}
then :
-else $as_nop
- ac_cv_search_clock_gettime=no
+else case e in #(
+ e) ac_cv_search_clock_gettime=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
printf "%s\n" "$ac_cv_search_clock_gettime" >&6; }
@@ -20747,8 +21304,8 @@
if test ${boost_cv_inc_path+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_inc_path=no
+else case e in #(
+ e) boost_cv_inc_path=no
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20817,8 +21374,9 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
boost_cv_inc_path=yes
-else $as_nop
- boost_cv_version=no
+else case e in #(
+ e) boost_cv_version=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
if test x"$boost_cv_inc_path" = xyes; then
@@ -20834,7 +21392,8 @@
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_inc_path" >&5
printf "%s\n" "$boost_cv_inc_path" >&6; }
@@ -20860,8 +21419,8 @@
if test ${boost_cv_lib_version+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_ext=cpp
+else case e in #(
+ e) ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -20886,7 +21445,8 @@
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5
printf "%s\n" "$boost_cv_lib_version" >&6; }
@@ -20910,8 +21470,8 @@
if test ${boost_cv_pthread_flag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_pthread_flag=
+else case e in #(
+ e) boost_cv_pthread_flag=
# The ordering *is* (sometimes) important. Some notes on the
# individual items follow:
# (none): in case threads are in libc; should be tried before -Kthread and
@@ -20975,7 +21535,8 @@
LIBS=$boost_pthreads__save_LIBS
$boost_pthread_ok && break
done
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_pthread_flag" >&5
printf "%s\n" "$boost_cv_pthread_flag" >&6; }
@@ -20990,8 +21551,8 @@
if test ${boost_cv_lib_tag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_tag=unknown
+else case e in #(
+ e) boost_cv_lib_tag=unknown
if test x$boost_cv_inc_path != xno; then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -21321,7 +21882,8 @@
boost_cv_lib_tag=
;;
esac
-fi
+fi ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_tag" >&5
printf "%s\n" "$boost_cv_lib_tag" >&6; }
@@ -21329,8 +21891,9 @@
if test ${enable_static_boost+y}
then :
enableval=$enable_static_boost; enable_static_boost=yes
-else $as_nop
- enable_static_boost=no
+else case e in #(
+ e) enable_static_boost=no ;;
+esac
fi
# Check whether we do better use `mt' even though we weren't ask to.
@@ -21359,8 +21922,9 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
boost_guess_use_mt=:
-else $as_nop
- boost_guess_use_mt=false
+else case e in #(
+ e) boost_guess_use_mt=false ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_ext=cpp
@@ -21396,8 +21960,9 @@
printf "%s\n" "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h
-else $as_nop
- as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5
+else case e in #(
+ e) as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5 ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -21438,8 +22003,9 @@
printf "%s\n" "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -21457,8 +22023,8 @@
if test ${boost_cv_lib_system+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_system=no
+else case e in #(
+ e) boost_cv_lib_system=no
case "" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
@@ -21499,14 +22065,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"yes" != x"no"
+else case e in #(
+ e) if test x"yes" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost system" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -21586,13 +22153,14 @@
}
then :
boost_cv_lib_system=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_system=no
+ boost_cv_lib_system=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -21609,8 +22177,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -21650,13 +22218,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -21671,7 +22240,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -21690,7 +22260,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5
printf "%s\n" "$boost_cv_lib_system" >&6; }
@@ -21771,8 +22342,9 @@
printf "%s\n" "#define HAVE_BOOST_THREAD_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -21790,8 +22362,8 @@
if test ${boost_cv_lib_thread+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_thread=no
+else case e in #(
+ e) boost_cv_lib_thread=no
case "" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
@@ -21832,14 +22404,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"yes" != x"no"
+else case e in #(
+ e) if test x"yes" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost thread" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -21919,13 +22492,14 @@
}
then :
boost_cv_lib_thread=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_thread=no
+ boost_cv_lib_thread=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -21942,8 +22516,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -21983,13 +22557,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -22004,7 +22579,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -22023,7 +22599,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_thread" >&5
printf "%s\n" "$boost_cv_lib_thread" >&6; }
@@ -22105,8 +22682,9 @@
printf "%s\n" "#define HAVE_BOOST_CONTEXT_FIBER_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -22124,8 +22702,8 @@
if test ${boost_cv_lib_context+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_context=no
+else case e in #(
+ e) boost_cv_lib_context=no
case "" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
@@ -22184,14 +22762,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"yes" != x"no"
+else case e in #(
+ e) if test x"yes" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost context" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -22271,13 +22850,14 @@
}
then :
boost_cv_lib_context=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_context=no
+ boost_cv_lib_context=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -22294,8 +22874,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -22335,13 +22915,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -22356,7 +22937,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -22375,7 +22957,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_context" >&5
printf "%s\n" "$boost_cv_lib_context" >&6; }
@@ -22441,8 +23024,9 @@
printf "%s\n" "#define HAVE_BOOST_CONTEXT_EXECUTION_CONTEXT_V2_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -22460,8 +23044,8 @@
if test ${boost_cv_lib_context+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_context=no
+else case e in #(
+ e) boost_cv_lib_context=no
case "" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
@@ -22525,14 +23109,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"yes" != x"no"
+else case e in #(
+ e) if test x"yes" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost context" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -22612,13 +23197,14 @@
}
then :
boost_cv_lib_context=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_context=no
+ boost_cv_lib_context=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -22635,8 +23221,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -22676,13 +23262,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -22697,7 +23284,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -22716,7 +23304,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_context" >&5
printf "%s\n" "$boost_cv_lib_context" >&6; }
@@ -22782,8 +23371,9 @@
printf "%s\n" "#define HAVE_BOOST_CONTEXT_FCONTEXT_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -22801,8 +23391,8 @@
if test ${boost_cv_lib_context+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_context=no
+else case e in #(
+ e) boost_cv_lib_context=no
case "" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
@@ -22897,14 +23487,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"" != x"no"
+else case e in #(
+ e) if test x"" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost context" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -22984,13 +23575,14 @@
}
then :
boost_cv_lib_context=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_context=no
+ boost_cv_lib_context=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -23007,8 +23599,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -23048,13 +23640,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -23069,7 +23662,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -23088,7 +23682,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_context" >&5
printf "%s\n" "$boost_cv_lib_context" >&6; }
@@ -23137,9 +23732,10 @@
if test ${enable_unit_tests+y}
then :
enableval=$enable_unit_tests; enable_unit_tests=$enableval
-else $as_nop
- enable_unit_tests=no
-
+else case e in #(
+ e) enable_unit_tests=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_unit_tests" >&5
@@ -23185,8 +23781,9 @@
printf "%s\n" "#define HAVE_BOOST_TEST_UNIT_TEST_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -23204,8 +23801,8 @@
if test ${boost_cv_lib_unit_test_framework+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_unit_test_framework=no
+else case e in #(
+ e) boost_cv_lib_unit_test_framework=no
case "mt" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "Xmt" : 'Xmt-*\(.*\)'`;; #(
@@ -23248,14 +23845,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"" != x"no"
+else case e in #(
+ e) if test x"" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost unit_test_framework" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -23335,13 +23933,14 @@
}
then :
boost_cv_lib_unit_test_framework=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_unit_test_framework=no
+ boost_cv_lib_unit_test_framework=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -23358,8 +23957,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -23399,13 +23998,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -23420,7 +24020,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -23439,7 +24040,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_unit_test_framework" >&5
printf "%s\n" "$boost_cv_lib_unit_test_framework" >&6; }
@@ -23492,8 +24094,9 @@
if test ${enable_reproducible+y}
then :
enableval=$enable_reproducible; enable_reproducible=$enableval
-else $as_nop
- enable_reproducible=no
+else case e in #(
+ e) enable_reproducible=no ;;
+esac
fi
@@ -23507,8 +24110,8 @@
printf "%s\n" "#define REPRODUCIBLE 1" >>confdefs.h
-else $as_nop
-
+else case e in #(
+ e)
build_user=$(id -u -n)
case "$host_os" in
@@ -23524,7 +24127,8 @@
printf "%s\n" "#define BUILD_HOST \"$build_user@$build_host\"" >>confdefs.h
-
+ ;;
+esac
fi
@@ -23534,9 +24138,10 @@
if test ${enable_coverage+y}
then :
enableval=$enable_coverage; enable_coverage=$enableval
-else $as_nop
- enable_coverage=no
-
+else case e in #(
+ e) enable_coverage=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_coverage" >&5
@@ -23550,8 +24155,8 @@
if test ${gl_cv_warn_cxx__fprofile_instr_generate__fcoverage_mapping+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fprofile-instr-generate -fcoverage-mapping"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23568,13 +24173,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fprofile_instr_generate__fcoverage_mapping=yes
-else $as_nop
- gl_cv_warn_cxx__fprofile_instr_generate__fcoverage_mapping=no
+else case e in #(
+ e) gl_cv_warn_cxx__fprofile_instr_generate__fcoverage_mapping=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fprofile_instr_generate__fcoverage_mapping" >&5
printf "%s\n" "$gl_cv_warn_cxx__fprofile_instr_generate__fcoverage_mapping" >&6; }
@@ -23584,10 +24191,11 @@
CFLAGS="$CFLAGS -DCOVERAGE -DCLANG_COVERAGE -fprofile-instr-generate -fcoverage-mapping"
CXXFLAGS="$CXXFLAGS -DCOVERAGE -DCLANG_COVERAGE -fprofile-instr-generate -fcoverage-mapping"
-else $as_nop
-
+else case e in #(
+ e)
as_fn_error $? "$CXX does not support gathering coverage data in the clang format" "$LINENO" 5
-
+ ;;
+esac
fi
@@ -23601,8 +24209,8 @@
if test ${gl_cv_warn_cxx__fprofile_arcs__ftest_coverage+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fprofile-arcs -ftest-coverage"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23619,13 +24227,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fprofile_arcs__ftest_coverage=yes
-else $as_nop
- gl_cv_warn_cxx__fprofile_arcs__ftest_coverage=no
+else case e in #(
+ e) gl_cv_warn_cxx__fprofile_arcs__ftest_coverage=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fprofile_arcs__ftest_coverage" >&5
printf "%s\n" "$gl_cv_warn_cxx__fprofile_arcs__ftest_coverage" >&6; }
@@ -23636,10 +24246,11 @@
CXXFLAGS="$CXXFLAGS -DCOVERAGE --coverage"
LDFLAGS="$LDFLAGS --coverage"
-else $as_nop
-
+else case e in #(
+ e)
as_fn_error $? "$CXX does not support gathering coverage data" "$LINENO" 5
-
+ ;;
+esac
fi
@@ -23662,8 +24273,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $PKG_CONFIG in
+else case e in #(
+ e) case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -23688,6 +24299,7 @@
IFS=$as_save_IFS
;;
+esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -23710,8 +24322,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $ac_pt_PKG_CONFIG in
+else case e in #(
+ e) case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -23736,6 +24348,7 @@
IFS=$as_save_IFS
;;
+esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -23776,14 +24389,17 @@
PKG_CONFIG=""
fi
fi
+if test -z "$PKG_CONFIG"; then
+ as_fn_error $? "pkg-config not found" "$LINENO" 5
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
printf %s "checking for grep that handles long lines and -e... " >&6; }
if test ${ac_cv_path_GREP+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -z "$GREP"; then
+else case e in #(
+ e) if test -z "$GREP"; then
ac_path_GREP_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -23802,9 +24418,10 @@
as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
+case `"$ac_path_GREP" --version 2>&1` in #(
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -23839,7 +24456,8 @@
else
ac_cv_path_GREP=$GREP
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
printf "%s\n" "$ac_cv_path_GREP" >&6; }
@@ -23854,10 +24472,11 @@
withval=$with_lua;
with_lua=$withval
-else $as_nop
-
+else case e in #(
+ e)
with_lua=auto
-
+ ;;
+esac
fi
@@ -23871,7 +24490,7 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_lua" >&5
printf "%s\n" "$with_lua" >&6; }
- if test "x$with_lua" = "xno" -a "mandatory" = "mandatory"
+ if test "x$with_lua" = "xno"
then :
as_fn_error $? "--without-lua specified, but Lua is not optional" "$LINENO" 5
@@ -23882,14 +24501,11 @@
luajit_min_version='2.0.2'
lua_min_version='5.1'
- if test "x$with_lua" != "xno"
+ if test "x$with_lua" != "xauto"
then :
- if test "x$with_lua" != "xauto"
-then :
-
- with_lua_version=${lua_min_version}
- if echo "x$with_lua" | ${GREP} 'jit' >/dev/null 2>&1
+ with_lua_version=${lua_min_version}
+ if echo "x$with_lua" | ${GREP} 'jit' >/dev/null 2>&1
then :
with_lua_version=${luajit_min_version}
fi
@@ -23953,13 +24569,13 @@
echo "$LUA_PKG_ERRORS" >&5
- as_fn_error $? "Selected Lua ($with_lua) not found" "$LINENO" 5
+ as_fn_error $? "Selected Lua ($with_lua) not found" "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- as_fn_error $? "Selected Lua ($with_lua) not found" "$LINENO" 5
+ as_fn_error $? "Selected Lua ($with_lua) not found" "$LINENO" 5
else
LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -23970,12 +24586,12 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- LUAPC=$with_lua
+ LUAPC=$with_lua
fi
-else $as_nop
-
+else case e in #(
+ e)
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luajit >= ${luajit_min_version}" >&5
@@ -24046,18 +24662,18 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- LUAPC=luajit
+ LUAPC=luajit
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
fi
- if test -z "$LUAPC"
+ if test -z "$LUAPC"
then :
- found_lua=n
+ found_lua=n
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24133,14 +24749,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua5.3
+ found_lua=y
+ LUAPC=lua5.3
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24216,14 +24832,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua-5.3
+ found_lua=y
+ LUAPC=lua-5.3
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24299,14 +24915,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua53
+ found_lua=y
+ LUAPC=lua53
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24382,14 +24998,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua5.2
+ found_lua=y
+ LUAPC=lua5.2
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24465,14 +25081,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua-5.2
+ found_lua=y
+ LUAPC=lua-5.2
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24548,14 +25164,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua52
+ found_lua=y
+ LUAPC=lua52
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24631,14 +25247,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua5.1
+ found_lua=y
+ LUAPC=lua5.1
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24714,14 +25330,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua-5.1
+ found_lua=y
+ LUAPC=lua-5.1
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24797,14 +25413,14 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua51
+ found_lua=y
+ LUAPC=lua51
fi
fi
- if test "$found_lua" != "y"
+ if test "$found_lua" != "y"
then :
@@ -24880,8 +25496,8 @@
printf "%s\n" "#define HAVE_LUA 1" >>confdefs.h
- found_lua=y
- LUAPC=lua
+ found_lua=y
+ LUAPC=lua
fi
@@ -24889,12 +25505,11 @@
fi
-
-fi
-
+ ;;
+esac
fi
- if test -z "$LUAPC" -a "mandatory" = "mandatory"
+ if test -z "$LUAPC"
then :
as_fn_error $? "No Lua not found, but is mandatory" "$LINENO" 5
@@ -24954,9 +25569,10 @@
if test ${enable_verbose_logging+y}
then :
enableval=$enable_verbose_logging; enable_verbose_logging=$enableval
-else $as_nop
- enable_verbose_logging=no
-
+else case e in #(
+ e) enable_verbose_logging=no
+ ;;
+esac
fi
@@ -24988,8 +25604,8 @@
;;
esac
-else $as_nop
-
+else case e in #(
+ e)
# if pkg-config is installed and openssl has installed a .pc file,
# then use that information and don't search ssldirs
if test -n "$ac_tool_prefix"; then
@@ -25000,8 +25616,8 @@
if test ${ac_cv_prog_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$PKG_CONFIG"; then
+else case e in #(
+ e) if test -n "$PKG_CONFIG"; then
ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -25023,7 +25639,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -25045,8 +25662,8 @@
if test ${ac_cv_prog_ac_ct_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_PKG_CONFIG"; then
+else case e in #(
+ e) if test -n "$ac_ct_PKG_CONFIG"; then
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -25068,7 +25685,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
if test -n "$ac_ct_PKG_CONFIG"; then
@@ -25100,6 +25718,7 @@
LIBCRYPTO_LIBS=`$PKG_CONFIG libcrypto --libs-only-l 2>/dev/null`
LIBCRYPTO_INCLUDES=`$PKG_CONFIG libcrypto --cflags-only-I 2>/dev/null`
ssldir=`$PKG_CONFIG libcrypto --variable=prefix 2>/dev/null`
+ sslincdir=`$PKG_CONFIG libcrypto --variable=includedir 2>/dev/null`
found=true
fi
fi
@@ -25109,7 +25728,8 @@
ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
fi
-
+ ;;
+esac
fi
@@ -25126,6 +25746,7 @@
LIBCRYPTO_INCLUDES="-I$ssldir/include"
LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
LIBCRYPTO_LIBS="-lcrypto"
+ sslincdir="$ssldir/include"
found=true
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -25235,15 +25856,16 @@
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
as_fn_error $? "OpenSSL/libcrypto not found" "$LINENO" 5
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -25277,55 +25899,60 @@
# Find the headers we need for ECDSA
libcrypto_ecdsa=yes
- as_ac_Header=`printf "%s\n" "ac_cv_header_$ssldir/include/openssl/ecdsa.h" | $as_tr_sh`
-ac_fn_cxx_check_header_compile "$LINENO" "$ssldir/include/openssl/ecdsa.h" "$as_ac_Header" "$ac_includes_default"
+ as_ac_Header=`printf "%s\n" "ac_cv_header_$sslincdir/openssl/ecdsa.h" | sed "$as_sed_sh"`
+ac_fn_cxx_check_header_compile "$LINENO" "$sslincdir/openssl/ecdsa.h" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"
then :
ac_fn_check_decl "$LINENO" "NID_X9_62_prime256v1" "ac_cv_have_decl_NID_X9_62_prime256v1" "$ac_includes_default
-#include <$ssldir/include/openssl/evp.h>
+#include <$sslincdir/openssl/evp.h>
" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS"
if test "x$ac_cv_have_decl_NID_X9_62_prime256v1" = xyes
then :
ac_have_decl=1
-else $as_nop
- ac_have_decl=0
+else case e in #(
+ e) ac_have_decl=0 ;;
+esac
fi
printf "%s\n" "#define HAVE_DECL_NID_X9_62_PRIME256V1 $ac_have_decl" >>confdefs.h
if test $ac_have_decl = 1
then :
:
-else $as_nop
-
+else case e in #(
+ e)
libcrypto_ecdsa=no
-
+ ;;
+esac
fi
ac_fn_check_decl "$LINENO" "NID_secp384r1" "ac_cv_have_decl_NID_secp384r1" "$ac_includes_default
-#include <$ssldir/include/openssl/evp.h>
+#include <$sslincdir/openssl/evp.h>
" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS"
if test "x$ac_cv_have_decl_NID_secp384r1" = xyes
then :
ac_have_decl=1
-else $as_nop
- ac_have_decl=0
+else case e in #(
+ e) ac_have_decl=0 ;;
+esac
fi
printf "%s\n" "#define HAVE_DECL_NID_SECP384R1 $ac_have_decl" >>confdefs.h
if test $ac_have_decl = 1
then :
:
-else $as_nop
-
+else case e in #(
+ e)
libcrypto_ecdsa=no
-
+ ;;
+esac
fi
-else $as_nop
-
+else case e in #(
+ e)
libcrypto_ecdsa=no
-
+ ;;
+esac
fi
@@ -25358,13 +25985,14 @@
libcrypto_ed25519=no
libcrypto_ed448=no
ac_fn_check_decl "$LINENO" "NID_ED25519" "ac_cv_have_decl_NID_ED25519" "$ac_includes_default
- #include <$ssldir/include/openssl/evp.h>
+ #include <$sslincdir/openssl/evp.h>
" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS"
if test "x$ac_cv_have_decl_NID_ED25519" = xyes
then :
ac_have_decl=1
-else $as_nop
- ac_have_decl=0
+else case e in #(
+ e) ac_have_decl=0 ;;
+esac
fi
printf "%s\n" "#define HAVE_DECL_NID_ED25519 $ac_have_decl" >>confdefs.h
if test $ac_have_decl = 1
@@ -25375,18 +26003,20 @@
printf "%s\n" "#define HAVE_LIBCRYPTO_ED25519 1" >>confdefs.h
-else $as_nop
- :
+else case e in #(
+ e) : ;;
+esac
fi
ac_fn_check_decl "$LINENO" "NID_ED448" "ac_cv_have_decl_NID_ED448" "$ac_includes_default
- #include <$ssldir/include/openssl/evp.h>
+ #include <$sslincdir/openssl/evp.h>
" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS"
if test "x$ac_cv_have_decl_NID_ED448" = xyes
then :
ac_have_decl=1
-else $as_nop
- ac_have_decl=0
+else case e in #(
+ e) ac_have_decl=0 ;;
+esac
fi
printf "%s\n" "#define HAVE_DECL_NID_ED448 $ac_have_decl" >>confdefs.h
if test $ac_have_decl = 1
@@ -25397,8 +26027,9 @@
printf "%s\n" "#define HAVE_LIBCRYPTO_ED448 1" >>confdefs.h
-else $as_nop
- :
+else case e in #(
+ e) : ;;
+esac
fi
@@ -25409,8 +26040,9 @@
printf "%s\n" "#define HAVE_LIBCRYPTO_EDDSA 1" >>confdefs.h
-else $as_nop
- :
+else case e in #(
+ e) : ;;
+esac
fi
# Restore variables
@@ -25426,8 +26058,9 @@
if test ${with_libsodium+y}
then :
withval=$with_libsodium; with_libsodium=$withval
-else $as_nop
- with_libsodium=auto
+else case e in #(
+ e) with_libsodium=auto ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_libsodium" >&5
@@ -25584,8 +26217,9 @@
if test ${with_libcap+y}
then :
withval=$with_libcap; with_libcap=$withval
-else $as_nop
- with_libcap=auto
+else case e in #(
+ e) with_libcap=auto ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_libcap" >&5
@@ -25701,8 +26335,8 @@
if test -n "$HAVE_LIBCURL"
then :
:
-else $as_nop
-
+else case e in #(
+ e)
@@ -25732,8 +26366,9 @@
if test ${with_libcurl+y}
then :
withval=$with_libcurl; _libcurl_with=$withval
-else $as_nop
- _libcurl_with="yes"
+else case e in #(
+ e) _libcurl_with="yes" ;;
+esac
fi
@@ -25748,8 +26383,8 @@
if test ${ac_cv_prog_AWK+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$AWK"; then
+else case e in #(
+ e) if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -25771,7 +26406,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -25801,8 +26437,8 @@
if test ${ac_cv_path__libcurl_config+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $_libcurl_config in
+else case e in #(
+ e) case $_libcurl_config in
[\\/]* | ?:[\\/]*)
ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path.
;;
@@ -25827,6 +26463,7 @@
IFS=$as_save_IFS
;;
+esac ;;
esac
fi
_libcurl_config=$ac_cv_path__libcurl_config
@@ -25847,8 +26484,8 @@
if test ${ac_cv_path__libcurl_config+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $_libcurl_config in
+else case e in #(
+ e) case $_libcurl_config in
[\\/]* | ?:[\\/]*)
ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path.
;;
@@ -25873,6 +26510,7 @@
IFS=$as_save_IFS
;;
+esac ;;
esac
fi
_libcurl_config=$ac_cv_path__libcurl_config
@@ -25893,8 +26531,9 @@
if test ${libcurl_cv_lib_curl_version+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'`
+else case e in #(
+ e) libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'` ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5
printf "%s\n" "$libcurl_cv_lib_curl_version" >&6; }
@@ -25908,14 +26547,15 @@
if test ${libcurl_cv_lib_version_ok+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
if test $_libcurl_version -ge $_libcurl_wanted ; then
libcurl_cv_lib_version_ok=yes
else
libcurl_cv_lib_version_ok=no
fi
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5
printf "%s\n" "$libcurl_cv_lib_version_ok" >&6; }
@@ -25963,8 +26603,8 @@
if test ${libcurl_cv_lib_curl_usable+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
_libcurl_save_cppflags=$CPPFLAGS
CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
_libcurl_save_libs=$LIBS
@@ -25996,8 +26636,9 @@
if ac_fn_cxx_try_link "$LINENO"
then :
libcurl_cv_lib_curl_usable=yes
-else $as_nop
- libcurl_cv_lib_curl_usable=no
+else case e in #(
+ e) libcurl_cv_lib_curl_usable=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -26006,7 +26647,8 @@
LIBS=$_libcurl_save_libs
unset _libcurl_save_cppflags
unset _libcurl_save_libs
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5
printf "%s\n" "$libcurl_cv_lib_curl_usable" >&6; }
@@ -26025,10 +26667,11 @@
if test "x$ac_cv_func_curl_free" = xyes
then :
-else $as_nop
-
+else case e in #(
+ e)
printf "%s\n" "#define curl_free free" >>confdefs.h
-
+ ;;
+esac
fi
@@ -26045,10 +26688,10 @@
for _libcurl_feature in $_libcurl_features ; do
cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1
+#define `printf "%s\n" "libcurl_feature_$_libcurl_feature" | sed "$as_sed_cpp"` 1
_ACEOF
- eval `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes
+ eval `printf "%s\n" "libcurl_feature_$_libcurl_feature" | sed "$as_sed_sh"`=yes
done
if test "x$_libcurl_protocols" = "x" ; then
@@ -26076,10 +26719,10 @@
for _libcurl_protocol in $_libcurl_protocols ; do
cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1
+#define `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | sed "$as_sed_cpp"` 1
_ACEOF
- eval `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes
+ eval `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | sed "$as_sed_sh"`=yes
done
else
unset LIBCURL
@@ -26108,7 +26751,8 @@
unset _libcurl_with
-
+ ;;
+esac
fi
if test "$HAVE_LIBCURL" = "y"; then
HAVE_LIBCURL_TRUE=
@@ -26128,8 +26772,9 @@
if test ${with_net_snmp+y}
then :
withval=$with_net_snmp; with_net_snmp=$withval
-else $as_nop
- with_net_snmp=no
+else case e in #(
+ e) with_net_snmp=no ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_net_snmp" >&5
@@ -26148,8 +26793,8 @@
if test ${ac_cv_prog_NET_SNMP_LIBS+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$NET_SNMP_LIBS"; then
+else case e in #(
+ e) if test -n "$NET_SNMP_LIBS"; then
ac_cv_prog_NET_SNMP_LIBS="$NET_SNMP_LIBS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -26171,7 +26816,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
NET_SNMP_LIBS=$ac_cv_prog_NET_SNMP_LIBS
if test -n "$NET_SNMP_LIBS"; then
@@ -26195,8 +26841,9 @@
if test "x$ac_cv_have_decl_snmp_select_info2" = xyes
then :
ac_have_decl=1
-else $as_nop
- ac_have_decl=0
+else case e in #(
+ e) ac_have_decl=0 ;;
+esac
fi
printf "%s\n" "#define HAVE_DECL_SNMP_SELECT_INFO2 $ac_have_decl" >>confdefs.h
if test $ac_have_decl = 1
@@ -26206,8 +26853,9 @@
printf "%s\n" "#define HAVE_SNMP_SELECT_INFO2 1" >>confdefs.h
-else $as_nop
- :
+else case e in #(
+ e) : ;;
+esac
fi
@@ -26259,9 +26907,10 @@
if test ${enable_dns_over_tls+y}
then :
enableval=$enable_dns_over_tls; enable_dns_over_tls=$enableval
-else $as_nop
- enable_dns_over_tls=no
-
+else case e in #(
+ e) enable_dns_over_tls=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_dns_over_tls" >&5
@@ -26296,8 +26945,9 @@
if test ${with_libssl+y}
then :
withval=$with_libssl; with_libssl=$withval
-else $as_nop
- with_libssl=auto
+else case e in #(
+ e) with_libssl=auto ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_libssl" >&5
@@ -26516,8 +27166,8 @@
if test ${ac_cv_prog_RAGEL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$RAGEL"; then
+else case e in #(
+ e) if test -n "$RAGEL"; then
ac_cv_prog_RAGEL="$RAGEL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -26539,7 +27189,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
RAGEL=$ac_cv_prog_RAGEL
if test -n "$RAGEL"; then
@@ -26565,8 +27216,8 @@
if test ${ac_cv_prog_CURL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CURL"; then
+else case e in #(
+ e) if test -n "$CURL"; then
ac_cv_prog_CURL="$CURL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -26588,7 +27239,8 @@
done
IFS=$as_save_IFS
-fi
+fi ;;
+esac
fi
CURL=$ac_cv_prog_CURL
if test -n "$CURL"; then
@@ -26601,8 +27253,8 @@
if test "x$CURL" = "x"; then
- if test ! -f "${srcdir}/effective_tld_names.dat"; then
- as_fn_error $? "curl is missing and you don't have ${srcdir}//effective_tld_names.dat. Install curl or download sources from www.powerdns.com" "$LINENO" 5
+ if test ! -f "${srcdir}/pubsuffix.cc"; then
+ as_fn_error $? "curl is missing and you don't have ${srcdir}//pubsuffix.cc. Install curl or download sources from www.powerdns.com" "$LINENO" 5
fi
fi
@@ -26629,7 +27281,6 @@
-
ac_fn_cxx_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
if test "x$ac_cv_func_explicit_bzero" = xyes
then :
@@ -26665,8 +27316,8 @@
if test ${ac_cv_search_pthread_setaffinity_np+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26703,11 +27354,13 @@
if test ${ac_cv_search_pthread_setaffinity_np+y}
then :
-else $as_nop
- ac_cv_search_pthread_setaffinity_np=no
+else case e in #(
+ e) ac_cv_search_pthread_setaffinity_np=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_setaffinity_np" >&5
printf "%s\n" "$ac_cv_search_pthread_setaffinity_np" >&6; }
@@ -26725,8 +27378,8 @@
if test ${ac_cv_search_pthread_getattr_np+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26763,11 +27416,13 @@
if test ${ac_cv_search_pthread_getattr_np+y}
then :
-else $as_nop
- ac_cv_search_pthread_getattr_np=no
+else case e in #(
+ e) ac_cv_search_pthread_getattr_np=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_getattr_np" >&5
printf "%s\n" "$ac_cv_search_pthread_getattr_np" >&6; }
@@ -26785,8 +27440,8 @@
if test ${ac_cv_search_pthread_get_stackaddr_np+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26823,11 +27478,13 @@
if test ${ac_cv_search_pthread_get_stackaddr_np+y}
then :
-else $as_nop
- ac_cv_search_pthread_get_stackaddr_np=no
+else case e in #(
+ e) ac_cv_search_pthread_get_stackaddr_np=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_get_stackaddr_np" >&5
printf "%s\n" "$ac_cv_search_pthread_get_stackaddr_np" >&6; }
@@ -26845,8 +27502,8 @@
if test ${ac_cv_search_pthread_get_stacksize_np+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_func_search_save_LIBS=$LIBS
+else case e in #(
+ e) ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26883,11 +27540,13 @@
if test ${ac_cv_search_pthread_get_stacksize_np+y}
then :
-else $as_nop
- ac_cv_search_pthread_get_stacksize_np=no
+else case e in #(
+ e) ac_cv_search_pthread_get_stacksize_np=no ;;
+esac
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_get_stacksize_np" >&5
printf "%s\n" "$ac_cv_search_pthread_get_stacksize_np" >&6; }
@@ -26921,9 +27580,10 @@
if test ${enable_nod+y}
then :
enableval=$enable_nod; enable_nod=$enableval
-else $as_nop
- enable_nod=auto
-
+else case e in #(
+ e) enable_nod=auto
+ ;;
+esac
fi
@@ -26950,8 +27610,9 @@
printf "%s\n" "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h
-else $as_nop
- as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5
+else case e in #(
+ e) as_fn_error $? "cannot find boost/system/error_code.hpp" "$LINENO" 5 ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -26992,8 +27653,9 @@
printf "%s\n" "#define HAVE_BOOST_SYSTEM_ERROR_CODE_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -27011,8 +27673,8 @@
if test ${boost_cv_lib_system+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_system=no
+else case e in #(
+ e) boost_cv_lib_system=no
case "" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
@@ -27053,14 +27715,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"no" != x"no"
+else case e in #(
+ e) if test x"no" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost system" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -27140,13 +27803,14 @@
}
then :
boost_cv_lib_system=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_system=no
+ boost_cv_lib_system=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -27163,8 +27827,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -27204,13 +27868,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -27225,7 +27890,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -27244,7 +27910,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_system" >&5
printf "%s\n" "$boost_cv_lib_system" >&6; }
@@ -27315,8 +27982,9 @@
printf "%s\n" "#define HAVE_BOOST_FILESYSTEM_PATH_HPP 1" >>confdefs.h
-else $as_nop
- $not_found_header
+else case e in #(
+ e) $not_found_header ;;
+esac
fi
CPPFLAGS=$boost_save_CPPFLAGS
@@ -27334,8 +28002,8 @@
if test ${boost_cv_lib_filesystem+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- boost_cv_lib_filesystem=no
+else case e in #(
+ e) boost_cv_lib_filesystem=no
case "" in #(
(mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
(mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
@@ -27376,14 +28044,15 @@
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_objext=do_not_rm_me_plz
-else $as_nop
- if test x"no" != x"no"
+else case e in #(
+ e) if test x"no" != x"no"
then :
as_fn_error $? "cannot compile a test that uses Boost filesystem" "$LINENO" 5
fi
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam
ac_objext=$boost_save_ac_objext
@@ -27463,13 +28132,14 @@
}
then :
boost_cv_lib_filesystem=yes
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_cv_lib_filesystem=no
+ boost_cv_lib_filesystem=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -27486,8 +28156,8 @@
if test ${boost_cv_rpath_link_ldflag+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $boost_ldpath in
+else case e in #(
+ e) case $boost_ldpath in
'') # Nothing to do.
boost_cv_rpath_link_ldflag=
boost_rpath_link_ldflag_found=yes;;
@@ -27527,13 +28197,14 @@
then :
boost_rpath_link_ldflag_found=yes
break
-else $as_nop
- if $boost_use_source; then
+else case e in #(
+ e) if $boost_use_source; then
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
- boost_rpath_link_ldflag_found=no
+ boost_rpath_link_ldflag_found=no ;;
+esac
fi
ac_objext=$boost_save_ac_objext
ac_ext=$boost_save_ac_ext
@@ -27548,7 +28219,8 @@
fi
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
-
+ ;;
+esac
fi
test x"$boost_ldpath" != x &&
@@ -27567,7 +28239,8 @@
done
done # boost_lib_
rm -f conftest.$ac_objext
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_filesystem" >&5
printf "%s\n" "$boost_cv_lib_filesystem" >&6; }
@@ -27625,8 +28298,9 @@
if test "x$BOOST_FILESYSTEM_LIBS" != "x"
then :
enable_nod="yes"
-else $as_nop
- enable_nod="no"
+else case e in #(
+ e) enable_nod="no" ;;
+esac
fi
fi
@@ -27668,8 +28342,9 @@
if test ${enable_dnstap+y}
then :
enableval=$enable_dnstap; enable_dnstap=$enableval
-else $as_nop
- enable_dnstap=auto
+else case e in #(
+ e) enable_dnstap=auto ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_dnstap" >&5
@@ -27801,9 +28476,10 @@
if test ${enable_hardening+y}
then :
enableval=$enable_hardening; enable_hardening=$enableval
-else $as_nop
- enable_hardening=yes
-
+else case e in #(
+ e) enable_hardening=yes
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_hardening" >&5
@@ -27814,8 +28490,8 @@
if test ${gl_cv_warn_cxx__Werror__Wunknown_warning_option+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27832,21 +28508,24 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__Werror__Wunknown_warning_option=yes
-else $as_nop
- gl_cv_warn_cxx__Werror__Wunknown_warning_option=no
+else case e in #(
+ e) gl_cv_warn_cxx__Werror__Wunknown_warning_option=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Werror__Wunknown_warning_option" >&5
printf "%s\n" "$gl_cv_warn_cxx__Werror__Wunknown_warning_option" >&6; }
if test "x$gl_cv_warn_cxx__Werror__Wunknown_warning_option" = xyes
then :
gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'
-else $as_nop
- gl_unknown_warnings_are_errors=
+else case e in #(
+ e) gl_unknown_warnings_are_errors= ;;
+esac
fi
if test "x$enable_hardening" != "xno"
@@ -27866,8 +28545,8 @@
if test ${gl_cv_warn_cxx__pie+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -pie"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27888,13 +28567,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__pie=yes
-else $as_nop
- gl_cv_warn_cxx__pie=no
+else case e in #(
+ e) gl_cv_warn_cxx__pie=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__pie" >&5
printf "%s\n" "$gl_cv_warn_cxx__pie" >&6; }
@@ -27904,15 +28585,15 @@
PIE_CFLAGS="-fPIE -DPIE"
PIE_LDFLAGS="-pie"
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -Wl,-pie" >&5
printf %s "checking whether C++ compiler handles -Wl,-pie... " >&6; }
if test ${gl_cv_warn_cxx__Wl__pie+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -Wl,-pie"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27933,13 +28614,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__Wl__pie=yes
-else $as_nop
- gl_cv_warn_cxx__Wl__pie=no
+else case e in #(
+ e) gl_cv_warn_cxx__Wl__pie=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__Wl__pie" >&5
printf "%s\n" "$gl_cv_warn_cxx__Wl__pie" >&6; }
@@ -27951,7 +28634,8 @@
fi
-
+ ;;
+esac
fi
esac
@@ -27965,8 +28649,8 @@
if test ${gl_cv_warn_cxx__fstack_protector+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fstack-protector"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27983,13 +28667,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fstack_protector=yes
-else $as_nop
- gl_cv_warn_cxx__fstack_protector=no
+else case e in #(
+ e) gl_cv_warn_cxx__fstack_protector=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fstack_protector" >&5
printf "%s\n" "$gl_cv_warn_cxx__fstack_protector" >&6; }
@@ -28008,8 +28694,8 @@
if test ${gl_cv_warn_cxx___param_ssp_buffer_size_4+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors --param ssp-buffer-size=4"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28026,13 +28712,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx___param_ssp_buffer_size_4=yes
-else $as_nop
- gl_cv_warn_cxx___param_ssp_buffer_size_4=no
+else case e in #(
+ e) gl_cv_warn_cxx___param_ssp_buffer_size_4=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx___param_ssp_buffer_size_4" >&5
printf "%s\n" "$gl_cv_warn_cxx___param_ssp_buffer_size_4" >&6; }
@@ -28050,9 +28738,10 @@
if test ${enable_fortify_source+y}
then :
enableval=$enable_fortify_source; enable_fortify_source=$enableval
-else $as_nop
- enable_fortify_source=2
-
+else case e in #(
+ e) enable_fortify_source=2
+ ;;
+esac
fi
@@ -28073,8 +28762,8 @@
if test ${gl_cv_warn_cxx__D_FORTIFY_SOURCE_3+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -D_FORTIFY_SOURCE=3"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28091,13 +28780,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__D_FORTIFY_SOURCE_3=yes
-else $as_nop
- gl_cv_warn_cxx__D_FORTIFY_SOURCE_3=no
+else case e in #(
+ e) gl_cv_warn_cxx__D_FORTIFY_SOURCE_3=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__D_FORTIFY_SOURCE_3" >&5
printf "%s\n" "$gl_cv_warn_cxx__D_FORTIFY_SOURCE_3" >&6; }
@@ -28107,8 +28798,9 @@
CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 $CFLAGS"
CXXFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 $CXXFLAGS"
-else $as_nop
- enable_fortify_source=2
+else case e in #(
+ e) enable_fortify_source=2 ;;
+esac
fi
@@ -28122,8 +28814,8 @@
if test ${gl_cv_warn_cxx__D_FORTIFY_SOURCE_2+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -D_FORTIFY_SOURCE=2"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28140,13 +28832,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__D_FORTIFY_SOURCE_2=yes
-else $as_nop
- gl_cv_warn_cxx__D_FORTIFY_SOURCE_2=no
+else case e in #(
+ e) gl_cv_warn_cxx__D_FORTIFY_SOURCE_2=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__D_FORTIFY_SOURCE_2" >&5
printf "%s\n" "$gl_cv_warn_cxx__D_FORTIFY_SOURCE_2" >&6; }
@@ -28156,8 +28850,9 @@
CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
CXXFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CXXFLAGS"
-else $as_nop
- enable_fortify_source=1
+else case e in #(
+ e) enable_fortify_source=1 ;;
+esac
fi
@@ -28171,8 +28866,8 @@
if test ${gl_cv_warn_cxx__D_FORTIFY_SOURCE_1+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -D_FORTIFY_SOURCE=1"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28189,13 +28884,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__D_FORTIFY_SOURCE_1=yes
-else $as_nop
- gl_cv_warn_cxx__D_FORTIFY_SOURCE_1=no
+else case e in #(
+ e) gl_cv_warn_cxx__D_FORTIFY_SOURCE_1=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__D_FORTIFY_SOURCE_1" >&5
printf "%s\n" "$gl_cv_warn_cxx__D_FORTIFY_SOURCE_1" >&6; }
@@ -28205,8 +28902,9 @@
CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 $CFLAGS"
CXXFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 $CXXFLAGS"
-else $as_nop
- enable_fortify_source=no
+else case e in #(
+ e) enable_fortify_source=no ;;
+esac
fi
@@ -28237,10 +28935,11 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RELRO_LDFLAGS" >&5
printf "%s\n" "$RELRO_LDFLAGS" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
printf "%s\n" "unknown" >&6; }
-
+ ;;
+esac
fi
@@ -28253,8 +28952,9 @@
if test ${enable_auto_var_init+y}
then :
enableval=$enable_auto_var_init; enable_initautovars=$enableval
-else $as_nop
- enable_initautovars=no
+else case e in #(
+ e) enable_initautovars=no ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_initautovars" >&5
@@ -28275,8 +28975,8 @@
if test ${gl_cv_warn_cxx__ftrivial_auto_var_init_zero+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -ftrivial-auto-var-init=zero"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28293,13 +28993,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__ftrivial_auto_var_init_zero=yes
-else $as_nop
- gl_cv_warn_cxx__ftrivial_auto_var_init_zero=no
+else case e in #(
+ e) gl_cv_warn_cxx__ftrivial_auto_var_init_zero=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__ftrivial_auto_var_init_zero" >&5
printf "%s\n" "$gl_cv_warn_cxx__ftrivial_auto_var_init_zero" >&6; }
@@ -28322,8 +29024,8 @@
if test ${gl_cv_warn_cxx__ftrivial_auto_var_init_pattern+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -ftrivial-auto-var-init=pattern"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28340,13 +29042,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__ftrivial_auto_var_init_pattern=yes
-else $as_nop
- gl_cv_warn_cxx__ftrivial_auto_var_init_pattern=no
+else case e in #(
+ e) gl_cv_warn_cxx__ftrivial_auto_var_init_pattern=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__ftrivial_auto_var_init_pattern" >&5
printf "%s\n" "$gl_cv_warn_cxx__ftrivial_auto_var_init_pattern" >&6; }
@@ -28370,9 +29074,10 @@
if test ${enable_asan+y}
then :
enableval=$enable_asan; enable_asan=$enableval
-else $as_nop
- enable_asan=no
-
+else case e in #(
+ e) enable_asan=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_asan" >&5
@@ -28386,8 +29091,8 @@
if test ${gl_cv_warn_cxx__fsanitize_address+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fsanitize=address"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28404,13 +29109,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fsanitize_address=yes
-else $as_nop
- gl_cv_warn_cxx__fsanitize_address=no
+else case e in #(
+ e) gl_cv_warn_cxx__fsanitize_address=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fsanitize_address" >&5
printf "%s\n" "$gl_cv_warn_cxx__fsanitize_address" >&6; }
@@ -28425,8 +29132,9 @@
then :
printf "%s\n" "#define HAVE_SANITIZER_COMMON_INTERFACE_DEFS_H 1" >>confdefs.h
asan_headers=yes
-else $as_nop
- asan_headers=no
+else case e in #(
+ e) asan_headers=no ;;
+esac
fi
done
@@ -28467,8 +29175,8 @@
printf "%s\n" "#define HAVE_SANITIZER_FINISH_SWITCH_FIBER_SINGLE_PTR 1" >>confdefs.h
-else $as_nop
-
+else case e in #(
+ e)
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -28496,24 +29204,27 @@
printf "%s\n" "#define HAVE_SANITIZER_FINISH_SWITCH_FIBER_THREE_PTRS 1" >>confdefs.h
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
printf "%s\n" "unknown" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ASAN fiber switching is not available due to an unknown API version" >&5
printf "%s\n" "$as_me: ASAN fiber switching is not available due to an unknown API version" >&6;}
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+ ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-else $as_nop
-
+else case e in #(
+ e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ASAN fiber switching is not available" >&5
printf "%s\n" "$as_me: ASAN fiber switching is not available" >&6;}
-
+ ;;
+esac
fi
fi
@@ -28530,9 +29241,10 @@
done
-else $as_nop
- as_fn_error $? "Cannot enable AddressSanitizer" "$LINENO" 5
-
+else case e in #(
+ e) as_fn_error $? "Cannot enable AddressSanitizer" "$LINENO" 5
+ ;;
+esac
fi
@@ -28547,9 +29259,10 @@
if test ${enable_msan+y}
then :
enableval=$enable_msan; enable_msan=$enableval
-else $as_nop
- enable_msan=no
-
+else case e in #(
+ e) enable_msan=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_msan" >&5
@@ -28563,8 +29276,8 @@
if test ${gl_cv_warn_cxx__fsanitize_memory+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fsanitize=memory"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28581,22 +29294,25 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fsanitize_memory=yes
-else $as_nop
- gl_cv_warn_cxx__fsanitize_memory=no
+else case e in #(
+ e) gl_cv_warn_cxx__fsanitize_memory=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fsanitize_memory" >&5
printf "%s\n" "$gl_cv_warn_cxx__fsanitize_memory" >&6; }
if test "x$gl_cv_warn_cxx__fsanitize_memory" = xyes
then :
SANITIZER_FLAGS="-fsanitize=memory $SANITIZER_FLAGS"
-else $as_nop
- as_fn_error $? "Cannot enable MemorySanitizer" "$LINENO" 5
-
+else case e in #(
+ e) as_fn_error $? "Cannot enable MemorySanitizer" "$LINENO" 5
+ ;;
+esac
fi
@@ -28611,9 +29327,10 @@
if test ${enable_tsan+y}
then :
enableval=$enable_tsan; enable_tsan=$enableval
-else $as_nop
- enable_tsan=no
-
+else case e in #(
+ e) enable_tsan=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_tsan" >&5
@@ -28627,8 +29344,8 @@
if test ${gl_cv_warn_cxx__fsanitize_thread+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fsanitize=thread"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28645,22 +29362,25 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fsanitize_thread=yes
-else $as_nop
- gl_cv_warn_cxx__fsanitize_thread=no
+else case e in #(
+ e) gl_cv_warn_cxx__fsanitize_thread=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fsanitize_thread" >&5
printf "%s\n" "$gl_cv_warn_cxx__fsanitize_thread" >&6; }
if test "x$gl_cv_warn_cxx__fsanitize_thread" = xyes
then :
SANITIZER_FLAGS="-fsanitize=thread $SANITIZER_FLAGS"
-else $as_nop
- as_fn_error $? "Cannot enable ThreadSanitizer" "$LINENO" 5
-
+else case e in #(
+ e) as_fn_error $? "Cannot enable ThreadSanitizer" "$LINENO" 5
+ ;;
+esac
fi
@@ -28675,9 +29395,10 @@
if test ${enable_lsan+y}
then :
enableval=$enable_lsan; enable_lsan=$enableval
-else $as_nop
- enable_lsan=no
-
+else case e in #(
+ e) enable_lsan=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_lsan" >&5
@@ -28691,8 +29412,8 @@
if test ${gl_cv_warn_cxx__fsanitize_leak+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fsanitize=leak"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28709,22 +29430,25 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fsanitize_leak=yes
-else $as_nop
- gl_cv_warn_cxx__fsanitize_leak=no
+else case e in #(
+ e) gl_cv_warn_cxx__fsanitize_leak=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fsanitize_leak" >&5
printf "%s\n" "$gl_cv_warn_cxx__fsanitize_leak" >&6; }
if test "x$gl_cv_warn_cxx__fsanitize_leak" = xyes
then :
SANITIZER_FLAGS="-fsanitize=leak $SANITIZER_FLAGS"
-else $as_nop
- as_fn_error $? "Cannot enable LeakSanitizer" "$LINENO" 5
-
+else case e in #(
+ e) as_fn_error $? "Cannot enable LeakSanitizer" "$LINENO" 5
+ ;;
+esac
fi
for ac_header in sanitizer/lsan_interface.h
@@ -28751,9 +29475,10 @@
if test ${enable_ubsan+y}
then :
enableval=$enable_ubsan; enable_ubsan=$enableval
-else $as_nop
- enable_ubsan=no
-
+else case e in #(
+ e) enable_ubsan=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_ubsan" >&5
@@ -28767,8 +29492,8 @@
if test ${gl_cv_warn_cxx__fsanitize_undefined+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fsanitize=undefined"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28785,22 +29510,25 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fsanitize_undefined=yes
-else $as_nop
- gl_cv_warn_cxx__fsanitize_undefined=no
+else case e in #(
+ e) gl_cv_warn_cxx__fsanitize_undefined=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fsanitize_undefined" >&5
printf "%s\n" "$gl_cv_warn_cxx__fsanitize_undefined" >&6; }
if test "x$gl_cv_warn_cxx__fsanitize_undefined" = xyes
then :
SANITIZER_FLAGS="-fsanitize=undefined $SANITIZER_FLAGS"
-else $as_nop
- as_fn_error $? "Cannot enable Undefined Behaviour Sanitizer" "$LINENO" 5
-
+else case e in #(
+ e) as_fn_error $? "Cannot enable Undefined Behaviour Sanitizer" "$LINENO" 5
+ ;;
+esac
fi
@@ -28845,8 +29573,8 @@
if test ${gl_cv_warn_cxx__fno_omit_frame_pointer+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -fno-omit-frame-pointer"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28863,13 +29591,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__fno_omit_frame_pointer=yes
-else $as_nop
- gl_cv_warn_cxx__fno_omit_frame_pointer=no
+else case e in #(
+ e) gl_cv_warn_cxx__fno_omit_frame_pointer=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__fno_omit_frame_pointer" >&5
printf "%s\n" "$gl_cv_warn_cxx__fno_omit_frame_pointer" >&6; }
@@ -28887,9 +29617,10 @@
if test ${enable_lto+y}
then :
enableval=$enable_lto; enable_lto=$enableval
-else $as_nop
- enable_lto=no
-
+else case e in #(
+ e) enable_lto=no
+ ;;
+esac
fi
@@ -28905,8 +29636,8 @@
if test ${gl_cv_warn_cxx__flto_thin+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -flto=thin"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28923,13 +29654,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__flto_thin=yes
-else $as_nop
- gl_cv_warn_cxx__flto_thin=no
+else case e in #(
+ e) gl_cv_warn_cxx__flto_thin=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__flto_thin" >&5
printf "%s\n" "$gl_cv_warn_cxx__flto_thin" >&6; }
@@ -28940,8 +29673,9 @@
CXXFLAGS="-flto=thin $CXXFLAGS"
LDFLAGS="-flto=thin $LDFLAGS"
-else $as_nop
- enable_lto=auto
+else case e in #(
+ e) enable_lto=auto ;;
+esac
fi
@@ -28955,8 +29689,8 @@
if test ${gl_cv_warn_cxx__flto_auto+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -flto=auto"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28973,13 +29707,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__flto_auto=yes
-else $as_nop
- gl_cv_warn_cxx__flto_auto=no
+else case e in #(
+ e) gl_cv_warn_cxx__flto_auto=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__flto_auto" >&5
printf "%s\n" "$gl_cv_warn_cxx__flto_auto" >&6; }
@@ -28990,8 +29726,9 @@
CXXFLAGS="-flto=auto $CXXFLAGS"
LDFLAGS="-flto=auto $LDFLAGS"
-else $as_nop
- enable_lto=yes
+else case e in #(
+ e) enable_lto=yes ;;
+esac
fi
@@ -29005,8 +29742,8 @@
if test ${gl_cv_warn_cxx__flto+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+ e)
gl_save_compiler_FLAGS="$CXXFLAGS"
as_fn_append CXXFLAGS " $gl_unknown_warnings_are_errors -flto"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29023,13 +29760,15 @@
if ac_fn_cxx_try_link "$LINENO"
then :
gl_cv_warn_cxx__flto=yes
-else $as_nop
- gl_cv_warn_cxx__flto=no
+else case e in #(
+ e) gl_cv_warn_cxx__flto=no ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$gl_save_compiler_FLAGS"
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_cxx__flto" >&5
printf "%s\n" "$gl_cv_warn_cxx__flto" >&6; }
@@ -29040,8 +29779,9 @@
CXXFLAGS="-flto $CXXFLAGS"
LDFLAGS="-flto $LDFLAGS"
-else $as_nop
- enable_lto=no
+else case e in #(
+ e) enable_lto=no ;;
+esac
fi
@@ -29061,9 +29801,10 @@
if test ${enable_malloc_trace+y}
then :
enableval=$enable_malloc_trace; enable_malloc_trace=$enableval
-else $as_nop
- enable_malloc_trace=no
-
+else case e in #(
+ e) enable_malloc_trace=no
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_malloc_trace" >&5
@@ -29090,8 +29831,9 @@
if test ${enable_valgrind+y}
then :
enableval=$enable_valgrind; enable_valgrind=$enableval
-else $as_nop
- enable_valgrind=no
+else case e in #(
+ e) enable_valgrind=no ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_valgrind" >&5
@@ -29110,8 +29852,9 @@
then :
printf "%s\n" "#define HAVE_VALGRIND_VALGRIND_H 1" >>confdefs.h
valgrind_headers=yes
-else $as_nop
- valgrind_headers=no
+else case e in #(
+ e) valgrind_headers=no ;;
+esac
fi
done
@@ -29181,8 +29924,9 @@
if test ${with_systemd+y}
then :
withval=$with_systemd; SYSTEMD_DIR="$withval"
-else $as_nop
- SYSTEMD_DIR=""
+else case e in #(
+ e) SYSTEMD_DIR="" ;;
+esac
fi
@@ -29192,8 +29936,9 @@
if test ${with_systemd+y}
then :
withval=$with_systemd; SYSTEMD_MODULES_LOAD="$withval"
-else $as_nop
- SYSTEMD_MODULES_LOAD=""
+else case e in #(
+ e) SYSTEMD_MODULES_LOAD="" ;;
+esac
fi
@@ -29205,14 +29950,14 @@
then :
for libname in systemd-daemon systemd; do
- as_ac_Lib=`printf "%s\n" "ac_cv_lib_$libname""_sd_listen_fds" | $as_tr_sh`
+ as_ac_Lib=`printf "%s\n" "ac_cv_lib_$libname""_sd_listen_fds" | sed "$as_sed_sh"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -l$libname" >&5
printf %s "checking for sd_listen_fds in -l$libname... " >&6; }
if eval test \${$as_ac_Lib+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
LIBS="-l$libname $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -29231,12 +29976,14 @@
if ac_fn_cxx_try_link "$LINENO"
then :
eval "$as_ac_Lib=yes"
-else $as_nop
- eval "$as_ac_Lib=no"
+else case e in #(
+ e) eval "$as_ac_Lib=no" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
fi
eval ac_res=\$$as_ac_Lib
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -29347,8 +30094,8 @@
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -29358,7 +30105,7 @@
See the pkg-config man page for more details.
To get pkg-config, see .
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
else
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
@@ -29398,12 +30145,14 @@
fi
-else $as_nop
- systemd=n
+else case e in #(
+ e) systemd=n ;;
+esac
fi
-else $as_nop
- systemd=n
+else case e in #(
+ e) systemd=n ;;
+esac
fi
@@ -29418,8 +30167,8 @@
if test ${ac_cv_path_SYSTEMCTL+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $SYSTEMCTL in
+else case e in #(
+ e) case $SYSTEMCTL in
[\\/]* | ?:[\\/]*)
ac_cv_path_SYSTEMCTL="$SYSTEMCTL" # Let the user override the test with a path.
;;
@@ -29445,6 +30194,7 @@
test -z "$ac_cv_path_SYSTEMCTL" && ac_cv_path_SYSTEMCTL="no"
;;
+esac ;;
esac
fi
SYSTEMCTL=$ac_cv_path_SYSTEMCTL
@@ -29460,8 +30210,8 @@
if test "$SYSTEMCTL" = "no"
then :
as_fn_error $? "systemctl not found" "$LINENO" 5
-else $as_nop
-
+else case e in #(
+ e)
_systemd_version=`${SYSTEMCTL} --version|head -1 | tr ".~" " " | cut -d" " -f 2`
if test $_systemd_version -ge 183; then
systemd_private_tmp=y
@@ -29527,7 +30277,8 @@
if test $_systemd_version -ge 248; then
systemd_private_ipc=y
fi
-
+ ;;
+esac
fi
fi
@@ -29765,10 +30516,11 @@
then :
withval=$with_service_user; service_user=$withval
-else $as_nop
- service_user=pdns-recursor
-
+else case e in #(
+ e) service_user=pdns-recursor
+ ;;
+esac
fi
@@ -29778,18 +30530,20 @@
then :
withval=$with_service_group; service_group=$withval
-else $as_nop
- service_group=pdns-recursor
-
+else case e in #(
+ e) service_group=pdns-recursor
+ ;;
+esac
fi
if test -z "$service_user"
then :
as_fn_error $? "No service user has been defined!" "$LINENO" 5
-else $as_nop
- :
+else case e in #(
+ e) : ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $service_user" >&5
printf "%s\n" "$service_user" >&6; }
@@ -29823,10 +30577,11 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- as_fn_error $? "Python interpreter is too old" "$LINENO" 5
+ as_fn_error $? "Python interpreter is too old" "$LINENO" 5 ;;
+esac
fi
am_display_PYTHON=$PYTHON
else
@@ -29837,9 +30592,9 @@
if test ${am_cv_pathless_PYTHON+y}
then :
printf %s "(cached) " >&6
-else $as_nop
-
- for am_cv_pathless_PYTHON in python python2 python3 python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+else case e in #(
+ e)
+ for am_cv_pathless_PYTHON in python python3 python3.20 python3.19 python3.18 python3.17 python3.16 python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -29858,7 +30613,8 @@
then :
break
fi
- done
+ done ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
printf "%s\n" "$am_cv_pathless_PYTHON" >&6; }
@@ -29873,8 +30629,8 @@
if test ${ac_cv_path_PYTHON+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- case $PYTHON in
+else case e in #(
+ e) case $PYTHON in
[\\/]* | ?:[\\/]*)
ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
;;
@@ -29899,6 +30655,7 @@
IFS=$as_save_IFS
;;
+esac ;;
esac
fi
PYTHON=$ac_cv_path_PYTHON
@@ -29925,8 +30682,9 @@
if test ${am_cv_python_version+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"`
+else case e in #(
+ e) am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"` ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
printf "%s\n" "$am_cv_python_version" >&6; }
@@ -29938,8 +30696,9 @@
if test ${am_cv_python_platform+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+else case e in #(
+ e) am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
printf "%s\n" "$am_cv_python_platform" >&6; }
@@ -29959,8 +30718,9 @@
if test ${with_python_sys_prefix+y}
then :
withval=$with_python_sys_prefix; am_use_python_sys=:
-else $as_nop
- am_use_python_sys=false
+else case e in #(
+ e) am_use_python_sys=false ;;
+esac
fi
@@ -29975,8 +30735,8 @@
printf %s "checking for explicit $am_display_PYTHON prefix... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
printf "%s\n" "$am_cv_python_prefix" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
if $am_use_python_sys; then
# using python sys.prefix value, not GNU
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON prefix" >&5
@@ -29984,8 +30744,9 @@
if test ${am_cv_python_prefix+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+else case e in #(
+ e) am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
printf "%s\n" "$am_cv_python_prefix" >&6; }
@@ -30006,7 +30767,8 @@
printf %s "checking for GNU default $am_display_PYTHON prefix... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_prefix" >&5
printf "%s\n" "$am_python_prefix" >&6; }
- fi
+ fi ;;
+esac
fi
# Substituting python_prefix_subst value.
@@ -30025,8 +30787,8 @@
printf %s "checking for explicit $am_display_PYTHON exec_prefix... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
# no explicit --with-python_exec_prefix, but if
# --with-python_prefix was given, use its value for python_exec_prefix too.
if test -n "$with_python_prefix"
@@ -30037,8 +30799,8 @@
printf %s "checking for python_prefix-given $am_display_PYTHON exec_prefix... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
-else $as_nop
-
+else case e in #(
+ e)
# Set am__usable_exec_prefix whether using GNU or Python values,
# since we use that variable for pyexecdir.
if test "x$exec_prefix" = xNONE; then
@@ -30053,8 +30815,9 @@
if test ${am_cv_python_exec_prefix+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
+else case e in #(
+ e) am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
@@ -30074,8 +30837,10 @@
printf %s "checking for GNU default $am_display_PYTHON exec_prefix... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_exec_prefix" >&5
printf "%s\n" "$am_python_exec_prefix" >&6; }
- fi
-fi
+ fi ;;
+esac
+fi ;;
+esac
fi
# Substituting python_exec_prefix_subst.
@@ -30100,7 +30865,21 @@
if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
can_use_sysconfig = 0
except ImportError:
- pass"
+ pass" # end of am_python_setup_sysconfig
+
+ # More repeated code, for figuring out the installation scheme to use.
+ am_python_setup_scheme="if hasattr(sysconfig, 'get_default_scheme'):
+ scheme = sysconfig.get_default_scheme()
+ else:
+ scheme = sysconfig._get_default_scheme()
+ if scheme == 'posix_local':
+ if '$am_py_prefix' == '/usr':
+ scheme = 'deb_system' # should only happen during Debian package builds
+ else:
+ # Debian's default scheme installs to /usr/local/ but we want to
+ # follow the prefix, as we always have.
+ # See bugs#54412, #64837, et al.
+ scheme = 'posix_prefix'" # end of am_python_setup_scheme
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory (pythondir)" >&5
@@ -30108,8 +30887,8 @@
if test ${am_cv_python_pythondir+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test "x$am_cv_python_prefix" = x; then
+else case e in #(
+ e) if test "x$am_cv_python_prefix" = x; then
am_py_prefix=$am__usable_prefix
else
am_py_prefix=$am_cv_python_prefix
@@ -30117,7 +30896,11 @@
am_cv_python_pythondir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+ try:
+ $am_python_setup_scheme
+ sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
+ except:
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
else:
from distutils import sysconfig
sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
@@ -30136,7 +30919,8 @@
esac
;;
esac
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
printf "%s\n" "$am_cv_python_pythondir" >&6; }
@@ -30146,13 +30930,13 @@
pkgpythondir=\${pythondir}/$PACKAGE
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory (pyexecdir)" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory (pyexecdir)" >&5
printf %s "checking for $am_display_PYTHON extension module directory (pyexecdir)... " >&6; }
if test ${am_cv_python_pyexecdir+y}
then :
printf %s "(cached) " >&6
-else $as_nop
- if test "x$am_cv_python_exec_prefix" = x; then
+else case e in #(
+ e) if test "x$am_cv_python_exec_prefix" = x; then
am_py_exec_prefix=$am__usable_exec_prefix
else
am_py_exec_prefix=$am_cv_python_exec_prefix
@@ -30160,7 +30944,11 @@
am_cv_python_pyexecdir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
+ try:
+ $am_python_setup_scheme
+ sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
+ except:
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
else:
from distutils import sysconfig
sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
@@ -30179,7 +30967,8 @@
esac
;;
esac
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
printf "%s\n" "$am_cv_python_pyexecdir" >&6; }
@@ -30279,7 +31068,7 @@
CCVERSION=`$CC --version | head -1`
CXXVERSION=`$CXX --version | head -1`
-ac_config_files="$ac_config_files Makefile ext/Makefile ext/arc4random/Makefile ext/json11/Makefile ext/probds/Makefile ext/yahttp/Makefile ext/yahttp/yahttp/Makefile settings/Makefile settings/rust/Makefile"
+ac_config_files="$ac_config_files Makefile ext/Makefile ext/arc4random/Makefile ext/json11/Makefile ext/probds/Makefile ext/yahttp/Makefile ext/yahttp/yahttp/Makefile rec-rust-lib/Makefile rec-rust-lib/rust/Makefile"
cat >confcache <<\_ACEOF
@@ -30292,8 +31081,8 @@
# config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# 'ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* 'ac_cv_foo' will be assigned the
# following values.
_ACEOF
@@ -30323,14 +31112,14 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
+ # 'set' does not quote correctly, so add quotes: double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
;; #(
*)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
+ # 'set' quotes correctly as required by POSIX, so do not add quotes.
sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
esac |
@@ -30399,6 +31188,18 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -30652,7 +31453,6 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
@@ -30661,12 +31461,13 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else $as_nop
- case `(set -o) 2>/dev/null` in #(
+else case e in #(
+ e) case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
*) :
;;
+esac ;;
esac
fi
@@ -30738,7 +31539,7 @@
;;
esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
# in which case we are not to be found in the path.
if test "x$as_myself" = x; then
as_myself=$0
@@ -30767,7 +31568,6 @@
} # as_fn_error
-
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -30807,11 +31607,12 @@
{
eval $1+=\$2
}'
-else $as_nop
- as_fn_append ()
+else case e in #(
+ e) as_fn_append ()
{
eval $1=\$$1\$2
- }
+ } ;;
+esac
fi # as_fn_append
# as_fn_arith ARG...
@@ -30825,11 +31626,12 @@
{
as_val=$(( $* ))
}'
-else $as_nop
- as_fn_arith ()
+else case e in #(
+ e) as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
- }
+ } ;;
+esac
fi # as_fn_arith
@@ -30912,9 +31714,9 @@
if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
# ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+ # In both cases, we have to default to 'cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -30995,10 +31797,12 @@
as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
exec 6>&1
@@ -31013,8 +31817,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pdns-recursor $as_me 5.2.13, which was
-generated by GNU Autoconf 2.71. Invocation command line was
+This file was extended by pdns-recursor $as_me 5.4.9, which was
+generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -31046,7 +31850,7 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
+'$as_me' instantiates files and other configuration actions
from templates according to the current configuration. Unless the files
and actions are specified as TAGs, all are instantiated by default.
@@ -31081,11 +31885,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-pdns-recursor config.status 5.2.13
-configured by $0, generated by GNU Autoconf 2.71,
+pdns-recursor config.status 5.4.9
+configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -31147,8 +31951,8 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+ as_fn_error $? "ambiguous option: '$1'
+Try '$0 --help' for more information.";;
--help | --hel | -h )
printf "%s\n" "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -31156,8 +31960,8 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+ -*) as_fn_error $? "unrecognized option: '$1'
+Try '$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
@@ -31603,10 +32407,10 @@
"ext/probds/Makefile") CONFIG_FILES="$CONFIG_FILES ext/probds/Makefile" ;;
"ext/yahttp/Makefile") CONFIG_FILES="$CONFIG_FILES ext/yahttp/Makefile" ;;
"ext/yahttp/yahttp/Makefile") CONFIG_FILES="$CONFIG_FILES ext/yahttp/yahttp/Makefile" ;;
- "settings/Makefile") CONFIG_FILES="$CONFIG_FILES settings/Makefile" ;;
- "settings/rust/Makefile") CONFIG_FILES="$CONFIG_FILES settings/rust/Makefile" ;;
+ "rec-rust-lib/Makefile") CONFIG_FILES="$CONFIG_FILES rec-rust-lib/Makefile" ;;
+ "rec-rust-lib/rust/Makefile") CONFIG_FILES="$CONFIG_FILES rec-rust-lib/rust/Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -31626,7 +32430,7 @@
# creating and moving files from /tmp can sometimes cause problems.
# Hook for its removal unless debugging.
# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# after its creation but before its name has been assigned to '$tmp'.
$debug ||
{
tmp= ac_tmp=
@@ -31650,7 +32454,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+# This happens for instance with './config.status config.h'.
if test -n "$CONFIG_FILES"; then
@@ -31808,13 +32612,13 @@
# Set up the scripts for CONFIG_HEADERS section.
# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
+# This happens for instance with './config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
-# Transform confdefs.h into an awk script `defines.awk', embedded as
+# Transform confdefs.h into an awk script 'defines.awk', embedded as
# here-document in config.status, that substitutes the proper values into
# config.h.in to produce config.h.
@@ -31924,7 +32728,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -31946,19 +32750,19 @@
-) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
- # because $ac_f cannot contain `:'.
+ # because $ac_f cannot contain ':'.
test -f "$ac_f" ||
case $ac_f in
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
done
- # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # Let's still pretend it is 'configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
configure_input='Generated from '`
@@ -32091,7 +32895,7 @@
esac
_ACEOF
-# Neutralize VPATH when `$srcdir' = `.'.
+# Neutralize VPATH when '$srcdir' = '.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -32122,9 +32926,9 @@
{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
"$ac_tmp/out"`; test -z "$ac_out"; } &&
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$ac_tmp/stdin"
@@ -32279,15 +33083,15 @@
(exit $ac_status); } || am_rc=$?
done
if test $am_rc -ne 0; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
for automatic dependency tracking. If GNU make was not used, consider
re-running the configure script with MAKE=\"gmake\" (or whatever is
necessary). You can also 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).
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
fi
{ am_dirpart=; unset am_dirpart;}
{ am_filepart=; unset am_filepart;}
@@ -33063,9 +33867,10 @@
if test "x$pdns_configure_args" != "x"
then :
summary_conf_opts=$pdns_configure_args
-else $as_nop
- summary_conf_opts="(no options)"
-
+else case e in #(
+ e) summary_conf_opts="(no options)"
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: PowerDNS Recursor $VERSION configured with: $summary_conf_opts" >&5
printf "%s\n" "$as_me: PowerDNS Recursor $VERSION configured with: $summary_conf_opts" >&6;}
@@ -33103,19 +33908,21 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ed25519: yes" >&5
printf "%s\n" "$as_me: ed25519: yes" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ed25519: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ed25519: no" >&5
printf "%s\n" "$as_me: ed25519: no" >&6;}
-
+ ;;
+esac
fi
if test "x$libcrypto_ed448" = "xyes"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ed448: yes" >&5
printf "%s\n" "$as_me: ed448: yes" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ed448: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ed448: no" >&5
printf "%s\n" "$as_me: ed448: no" >&6;}
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Protobuf: yes" >&5
@@ -33125,19 +33932,21 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: SNMP: yes" >&5
printf "%s\n" "$as_me: SNMP: yes" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: SNMP: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: SNMP: no" >&5
printf "%s\n" "$as_me: SNMP: no" >&6;}
-
+ ;;
+esac
fi
if test "x$systemd" != "xn"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: systemd: yes" >&5
printf "%s\n" "$as_me: systemd: yes" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: systemd: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: systemd: no" >&5
printf "%s\n" "$as_me: systemd: no" >&6;}
-
+ ;;
+esac
fi
if test -z "$NOD_ENABLED_TRUE"; then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: nod: yes" >&5
@@ -33159,10 +33968,11 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: DNS over TLS: yes" >&5
printf "%s\n" "$as_me: DNS over TLS: yes" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: DNS over TLS: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: DNS over TLS: no" >&5
printf "%s\n" "$as_me: DNS over TLS: no" >&6;}
-
+ ;;
+esac
fi
#AS_IF([test "x$enable_dns_over_tls" != "xno"], [
# AS_IF([test "x$GNUTLS_LIBS" != "x"],
@@ -33177,10 +33987,11 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: OpenSSL: yes" >&5
printf "%s\n" "$as_me: OpenSSL: yes" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: OpenSSL: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: OpenSSL: no" >&5
printf "%s\n" "$as_me: OpenSSL: no" >&6;}
-
+ ;;
+esac
fi
fi
@@ -33188,10 +33999,11 @@
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: libcurl: yes" >&5
printf "%s\n" "$as_me: libcurl: yes" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: libcurl: no" >&5
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: libcurl: no" >&5
printf "%s\n" "$as_me: libcurl: no" >&6;}
-
+ ;;
+esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: " >&5
printf "%s\n" "$as_me: " >&6;}
diff -Nru pdns-recursor-5.2.13/configure.ac pdns-recursor-5.4.9/configure.ac
--- pdns-recursor-5.2.13/configure.ac 2026-08-05 12:01:36.000000000 +0000
+++ pdns-recursor-5.4.9/configure.ac 2026-10-26 09:47:03.633207300 +0000
@@ -1,6 +1,6 @@
AC_PREREQ([2.69])
-AC_INIT([pdns-recursor], [5.2.13])
+AC_INIT([pdns-recursor], [5.4.9])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects parallel-tests 1.11])
AM_SILENT_RULES([yes])
@@ -27,9 +27,7 @@
PDNS_CHECK_TIME_T
-AC_DEFINE([RECURSOR], [1],
- [This is the PowerDNS Recursor]
-)
+CPPFLAGS="-DRECURSOR $CPPFLAGS"
# Warn when pkg.m4 is missing
m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config])
@@ -58,7 +56,7 @@
PDNS_ENABLE_REPRODUCIBLE
PDNS_ENABLE_COVERAGE
-PDNS_WITH_LUA([mandatory])
+PDNS_WITH_LUA
AS_IF([test "x$LUAPC" = "xluajit"], [
# export all symbols to be able to use the Lua FFI interface
AC_MSG_NOTICE([Adding -rdynamic to export all symbols for the Lua FFI interface])
@@ -105,7 +103,7 @@
dnl the *_r functions are in posix so we can use them unconditionally, but the ext/yahttp code is
dnl using the defines.
-AC_CHECK_FUNCS_ONCE([localtime_r gmtime_r strcasestr])
+AC_CHECK_FUNCS_ONCE([localtime_r gmtime_r])
AC_CHECK_FUNCS_ONCE([getrandom getentropy arc4random arc4random_uniform arc4random_buf])
PDNS_CHECK_SECURE_MEMSET
@@ -192,8 +190,8 @@
ext/probds/Makefile
ext/yahttp/Makefile
ext/yahttp/yahttp/Makefile
- settings/Makefile
- settings/rust/Makefile])
+ rec-rust-lib/Makefile
+ rec-rust-lib/rust/Makefile])
AC_OUTPUT
diff -Nru pdns-recursor-5.2.13/credentials.cc pdns-recursor-5.4.9/credentials.cc
--- pdns-recursor-5.2.13/credentials.cc 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/credentials.cc 2026-10-26 09:46:36.000000000 +0000
@@ -106,10 +106,11 @@
}
// OpenSSL 3.0 changed the string arg to const unsigned char*, other versions use const char *
+ // NOLINTBEGIN(cppcoreguidelines-pro-type-reinterpret-cast)
#if OPENSSL_VERSION_MAJOR >= 3
- auto passwordData = reinterpret_cast(password.data());
+ const auto* passwordData = reinterpret_cast(password.data());
#else
- auto passwordData = reinterpret_cast(password.data());
+ const auto* passwordData = reinterpret_cast(password.data());
#endif
if (EVP_PKEY_CTX_set1_pbe_pass(pctx.get(), passwordData, password.size()) <= 0) {
throw std::runtime_error("Error adding the password to the scrypt context to hash the supplied password");
@@ -118,6 +119,7 @@
if (EVP_PKEY_CTX_set1_scrypt_salt(pctx.get(), reinterpret_cast(salt.data()), salt.size()) <= 0) {
throw std::runtime_error("Error adding the salt to the scrypt context to hash the supplied password");
}
+ // NOLINTEND(cppcoreguidelines-pro-type-reinterpret-cast)
if (EVP_PKEY_CTX_set_scrypt_N(pctx.get(), workFactor) <= 0) {
throw std::runtime_error("Error setting the work factor to the scrypt context to hash the supplied password");
@@ -135,6 +137,7 @@
out.resize(pwhash_output_size);
size_t outlen = out.size();
+ // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
if (EVP_PKEY_derive(pctx.get(), reinterpret_cast(out.data()), &outlen) <= 0 || outlen != pwhash_output_size) {
throw std::runtime_error("Error deriving the output from the scrypt context to hash the supplied password");
}
@@ -152,7 +155,8 @@
std::string salt;
salt.resize(pwhash_salt_size);
- if (RAND_bytes(reinterpret_cast(salt.data()), salt.size()) != 1) {
+ // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+ if (RAND_bytes(reinterpret_cast(salt.data()), static_cast(salt.size())) != 1) {
throw std::runtime_error("Error while generating a salt to hash the supplied password");
}
@@ -371,6 +375,7 @@
if (!d_isHashed) {
d_fallbackHashPerturb = dns_random_uint32();
+ // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
d_fallbackHash = burtle(reinterpret_cast(d_credentials.getString().data()), d_credentials.getString().size(), d_fallbackHashPerturb);
}
}
@@ -386,14 +391,13 @@
if (d_isHashed) {
return verifyPassword(d_credentials.getString(), d_salt, d_workFactor, d_parallelFactor, d_blockSize, password);
}
- else {
- uint32_t fallback = burtle(reinterpret_cast(password.data()), password.size(), d_fallbackHashPerturb);
- if (fallback != d_fallbackHash) {
- return false;
- }
-
- return constantTimeStringEquals(password, d_credentials.getString());
+ // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+ uint32_t fallback = burtle(reinterpret_cast(password.data()), password.size(), d_fallbackHashPerturb);
+ if (fallback != d_fallbackHash) {
+ return false;
}
+
+ return constantTimeStringEquals(password, d_credentials.getString());
}
bool CredentialsHolder::isHashingAvailable()
@@ -410,8 +414,8 @@
SensitiveData CredentialsHolder::readFromTerminal()
{
- struct termios term;
- struct termios oterm;
+ termios term{};
+ termios oterm{};
bool restoreTermSettings = false;
int termAction = TCSAFLUSH;
#ifdef TCSASOFT
@@ -438,19 +442,20 @@
}
struct std::map signals;
- struct sigaction sa;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = 0;
- sa.sa_handler = [](int /* s */) {};
- sigaction(SIGALRM, &sa, &signals[SIGALRM]);
- sigaction(SIGHUP, &sa, &signals[SIGHUP]);
- sigaction(SIGINT, &sa, &signals[SIGINT]);
- sigaction(SIGPIPE, &sa, &signals[SIGPIPE]);
- sigaction(SIGQUIT, &sa, &signals[SIGQUIT]);
- sigaction(SIGTERM, &sa, &signals[SIGTERM]);
- sigaction(SIGTSTP, &sa, &signals[SIGTSTP]);
- sigaction(SIGTTIN, &sa, &signals[SIGTTIN]);
- sigaction(SIGTTOU, &sa, &signals[SIGTTOU]);
+ struct sigaction sigact // just sigaction does not work, it clashes with sigaction(2)
+ {};
+ sigemptyset(&sigact.sa_mask);
+ sigact.sa_flags = 0;
+ sigact.sa_handler = [](int /* s */) {};
+ sigaction(SIGALRM, &sigact, &signals[SIGALRM]);
+ sigaction(SIGHUP, &sigact, &signals[SIGHUP]);
+ sigaction(SIGINT, &sigact, &signals[SIGINT]);
+ sigaction(SIGPIPE, &sigact, &signals[SIGPIPE]);
+ sigaction(SIGQUIT, &sigact, &signals[SIGQUIT]);
+ sigaction(SIGTERM, &sigact, &signals[SIGTERM]);
+ sigaction(SIGTSTP, &sigact, &signals[SIGTSTP]);
+ sigaction(SIGTTIN, &sigact, &signals[SIGTTIN]);
+ sigaction(SIGTTOU, &sigact, &signals[SIGTTOU]);
std::string buffer;
/* let's allocate a huge buffer now to prevent reallocation,
@@ -458,10 +463,10 @@
buffer.reserve(512);
for (;;) {
- char ch = '\0';
- auto got = read(input, &ch, 1);
- if (got == 1 && ch != '\n' && ch != '\r') {
- buffer.push_back(ch);
+ char character = '\0';
+ auto got = read(input, &character, 1);
+ if (got == 1 && character != '\n' && character != '\r') {
+ buffer.push_back(character);
}
else {
break;
@@ -476,5 +481,5 @@
sigaction(sig.first, &sig.second, nullptr);
}
- return SensitiveData(std::move(buffer));
+ return {std::move(buffer)};
}
diff -Nru pdns-recursor-5.2.13/credentials.hh pdns-recursor-5.4.9/credentials.hh
--- pdns-recursor-5.2.13/credentials.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/credentials.hh 2026-10-26 09:46:36.000000000 +0000
@@ -27,13 +27,16 @@
class SensitiveData
{
public:
+ SensitiveData(const SensitiveData&) = delete;
+ SensitiveData(SensitiveData&&) = delete;
+ SensitiveData& operator=(const SensitiveData&) = delete;
SensitiveData(size_t bytes);
SensitiveData(std::string&& data);
SensitiveData& operator=(SensitiveData&&) noexcept;
~SensitiveData();
void clear();
- const std::string& getString() const
+ [[nodiscard]] const std::string& getString() const
{
return d_data;
}
@@ -55,10 +58,12 @@
class CredentialsHolder
{
public:
+ CredentialsHolder(CredentialsHolder&&) = delete;
+ CredentialsHolder& operator=(CredentialsHolder&&) = delete;
/* if hashPlaintext is true, the password is in cleartext and hashing is available,
the hashed form will be kept in memory.
Note that accepting hashed password from an untrusted source might open
- us to a denial of service, since we currently don't cap the the parameters,
+ us to a denial of service, since we currently don't cap the parameters,
including the work factor */
CredentialsHolder(std::string&& password, bool hashPlaintext);
~CredentialsHolder();
@@ -66,14 +71,14 @@
CredentialsHolder(const CredentialsHolder&) = delete;
CredentialsHolder& operator=(const CredentialsHolder&) = delete;
- bool matches(const std::string& password) const;
+ [[nodiscard]] bool matches(const std::string& password) const;
/* whether it was constructed from a hashed and salted string */
- bool wasHashed() const
+ [[nodiscard]] bool wasHashed() const
{
return d_wasHashed;
}
/* whether it is hashed in memory */
- bool isHashed() const
+ [[nodiscard]] bool isHashed() const
{
return d_isHashed;
}
diff -Nru pdns-recursor-5.2.13/debian/.gitlab-ci.yml pdns-recursor-5.4.9/debian/.gitlab-ci.yml
--- pdns-recursor-5.2.13/debian/.gitlab-ci.yml 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/.gitlab-ci.yml 2026-10-26 13:54:29.000000000 +0000
@@ -5,6 +5,7 @@
variables:
RELEASE: 'unstable'
SALSA_CI_DISABLE_APTLY: 1
+ SALSA_CI_DISABLE_BLHC: 1
SALSA_CI_DISABLE_PIUPARTS: 1
SALSA_CI_DISABLE_REPROTEST: 1
SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1
diff -Nru pdns-recursor-5.2.13/debian/changelog pdns-recursor-5.4.9/debian/changelog
--- pdns-recursor-5.2.13/debian/changelog 2026-08-07 08:18:12.000000000 +0000
+++ pdns-recursor-5.4.9/debian/changelog 2026-10-26 17:32:14.000000000 +0000
@@ -1,61 +1,179 @@
-pdns-recursor (5.2.13-0+deb13u1) trixie-security; urgency=medium
+pdns-recursor (5.4.9-1~deb13u1) trixie-security; urgency=medium
- * New upstream version 5.2.13, fixing security issue
- CVE-2026-52682
+ * Target trixie.
+ * Revert "Build with lld 22, matching rustc LLVM 22 usage"
+ * Revert "Enable LTO"
+ * Relax cargo dependencies for trixie
- -- Chris Hofstaedtler Fri, 07 Aug 2026 10:18:12 +0200
+ -- Chris Hofstaedtler Mon, 26 Oct 2026 18:32:14 +0100
-pdns-recursor (5.2.12-0+deb13u1) trixie-security; urgency=medium
+pdns-recursor (5.4.9-1) unstable; urgency=medium
- * New upstream version 5.2.12, fixing security issues
+ * New upstream version 5.4.9
+
+ -- Chris Hofstaedtler Mon, 26 Oct 2026 14:55:17 +0100
+
+pdns-recursor (5.4.8-1) unstable; urgency=medium
+
+ * New upstream version 5.4.8, fixing CVE-2026-73206, CVE-2026-73205,
+ CVE-2026-85555, CVE-2026-85556, CVE-2026-85557, CVE-2026-85558,
+ CVE-2026-85559.
+
+ -- Chris Hofstaedtler Wed, 21 Oct 2026 15:28:44 +0200
+
+pdns-recursor (5.4.6-2) unstable; urgency=medium
+
+ * Build with lld 22, matching rustc LLVM 22 usage
+ (Closes: #1149822)
+
+ -- Chris Hofstaedtler Mon, 12 Oct 2026 16:19:19 +0200
+
+pdns-recursor (5.4.6-1) unstable; urgency=medium
+
+ * New upstream version 5.4.6
+
+ -- Chris Hofstaedtler Thu, 03 Sep 2026 10:40:21 +0200
+
+pdns-recursor (5.4.5-1) unstable; urgency=medium
+
+ * New upstream version 5.4.5, fixing CVE-2026-52682
+
+ -- Chris Hofstaedtler Thu, 06 Aug 2026 17:42:12 +0200
+
+pdns-recursor (5.4.4-1) unstable; urgency=medium
+
+ * New upstream version 5.4.4, fixing security issues
CVE-2026-52686, CVE-2026-52688.
+ * lintian: ignore embedded-library libyaml false-positive
- -- Chris Hofstaedtler Tue, 21 Jul 2026 15:41:43 +0200
+ -- Chris Hofstaedtler Wed, 22 Jul 2026 01:13:11 +0200
-pdns-recursor (5.2.11-0+deb13u1) trixie-security; urgency=medium
+pdns-recursor (5.4.3-1) unstable; urgency=medium
- * New upstream version 5.2.11, fixing security issues
- CVE-2026-33612, CVE-2026-40012, CVE-2026-42005, CVE-2026-42390,
- CVE-2026-42390, CVE-2026-42388, CVE-2026-42387, CVE-2026-52690.
+ * New upstream version 5.4.3, fixing CVE-2026-33612, CVE-2026-40012,
+ CVE-2026-42005, CVE-2026-42390, CVE-2026-42389, CVE-2026-42388,
+ CVE-2026-42387, CVE-2026-52690
- -- Chris Hofstaedtler Wed, 17 Jun 2026 00:19:21 +0200
+ -- Chris Hofstaedtler Fri, 26 Jun 2026 18:47:40 +0200
-pdns-recursor (5.2.9-0+deb13u1) trixie-security; urgency=medium
+pdns-recursor (5.4.2-2) unstable; urgency=medium
- * New upstream version 5.2.9, fixing CVE-2026-33257, CVE-2026-33258,
- CVE-2026-33259, CVE-2026-33260, CVE-2026-33261, CVE-2026-33601,
- CVE-2026-33600.
+ [ Luca Boccassi ]
+ * Install and use sysusers.d config file
- -- Chris Hofstaedtler Sun, 26 Apr 2026 21:04:28 +0200
+ -- Chris Hofstaedtler Sun, 21 Jun 2026 16:39:51 +0200
-pdns-recursor (5.2.8-0+deb13u1) trixie-security; urgency=medium
+pdns-recursor (5.4.2-1) unstable; urgency=medium
- * New upstream version 5.2.8, fixing CVE-2026-24027 CVE-2026-0398
- (Closes: #1127490)
+ * New upstream version 5.4.2
+ * d/watch: update to version 5
- -- Chris Hofstaedtler Wed, 11 Feb 2026 23:05:53 +0100
+ -- Chris Hofstaedtler Wed, 03 Jun 2026 10:39:35 +0200
-pdns-recursor (5.2.7-0+deb13u1) trixie-security; urgency=medium
+pdns-recursor (5.4.1-2) unstable; urgency=medium
- * New upstream version 5.2.7, fixing CVE-2025-59030.
+ * d/rules: drop useless override_dh_gencontrol
+ * Remove unused boost Build-Depends
+ * Always build with luajit, available on all release archs
+ * Enable LTO, like upstream
- -- Chris Hofstaedtler Tue, 09 Dec 2025 11:13:14 +0100
+ -- Chris Hofstaedtler Sat, 30 May 2026 00:44:33 +0200
-pdns-recursor (5.2.6-0+deb13u1) trixie-security; urgency=medium
+pdns-recursor (5.4.1-1) unstable; urgency=medium
- * New upstream version 5.2.6, fixing CVE-2025-59023.
+ * New upstream version 5.4.1, fixing security issues:
+ CVE-2026-33256, CVE-2026-33257, CVE-2026-33258, CVE-2026-33259,
+ CVE-2026-33260, CVE-2026-33261, CVE-2026-33262, CVE-2026-33601,
+ CVE-2026-33600
- -- Chris Hofstaedtler Wed, 22 Oct 2025 18:15:32 +0200
+ -- Chris Hofstaedtler Wed, 22 Apr 2026 15:15:12 +0200
-pdns-recursor (5.2.4-2+deb13u1) trixie; urgency=medium
+pdns-recursor (5.4.0-1) unstable; urgency=medium
+
+ * New upstream version 5.4.0
+
+ -- Chris Hofstaedtler Mon, 09 Mar 2026 13:56:39 +0100
+
+pdns-recursor (5.3.5-1) unstable; urgency=medium
+
+ * New upstream version 5.3.5
+ Fixes CVE-2026-24027, CVE-2026-0398 (Closes: #1127490)
+
+ -- Chris Hofstaedtler Wed, 11 Feb 2026 15:13:35 +0100
+
+pdns-recursor (5.3.4-2) unstable; urgency=medium
+
+ * Drop Build-Depends: libboost-system-dev
+
+ -- Chris Hofstaedtler Thu, 05 Feb 2026 23:34:17 +0100
+
+pdns-recursor (5.3.4-1) unstable; urgency=medium
+
+ * New upstream version 5.3.4
+ * Rebase patches
+
+ -- Chris Hofstaedtler Wed, 14 Jan 2026 12:32:52 +0100
+
+pdns-recursor (5.3.3-1) unstable; urgency=medium
+
+ * New upstream version 5.3.3
+ Fixes CVE-2025-59029 (Closes: #1122196),
+ Fixes CVE-2025-59030 (Closes: #1122197).
+ * Preserve recursor.lua on upgrades, but not as conffile
+
+ -- Chris Hofstaedtler Tue, 09 Dec 2025 11:01:36 +0100
+
+pdns-recursor (5.3.1-1) unstable; urgency=medium
+
+ * New upstream version 5.3.1, fixes CVE-2025-59023 and CVE-2025-59024.
+ (Closes: #1118751)
+
+ -- Chris Hofstaedtler Wed, 22 Oct 2025 18:01:37 +0200
+
+pdns-recursor (5.3.0-5) unstable; urgency=medium
+
+ * Fix endian issue in tests on s390x
+ * d/copyright: Remove old FSF address
+
+ -- Chris Hofstaedtler Sun, 07 Sep 2025 14:17:42 +0200
+
+pdns-recursor (5.3.0-4) unstable; urgency=medium
+
+ * Fix incorrectly applied rust-fix-build-with-multiple-available-cargos patch.
+ Causes startup failure while reading the YAML config.
+
+ -- Chris Hofstaedtler Sat, 06 Sep 2025 21:53:52 +0200
+
+pdns-recursor (5.3.0-3) unstable; urgency=medium
- * d/gbp.conf: update for trixie branch
- * d/rules: fix DEB_VERSION/DEB_VENDOR being empty.
- Thanks to Steve Mokris (Closes: #1113814)
* d/rules: stop setting CARGO_REGISTRY, fixes Static-Built-Using
- Thanks to Fabian Gruenbichler.
+ * Build with meson instead of autotools
+ * Remove obsolete lintian overrides
+
+ -- Chris Hofstaedtler Sat, 06 Sep 2025 18:43:24 +0200
+
+pdns-recursor (5.3.0-2) unstable; urgency=medium
+
+ * d/rules: fix DEB_VERSION/DEB_VENDOR being empty.
+ Thanks to Steve Mokris
+
+ -- Chris Hofstaedtler Tue, 02 Sep 2025 23:06:05 +0200
+
+pdns-recursor (5.3.0-1) unstable; urgency=medium
+
+ * d/watch: update upstream URL (xz)
+ * New upstream version 5.3.0
+ * Relax crate requirements
+ * Update crate dependencies
+ * Update path to internal rust crate
+
+ -- Chris Hofstaedtler Thu, 28 Aug 2025 20:32:46 +0200
+
+pdns-recursor (5.2.5-1) unstable; urgency=medium
+
+ * New upstream version 5.2.5
- -- Chris Hofstaedtler Sun, 07 Sep 2025 13:22:57 +0200
+ -- Chris Hofstaedtler Tue, 26 Aug 2025 19:44:06 +0200
pdns-recursor (5.2.4-2) unstable; urgency=medium
diff -Nru pdns-recursor-5.2.13/debian/control pdns-recursor-5.4.9/debian/control
--- pdns-recursor-5.2.13/debian/control 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/control 2026-10-26 17:32:09.000000000 +0000
@@ -9,37 +9,54 @@
Build-Depends:
debhelper-compat (= 13),
dh-cargo,
+ dh-sequence-installsysusers,
architecture-is-64-bit,
cargo,
libboost-context-dev,
libboost-dev,
libboost-filesystem-dev,
- libboost-program-options-dev,
- libboost-system-dev,
libboost-test-dev,
- libboost-thread-dev,
libcap-dev,
libcurl4-openssl-dev,
libfstrm-dev,
- libluajit-5.1-dev (>= 2.1.0~beta3+dfsg-5.3) [amd64 arm64] | libluajit-5.1-dev [amd64] | liblua5.3-dev,
+ libluajit-5.1-dev,
libprotobuf-dev,
librust-base64-dev (>= 0.22.1-1~),
+ librust-bytes-dev,
librust-cxx-build-dev (>= 1.0.130-1~),
librust-cxx-dev (>= 1.0.130-1~),
+ librust-cxx-dev (<= 1.0.175~) | librust-cxx-dev (>= 1.0.181-1~),
+ librust-form-urlencoded-dev,
+ librust-http-body-util-dev,
+ librust-hyper+http1-dev,
+ librust-hyper+server-dev,
+ librust-hyper-rustls-dev,
+ librust-hyper-util+tokio-dev,
librust-ipnet-dev (>= 2.8.0-1~),
+ librust-once-cell-dev,
librust-once-cell-dev (>= 1.18.0-1~),
+ librust-ring-dev,
+ librust-rustls-dev,
+ librust-rustls-pemfile-dev,
+ librust-rustls-pki-types-dev,
librust-serde-derive-dev,
librust-serde-dev,
librust-serde-yaml-dev (>= 0.9.34~),
+ librust-tokio+net-dev,
+ librust-tokio+rt-dev,
+ librust-tokio-dev,
+ librust-tokio-rustls-dev,
+ librust-uuid-dev,
libsnmp-dev,
libsodium-dev,
libssl-dev,
libsystemd-dev,
+ meson,
pkgconf,
protobuf-compiler,
ragel,
systemd,
- systemd-dev | systemd,
+ systemd-dev | systemd (<< 257),
Vcs-Git: https://salsa.debian.org/debian/pdns-recursor.git
Vcs-Browser: https://salsa.debian.org/debian/pdns-recursor
Homepage: https://www.powerdns.com/
@@ -51,7 +68,6 @@
Pre-Depends:
${misc:Pre-Depends},
Depends:
- adduser,
dns-root-data,
publicsuffix,
${misc:Depends},
diff -Nru pdns-recursor-5.2.13/debian/copyright pdns-recursor-5.4.9/debian/copyright
--- pdns-recursor-5.2.13/debian/copyright 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/copyright 2026-10-26 13:54:29.000000000 +0000
@@ -19,10 +19,6 @@
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 this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
@@ -99,10 +95,6 @@
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 this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
diff -Nru pdns-recursor-5.2.13/debian/gbp.conf pdns-recursor-5.4.9/debian/gbp.conf
--- pdns-recursor-5.2.13/debian/gbp.conf 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/gbp.conf 2026-10-26 13:54:29.000000000 +0000
@@ -1,4 +1,4 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/trixie
-upstream-branch = upstream/trixie
+debian-branch = debian/latest
+upstream-branch = upstream/latest
diff -Nru pdns-recursor-5.2.13/debian/patches/0002-Relax-cargo-dependencies-for-trixie.patch pdns-recursor-5.4.9/debian/patches/0002-Relax-cargo-dependencies-for-trixie.patch
--- pdns-recursor-5.2.13/debian/patches/0002-Relax-cargo-dependencies-for-trixie.patch 1970-01-01 00:00:00.000000000 +0000
+++ pdns-recursor-5.4.9/debian/patches/0002-Relax-cargo-dependencies-for-trixie.patch 2026-10-26 17:32:09.000000000 +0000
@@ -0,0 +1,30 @@
+From: Chris Hofstaedtler
+Date: Mon, 26 Oct 2026 15:28:30 +0100
+Subject: Relax cargo dependencies for trixie
+
+---
+ rec-rust-lib/rust/Cargo.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rec-rust-lib/rust/Cargo.toml b/rec-rust-lib/rust/Cargo.toml
+index 3e66b93..e62b130 100644
+--- a/rec-rust-lib/rust/Cargo.toml
++++ b/rec-rust-lib/rust/Cargo.toml
+@@ -15,7 +15,7 @@ name = "recrust"
+ crate-type = ["staticlib"]
+
+ [dependencies]
+-cxx = "1.0.181" # issue #16101
++cxx = "1.0.141" # issue #16101
+ serde = { version = "1.0", features = ["derive"] }
+ serde_yaml = { version = "0.9.34" }
+ ipnet = "2.8"
+@@ -25,7 +25,7 @@ hyper = { version = "1", features = ["server", "http1"]}
+ tokio = { version = "1" , features = ["rt", "net"]}
+ http-body-util = "0.1"
+ hyper-util = { version = "0.1", features = ["tokio"]}
+-bytes = "1.11"
++bytes = "1.9"
+ form_urlencoded = "1.2"
+ hyper-rustls = { version = "0.27", default-features = false }
+ ring = "0.17.13"
diff -Nru pdns-recursor-5.2.13/debian/patches/series pdns-recursor-5.4.9/debian/patches/series
--- pdns-recursor-5.2.13/debian/patches/series 2026-07-24 13:21:07.000000000 +0000
+++ pdns-recursor-5.4.9/debian/patches/series 2026-10-26 17:32:09.000000000 +0000
@@ -1 +1,2 @@
testrunner-log-verbosity
+0002-Relax-cargo-dependencies-for-trixie.patch
diff -Nru pdns-recursor-5.2.13/debian/patches/testrunner-log-verbosity pdns-recursor-5.4.9/debian/patches/testrunner-log-verbosity
--- pdns-recursor-5.2.13/debian/patches/testrunner-log-verbosity 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/patches/testrunner-log-verbosity 2026-10-26 14:28:33.000000000 +0000
@@ -7,10 +7,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index 8d2210f..ab0945d 100644
+index 068707b..c78d1b7 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -105,7 +105,7 @@ TESTS=test_libcrypto
+@@ -104,7 +104,7 @@ TESTS=test_libcrypto
if UNIT_TESTS
noinst_PROGRAMS = testrunner
diff -Nru pdns-recursor-5.2.13/debian/pdns-recursor.conffiles pdns-recursor-5.4.9/debian/pdns-recursor.conffiles
--- pdns-recursor-5.2.13/debian/pdns-recursor.conffiles 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/pdns-recursor.conffiles 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-remove-on-upgrade /etc/powerdns/recursor.lua
diff -Nru pdns-recursor-5.2.13/debian/pdns-recursor.lintian-overrides pdns-recursor-5.4.9/debian/pdns-recursor.lintian-overrides
--- pdns-recursor-5.2.13/debian/pdns-recursor.lintian-overrides 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/pdns-recursor.lintian-overrides 2026-10-26 13:54:29.000000000 +0000
@@ -1,2 +1,6 @@
# Source carries OpenSSL Exception
pdns-recursor: possible-gpl-code-linked-with-openssl
+
+# serde_yaml uses a rust port of libyaml, not the C libyaml
+pdns-recursor: embedded-library libyaml [usr/bin/rec_control]
+pdns-recursor: embedded-library libyaml [usr/sbin/pdns_recursor]
diff -Nru pdns-recursor-5.2.13/debian/pdns-recursor.postinst pdns-recursor-5.4.9/debian/pdns-recursor.postinst
--- pdns-recursor-5.2.13/debian/pdns-recursor.postinst 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/pdns-recursor.postinst 2026-10-26 13:54:29.000000000 +0000
@@ -3,8 +3,11 @@
case "$1" in
configure)
- addgroup --system pdns
- adduser --system --home /var/spool/powerdns --shell /bin/false --ingroup pdns --disabled-password --disabled-login --gecos "PowerDNS" pdns
+ # restore /etc/powerdns/recursor.lua, but not as a conffile
+ if [ -e /etc/powerdns/recursor.lua.dpkg-bak ] && [ ! -e /etc/powerdns/recursor.lua ] && dpkg --compare-versions "$2" le "5.3.1-2"; then
+ echo Restoring /etc/powerdns/recursor.lua
+ mv /etc/powerdns/recursor.lua.dpkg-bak /etc/powerdns/recursor.lua
+ fi
;;
*)
diff -Nru pdns-recursor-5.2.13/debian/pdns-recursor.preinst pdns-recursor-5.4.9/debian/pdns-recursor.preinst
--- pdns-recursor-5.2.13/debian/pdns-recursor.preinst 1970-01-01 00:00:00.000000000 +0000
+++ pdns-recursor-5.4.9/debian/pdns-recursor.preinst 2026-10-26 13:54:29.000000000 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+set -e
+
+delete_unchanged() {
+ if [ -e "$1" ] && echo "$2 $1" | md5sum --check --status; then
+ echo "Removing unchanged configuration file $1"
+ rm -f "$1"
+ fi
+}
+
+backup_conffile() {
+ if [ -e "$1" ]; then
+ echo "Moving configuration file $1 to $1.dpkg-bak"
+ mv -f "$1" "$1".dpkg-bak
+ fi
+}
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" le "5.3.1-2"; then
+ # clean up files we no longer ship
+ delete_unchanged /etc/powerdns/recursor.lua 52659f850195b3a3f07bf9fd3de4a7c0
+ # will be moved back by postinst, if found
+ backup_conffile /etc/powerdns/recursor.lua
+ fi
+ ;;
+esac
+
+#DEBHELPER#
diff -Nru pdns-recursor-5.2.13/debian/pdns-recursor.sysusers pdns-recursor-5.4.9/debian/pdns-recursor.sysusers
--- pdns-recursor-5.2.13/debian/pdns-recursor.sysusers 1970-01-01 00:00:00.000000000 +0000
+++ pdns-recursor-5.4.9/debian/pdns-recursor.sysusers 2026-10-26 13:54:29.000000000 +0000
@@ -0,0 +1 @@
+u! pdns - "PowerDNS" /var/spool/powerdns /bin/false
diff -Nru pdns-recursor-5.2.13/debian/rules pdns-recursor-5.4.9/debian/rules
--- pdns-recursor-5.2.13/debian/rules 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/rules 2026-10-26 17:32:09.000000000 +0000
@@ -19,14 +19,9 @@
# Vendor and version
CXXFLAGS += -DPACKAGEVERSION='"$(DEB_VERSION).$(DEB_VENDOR)"'
-CONFIGURE_ARGS =
-
-# Workaround for #1078387 https://github.com/PowerDNS/pdns/issues/14084
-CONFIGURE_ARGS += --with-libcrypto=/usr
-
%:
- dh $@
+ dh $@ --buildsystem=meson
override_dh_auto_clean:
dh_auto_clean
@@ -36,25 +31,21 @@
override_dh_auto_configure:
$(CARGO) prepare-debian debian/cargo_registry --link-from-system
- echo> ./settings/rust/Cargo.lock
+ echo> ./rec-rust-lib/rust/Cargo.lock
PATH=debian/configure-helpers/:$$PATH dh_auto_configure -- \
--sysconfdir=/etc/powerdns \
- --enable-systemd --with-systemd=$$(pkgconf --variable=systemdsystemunitdir systemd) \
- --enable-reproducible \
- --disable-silent-rules \
- --enable-unit-tests \
- --with-service-user=pdns \
- --with-service-group=pdns \
- --with-libcap \
- --with-libsodium \
- --with-lua \
- --with-net-snmp \
- --with-protobuf=yes \
- --enable-dns-over-tls \
- --enable-dnstap \
- $(CONFIGURE_ARGS)
- cat config.log
- grep 'OpenSSL ECDSA: yes' config.log
+ -Dreproducible=true \
+ -Dunit-tests=true \
+ -Dsystemd-service=enabled \
+ -Dsystemd-service-user=pdns \
+ -Dsystemd-service-group=pdns \
+ -Dlibcap=enabled \
+ -Dsigners-libsodium=enabled \
+ -Dsigners-libcrypto=enabled \
+ -Dlua=auto \
+ -Dsnmp=enabled \
+ -Ddns-over-tls=enabled \
+ -Ddnstap=enabled
override_dh_auto_install:
dh_auto_install
@@ -65,15 +56,12 @@
mv debian/pdns-recursor/etc/powerdns/recursor.yml-dist debian/pdns-recursor/usr/share/doc/pdns-recursor/examples/
install -m 644 -t debian/pdns-recursor/etc/powerdns debian/recursor.conf
# workaround for static libs in non-default dir, see https://salsa.debian.org/rust-team/dh-cargo/-/issues/1
- ln -s ./settings/rust/target .
- sed -e '/rustc-link-lib=static=settings/d' -i target/*/release/build/settings*/output
+ ln -s ./obj-*/target .
+ sed -e '/rustc-link-lib=static=recrust/d' -i target/*/release/build/recrust*/output
/usr/share/cargo/bin/dh-cargo-built-using pdns-recursor
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
dh_auto_test
- -cat testrunner.log
+ -cat ./obj-*/meson-logs/testlog.txt
endif
-
-override_dh_gencontrol:
- dh_gencontrol -- $(SUBSTVARS)
diff -Nru pdns-recursor-5.2.13/debian/source/lintian-overrides pdns-recursor-5.4.9/debian/source/lintian-overrides
--- pdns-recursor-5.2.13/debian/source/lintian-overrides 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-# Source is in html/js/d3.js
-pdns-recursor source: source-is-missing html/js/d3.js
-pdns-recursor source: source-is-missing html/js/d3.v3.js
-pdns-recursor source: source-is-missing html/js/handlebars-v4.0.11.js
diff -Nru pdns-recursor-5.2.13/debian/watch pdns-recursor-5.4.9/debian/watch
--- pdns-recursor-5.2.13/debian/watch 2026-08-07 08:17:55.000000000 +0000
+++ pdns-recursor-5.4.9/debian/watch 2026-10-26 13:54:29.000000000 +0000
@@ -1,3 +1,5 @@
-# Site Directory Pattern Version Script
-version=3
-opts="versionmangle=s/-(alpha|beta|rc)/~$1/" https://downloads.powerdns.com/releases/ pdns-recursor-(5\..*)\.tar\.bz2 debian uupdate
+Version: 5
+
+Source: https://downloads.powerdns.com/releases/
+Matching-Pattern: pdns-recursor-(5\..*)\.tar\.xz
+Versionmangle: s/-(alpha|beta|rc)/~$1/
diff -Nru pdns-recursor-5.2.13/dns.cc pdns-recursor-5.4.9/dns.cc
--- pdns-recursor-5.2.13/dns.cc 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dns.cc 2026-10-26 09:46:36.000000000 +0000
@@ -58,7 +58,7 @@
"Bad/missing Server Cookie"
};
-static const std::array rcodes_short_s = {
+static const std::array rcodes_short_s = {
"noerror",
"formerr",
"servfail",
@@ -69,39 +69,92 @@
"yxrrset",
"nxrrset",
"notauth",
+ "notzone",
+ "rcode11",
+ "rcode12",
+ "rcode13",
+ "rcode14",
+ "rcode15",
+ "badvers",
+ "badkey",
+ "badtime",
+ "badmode",
+ "badname",
+ "badalg",
+ "badtrunc",
+ "badcookie",
};
std::string RCode::to_s(uint8_t rcode) {
if (rcode > 0xF) {
- return std::string("ErrOutOfRange");
+ return "ErrOutOfRange";
}
return ERCode::to_s(rcode);
}
std::string RCode::to_short_s(uint8_t rcode) {
- if (rcode >= rcodes_short_s.size()) {
- return "rcode" + std::to_string(rcode);
+ if (rcode > 0xF) {
+ return "ErrOutOfRange";
}
- return rcodes_short_s.at(rcode);
+ return ERCode::to_short_s(rcode);
+}
+
+std::optional RCode::from_short(const std::string_view& rcode_string)
+{
+ const auto* position = std::find(rcodes_short_s.begin(), rcodes_short_s.end(), rcode_string);
+ if (position == rcodes_short_s.end()) {
+ return std::nullopt;
+ }
+ auto code = std::distance(rcodes_short_s.begin(), position);
+ if (code > 0xF) {
+ return std::nullopt;
+ }
+ return code;
}
std::string ERCode::to_s(uint16_t rcode) {
if (rcode >= RCode::rcodes_s.size()) {
- return std::string("Err#")+std::to_string(rcode);
+ return std::string("Err#") + std::to_string(rcode);
}
return RCode::rcodes_s.at(rcode);
}
+std::string ERCode::to_short_s(uint16_t rcode) {
+ if (rcode >= rcodes_short_s.size()) {
+ return "rcode" + std::to_string(rcode);
+ }
+ return rcodes_short_s.at(rcode);
+}
+
+std::optional ERCode::from_short(const std::string_view& ercode_string)
+{
+ const auto* position = std::find(rcodes_short_s.begin(), rcodes_short_s.end(), ercode_string);
+ if (position == rcodes_short_s.end()) {
+ return std::nullopt;
+ }
+ return std::distance(rcodes_short_s.begin(), position);
+}
+
std::string Opcode::to_s(uint8_t opcode) {
- static const std::array s_opcodes = { "Query", "IQuery", "Status", "3", "Notify", "Update" };
+ static const std::array s_opcodes = { "Query", "IQuery", "Status", "", "Notify", "Update" };
- if (opcode >= s_opcodes.size()) {
+ if (opcode >= s_opcodes.size() || s_opcodes.at(opcode).empty()) {
return std::to_string(opcode);
}
return s_opcodes.at(opcode);
}
+std::optional Opcode::from_lowercase_string(const std::string_view& opcode_string)
+{
+ static const std::array s_opcodes = { "query", "iquery", "status", "", "notify", "update" };
+ const auto* position = std::find(s_opcodes.begin(), s_opcodes.end(), opcode_string);
+ if (position == s_opcodes.end() || position->empty()) {
+ return std::nullopt;
+ }
+ return std::distance(s_opcodes.begin(), position);
+}
+
// goal is to hash based purely on the question name, and turn error into 'default'
uint32_t hashQuestion(const uint8_t* packet, uint16_t packet_len, uint32_t init, bool& wasOK)
{
diff -Nru pdns-recursor-5.2.13/dns.hh pdns-recursor-5.4.9/dns.hh
--- pdns-recursor-5.2.13/dns.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dns.hh 2026-10-26 09:46:36.000000000 +0000
@@ -23,6 +23,8 @@
#include "qtype.hh"
#include "dnsname.hh"
#include
+#include
+#include
#include
#undef BADSIG // signal.h SIG_ERR
@@ -35,6 +37,7 @@
enum rcodes_ : uint8_t { NoError=0, FormErr=1, ServFail=2, NXDomain=3, NotImp=4, Refused=5, YXDomain=6, YXRRSet=7, NXRRSet=8, NotAuth=9, NotZone=10};
static std::string to_s(uint8_t rcode);
static std::string to_short_s(uint8_t rcode);
+ static std::optional from_short(const std::string_view& rcode_string);
const static std::array rcodes_s;
};
@@ -43,6 +46,8 @@
public:
enum rcodes_ : uint16_t { BADVERS=16, BADSIG=16, BADKEY=17, BADTIME=18, BADMODE=19, BADNAME=20, BADALG=21, BADTRUNC=22, BADCOOKIE=23 };
static std::string to_s(uint16_t rcode);
+ static std::string to_short_s(uint16_t rcode);
+ static std::optional from_short(const std::string_view& ercode_string);
};
class Opcode
@@ -50,8 +55,16 @@
public:
enum opcodes_ : uint8_t { Query=0, IQuery=1, Status=2, Notify=4, Update=5 };
static std::string to_s(uint8_t opcode);
+ static std::optional from_lowercase_string(const std::string_view& opcode_string);
};
+// This needs to be a signed type, so that serialization of UnknownDomainID
+// as text is "-1", for compatibility with the remote and pipe backends.
+// See static_assert there for details.
+using domainid_t = int32_t;
+
+constexpr domainid_t UnknownDomainID{-1};
+
//! This class represents a resource record
class DNSResourceRecord
{
@@ -78,12 +91,12 @@
// Aligned on 8-byte boundaries on systems where time_t is 8 bytes and int
// is 4 bytes, aka modern linux on x86_64
- time_t last_modified{}; //!< For autocalculating SOA serial numbers - the backend needs to fill this in
+ time_t last_modified{}; //!< Timestamp of last update, if known by the backend
uint32_t ttl{}; //!< Time To Live of this record
uint32_t signttl{}; //!< If non-zero, use this TTL as original TTL in the RRSIG
- int domain_id{-1}; //!< If a backend implements this, the domain_id of the zone this record is in
+ domainid_t domain_id{UnknownDomainID}; //!< If a backend implements this, the domain_id of the zone this record is in
QType qtype; //!< qtype of this record, ie A, CNAME, MX etc
uint16_t qclass{1}; //!< class of this record
@@ -91,7 +104,7 @@
bool auth{true};
bool disabled{};
- bool operator==(const DNSResourceRecord& rhs);
+ bool operator==(const DNSResourceRecord& rhs) const;
bool operator<(const DNSResourceRecord& other) const
{
@@ -123,39 +136,17 @@
static_assert(sizeof(EDNS0Record) == 4, "EDNS0Record size must be 4");
-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-#include
-#elif __linux__ || __GNU__
-# include
-
-#else // with thanks to
-
-# define LITTLE_ENDIAN 1234 /* least-significant byte first (vax, pc) */
-# define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */
-# define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long (pdp) */
-
-#if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
- defined(__i386) || defined(__ia64) || defined(__amd64) || \
- defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
- defined(__alpha__) || defined(__alpha) || \
- (defined(__Lynx__) && defined(__x86__))
-# define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#if defined(sel) || defined(pyr) || defined(mc68000) || defined(sparc) || \
- defined(__sparc) || \
- defined(is68k) || defined(tahoe) || defined(ibm032) || defined(ibm370) || \
- defined(MIPSEB) || defined(_MIPSEB) || defined(_IBMR2) || defined(DGUX) ||\
- defined(apollo) || defined(__convex__) || defined(_CRAY) || \
- defined(__hppa) || defined(__hp9000) || \
- defined(__hp9000s300) || defined(__hp9000s700) || \
- defined(__hp3000s900) || defined(MPE) || \
- defined(BIT_ZERO_ON_LEFT) || defined(m68k) || \
- (defined(__Lynx__) && \
- (defined(__68k__) || defined(__sparc__) || defined(__powerpc__)))
-# define BYTE_ORDER BIG_ENDIAN
+#if __has_include()
+#include // Recent posix
+#elif __has_include()
+#include // Common place on older BSD derived systems
+#else
+#error no endian.h found
#endif
+// Sanity check
+#if !defined(BYTE_ORDER)
+#error cannot determine byte order
#endif
struct dnsheader {
@@ -173,7 +164,7 @@
unsigned ad: 1; /* authentic data from named */
unsigned cd: 1; /* checking disabled by resolver */
unsigned rcode :4; /* response code */
-#elif BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
+#elif BYTE_ORDER == LITTLE_ENDIAN
/* fields in third byte */
unsigned rd :1; /* recursion desired */
unsigned tc :1; /* truncated message */
@@ -214,6 +205,11 @@
d_p = &d_h;
}
}
+ dnsheader_aligned(const dnsheader_aligned&) = delete;
+ dnsheader_aligned(dnsheader_aligned&&) = delete;
+ dnsheader_aligned& operator=(const dnsheader_aligned&) = delete;
+ dnsheader_aligned& operator=(dnsheader_aligned&&) = delete;
+ ~dnsheader_aligned() = default;
[[nodiscard]] const dnsheader* get() const
{
@@ -259,7 +255,7 @@
#if BYTE_ORDER == BIG_ENDIAN
#define FLAGS_RD_OFFSET (8)
#define FLAGS_CD_OFFSET (12)
-#elif BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
+#elif BYTE_ORDER == LITTLE_ENDIAN
#define FLAGS_RD_OFFSET (0)
#define FLAGS_CD_OFFSET (12)
#endif
diff -Nru pdns-recursor-5.2.13/dns_random.hh pdns-recursor-5.4.9/dns_random.hh
--- pdns-recursor-5.2.13/dns_random.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dns_random.hh 2026-10-26 09:46:36.000000000 +0000
@@ -41,6 +41,11 @@
return arc4random() & 0xffff;
}
+inline void dns_random(void* buf, size_t size)
+{
+ arc4random_buf(buf, size);
+}
+
namespace pdns
{
struct dns_random_engine
diff -Nru pdns-recursor-5.2.13/dnsbackend.hh pdns-recursor-5.4.9/dnsbackend.hh
--- pdns-recursor-5.2.13/dnsbackend.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dnsbackend.hh 2026-10-26 09:46:36.000000000 +0000
@@ -54,15 +54,15 @@
{
DomainInfo() = default;
- DNSName zone;
- DNSName catalog;
+ ZoneName zone;
+ ZoneName catalog;
time_t last_check{};
string options;
string account;
vector primaries;
DNSBackend* backend{};
- uint32_t id{};
+ domainid_t id{};
uint32_t notified_serial{};
bool receivedNotify{};
@@ -134,7 +134,7 @@
struct AutoPrimary
{
AutoPrimary(string new_ip, string new_nameserver, string new_account) :
- ip(std::move(new_ip)), nameserver(std::move(new_nameserver)), account(std::move(new_account)){};
+ ip(std::move(new_ip)), nameserver(std::move(new_nameserver)), account(std::move(new_account)) {};
std::string ip;
std::string nameserver;
std::string account;
@@ -156,29 +156,45 @@
class DNSBackend
{
public:
+ enum Capabilities : unsigned int
+ {
+ CAP_DNSSEC = 1 << 0, // Backend supports DNSSEC
+ CAP_COMMENTS = 1 << 1, // Backend supports comments
+ CAP_DIRECT = 1 << 2, // Backend supports direct commands
+ CAP_LIST = 1 << 3, // Backend supports record enumeration
+ CAP_CREATE = 1 << 4, // Backend supports domain creation
+ CAP_VIEWS = 1 << 5, // Backend supports views
+ CAP_SEARCH = 1 << 6, // Backend supports record search
+ };
+
+ virtual unsigned int getCapabilities() = 0;
+
//! lookup() initiates a lookup. A lookup without results should not throw!
- virtual void lookup(const QType& qtype, const DNSName& qdomain, int zoneId = -1, DNSPacket* pkt_p = nullptr) = 0;
+ virtual void lookup(const QType& qtype, const DNSName& qdomain, domainid_t zoneId, DNSPacket* pkt_p = nullptr) = 0;
+ virtual void APILookup(const QType& qtype, const DNSName& qdomain, domainid_t zoneId, bool include_disabled = false);
virtual bool get(DNSResourceRecord&) = 0; //!< retrieves one DNSResource record, returns false if no more were available
virtual bool get(DNSZoneRecord& zoneRecord);
+ //! Close state created by lookup(...).
+ virtual void lookupEnd();
//! Initiates a list of the specified domain
/** Once initiated, DNSResourceRecord objects can be retrieved using get(). Should return false
if the backend does not consider itself responsible for the id passed.
\param domain_id ID of which a list is requested
*/
- virtual bool list(const DNSName& target, int domain_id, bool include_disabled = false) = 0;
+ virtual bool list(const ZoneName& target, domainid_t domain_id, bool include_disabled = false) = 0;
virtual ~DNSBackend() = default;
//! fills the soadata struct with the SOA details. Returns false if there is no SOA.
- virtual bool getSOA(const DNSName& domain, SOAData& soaData);
+ virtual bool getSOA(const ZoneName& domain, domainid_t zoneId, SOAData& soaData);
- virtual bool replaceRRSet(uint32_t /* domain_id */, const DNSName& /* qname */, const QType& /* qt */, const vector& /* rrset */)
+ virtual bool replaceRRSet(domainid_t /* domain_id */, const DNSName& /* qname */, const QType& /* qt */, const vector& /* rrset */)
{
return false;
}
- virtual bool listSubZone(const DNSName& /* zone */, int /* domain_id */)
+ virtual bool listSubZone(const ZoneName& /* zone */, domainid_t /* domain_id */)
{
return false;
}
@@ -188,9 +204,9 @@
{
return (name == "PRESIGNED" || name == "NSEC3PARAM" || name == "NSEC3NARROW");
}
- virtual bool getAllDomainMetadata(const DNSName& /* name */, std::map>& /* meta */) { return false; };
- virtual bool getDomainMetadata(const DNSName& /* name */, const std::string& /* kind */, std::vector& /* meta */) { return false; }
- virtual bool getDomainMetadataOne(const DNSName& name, const std::string& kind, std::string& value)
+ virtual bool getAllDomainMetadata(const ZoneName& /* name */, std::map>& /* meta */) { return false; };
+ virtual bool getDomainMetadata(const ZoneName& /* name */, const std::string& /* kind */, std::vector& /* meta */) { return false; }
+ virtual bool getDomainMetadataOne(const ZoneName& name, const std::string& kind, std::string& value)
{
std::vector meta;
if (getDomainMetadata(name, kind, meta)) {
@@ -202,8 +218,8 @@
return false;
}
- virtual bool setDomainMetadata(const DNSName& /* name */, const std::string& /* kind */, const std::vector& /* meta */) { return false; }
- virtual bool setDomainMetadataOne(const DNSName& name, const std::string& kind, const std::string& value)
+ virtual bool setDomainMetadata(const ZoneName& /* name */, const std::string& /* kind */, const std::vector& /* meta */) { return false; }
+ virtual bool setDomainMetadataOne(const ZoneName& name, const std::string& kind, const std::string& value)
{
const std::vector meta(1, value);
return setDomainMetadata(name, kind, meta);
@@ -212,7 +228,7 @@
virtual void getAllDomains(vector* domains, bool getSerial, bool include_disabled);
/** Determines if we are authoritative for a zone, and at what level */
- virtual bool getAuth(const DNSName& target, SOAData* /* sd */);
+ virtual bool getAuth(const ZoneName& target, SOAData* /* sd */);
struct KeyData
{
@@ -223,47 +239,45 @@
bool published{false};
};
- virtual bool getDomainKeys(const DNSName& /* name */, std::vector& /* keys */) { return false; }
- virtual bool removeDomainKey(const DNSName& /* name */, unsigned int /* id */) { return false; }
- virtual bool addDomainKey(const DNSName& /* name */, const KeyData& /* key */, int64_t& /* id */) { return false; }
- virtual bool activateDomainKey(const DNSName& /* name */, unsigned int /* id */) { return false; }
- virtual bool deactivateDomainKey(const DNSName& /* name */, unsigned int /* id */) { return false; }
- virtual bool publishDomainKey(const DNSName& /* name */, unsigned int /* id */) { return false; }
- virtual bool unpublishDomainKey(const DNSName& /* name */, unsigned int /* id */) { return false; }
+ virtual bool getDomainKeys(const ZoneName& /* name */, std::vector& /* keys */) { return false; }
+ virtual bool removeDomainKey(const ZoneName& /* name */, unsigned int /* id */) { return false; }
+ virtual bool addDomainKey(const ZoneName& /* name */, const KeyData& /* key */, int64_t& /* id */) { return false; }
+ virtual bool activateDomainKey(const ZoneName& /* name */, unsigned int /* id */) { return false; }
+ virtual bool deactivateDomainKey(const ZoneName& /* name */, unsigned int /* id */) { return false; }
+ virtual bool publishDomainKey(const ZoneName& /* name */, unsigned int /* id */) { return false; }
+ virtual bool unpublishDomainKey(const ZoneName& /* name */, unsigned int /* id */) { return false; }
virtual bool setTSIGKey(const DNSName& /* name */, const DNSName& /* algorithm */, const string& /* content */) { return false; }
virtual bool getTSIGKey(const DNSName& /* name */, DNSName& /* algorithm */, string& /* content */) { return false; }
virtual bool getTSIGKeys(std::vector& /* keys */) { return false; }
virtual bool deleteTSIGKey(const DNSName& /* name */) { return false; }
- virtual bool getBeforeAndAfterNamesAbsolute(uint32_t /* id */, const DNSName& /* qname */, DNSName& /* unhashed */, DNSName& /* before */, DNSName& /* after */)
+ virtual bool getBeforeAndAfterNamesAbsolute(domainid_t /* id */, const DNSName& qname, DNSName& /* unhashed */, DNSName& /* before */, DNSName& /* after */)
{
- std::cerr << "Default beforeAndAfterAbsolute called!" << std::endl;
- abort();
- return false;
+ throw PDNSException("DNSSEC operation invoked on non-DNSSEC capable backend, qname: '" + qname.toLogString() + "'");
}
- virtual bool getBeforeAndAfterNames(uint32_t /* id */, const DNSName& zonename, const DNSName& qname, DNSName& before, DNSName& after);
+ virtual bool getBeforeAndAfterNames(domainid_t /* id */, const ZoneName& zonename, const DNSName& qname, DNSName& before, DNSName& after);
- virtual bool updateDNSSECOrderNameAndAuth(uint32_t /* domain_id */, const DNSName& /* qname */, const DNSName& /* ordername */, bool /* auth */, const uint16_t /* qtype */ = QType::ANY)
+ virtual bool updateDNSSECOrderNameAndAuth(domainid_t /* domain_id */, const DNSName& /* qname */, const DNSName& /* ordername */, bool /* auth */, const uint16_t /* qtype */, bool /* isNsec3 */)
{
return false;
}
- virtual bool updateEmptyNonTerminals(uint32_t /* domain_id */, set& /* insert */, set& /* erase */, bool /* remove */)
+ virtual bool updateEmptyNonTerminals(domainid_t /* domain_id */, set& /* insert */, set& /* erase */, bool /* remove */)
{
return false;
}
- virtual bool doesDNSSEC()
+ bool doesDNSSEC()
{
- return false;
+ return (getCapabilities() & CAP_DNSSEC) != 0;
}
// end DNSSEC
// comments support
- virtual bool listComments(uint32_t /* domain_id */)
+ virtual bool listComments(domainid_t /* domain_id */)
{
return false; // unsupported by this backend
}
@@ -278,14 +292,17 @@
return false;
}
- virtual bool replaceComments(const uint32_t /* domain_id */, const DNSName& /* qname */, const QType& /* qt */, const vector& /* comments */)
+ virtual bool replaceComments(const domainid_t /* domain_id */, const DNSName& /* qname */, const QType& /* qt */, const vector& /* comments */)
{
return false;
}
- //! returns true if primary ip is primary for domain name.
- //! starts the transaction for updating domain qname (FIXME: what is id?)
- virtual bool startTransaction(const DNSName& /* qname */, int /* id */ = -1)
+ //! starts the transaction for updating domain qname, destroying all
+ //! existing data for that domain if id is != UnknownDomainID. In this case,
+ //! the id MUST match the DomainInfo information for qname, or very bad things
+ //! will happen.
+ //! FIXME: replace this with a bool to make this a less error-prone interface.
+ virtual bool startTransaction(const ZoneName& /* qname */, domainid_t /* id */ = UnknownDomainID)
{
return false;
}
@@ -320,17 +337,17 @@
{
return false; // no problem!
}
- virtual bool feedEnts(int /* domain_id */, map& /* nonterm */)
+ virtual bool feedEnts(domainid_t /* domain_id */, map& /* nonterm */)
{
return false;
}
- virtual bool feedEnts3(int /* domain_id */, const DNSName& /* domain */, map& /* nonterm */, const NSEC3PARAMRecordContent& /* ns3prc */, bool /* narrow */)
+ virtual bool feedEnts3(domainid_t /* domain_id */, const DNSName& /* domain */, map& /* nonterm */, const NSEC3PARAMRecordContent& /* ns3prc */, bool /* narrow */)
{
return false;
}
//! if this returns true, DomainInfo di contains information about the domain
- virtual bool getDomainInfo(const DNSName& /* domain */, DomainInfo& /* di */, bool /* getSerial */ = true)
+ virtual bool getDomainInfo(const ZoneName& /* domain */, DomainInfo& /* di */, bool /* getSerial */ = true)
{
return false;
}
@@ -340,7 +357,7 @@
}
//! get a list of IP addresses that should also be notified for a domain
- virtual void alsoNotifies(const DNSName& domain, set* ips)
+ virtual void alsoNotifies(const ZoneName& domain, set* ips)
{
std::vector meta;
getDomainMetadata(domain, "ALSO-NOTIFY", meta);
@@ -353,52 +370,52 @@
}
//! get list of all members in a catalog
- virtual bool getCatalogMembers(const DNSName& /* catalog */, vector& /* members */, CatalogInfo::CatalogType /* type */)
+ [[nodiscard]] virtual bool getCatalogMembers(const ZoneName& /* catalog */, vector& /* members */, CatalogInfo::CatalogType /* type */)
{
return false;
}
//! Called by PowerDNS to inform a backend that a domain need to be checked for freshness
- virtual void setStale(uint32_t /* domain_id */)
+ virtual void setStale(domainid_t /* domain_id */)
{
}
//! Called by PowerDNS to inform a backend that a domain has been checked for freshness
- virtual void setFresh(uint32_t /* domain_id */)
+ virtual void setFresh(domainid_t /* domain_id */)
{
}
//! Called by PowerDNS to inform a backend that the changes in the domain have been reported to secondaries
- virtual void setNotified(uint32_t /* id */, uint32_t /* serial */)
+ virtual void setNotified(domainid_t /* id */, uint32_t /* serial */)
{
}
//! Called when the Primary list of a domain should be changed
- virtual bool setPrimaries(const DNSName& /* domain */, const vector& /* primaries */)
+ virtual bool setPrimaries(const ZoneName& /* domain */, const vector& /* primaries */)
{
return false;
}
//! Called when the Kind of a domain should be changed (primary -> native and similar)
- virtual bool setKind(const DNSName& /* domain */, const DomainInfo::DomainKind /* kind */)
+ virtual bool setKind(const ZoneName& /* domain */, const DomainInfo::DomainKind /* kind */)
{
return false;
}
//! Called when the options of a domain should be changed
- virtual bool setOptions(const DNSName& /* domain */, const string& /* options */)
+ virtual bool setOptions(const ZoneName& /* domain */, const string& /* options */)
{
return false;
}
//! Called when the catalog of a domain should be changed
- virtual bool setCatalog(const DNSName& /* domain */, const DNSName& /* catalog */)
+ virtual bool setCatalog(const ZoneName& /* domain */, const ZoneName& /* catalog */)
{
return false;
}
//! Called when the Account of a domain should be changed
- virtual bool setAccount(const DNSName& /* domain */, const string& /* account */)
+ virtual bool setAccount(const ZoneName& /* domain */, const string& /* account */)
{
return false;
}
@@ -424,26 +441,26 @@
return false;
}
- //! determine if ip is a autoprimary or a domain
- virtual bool autoPrimaryBackend(const string& /* ip */, const DNSName& /* domain */, const vector& /* nsset */, string* /* nameserver */, string* /* account */, DNSBackend** /* db */)
+ //! determine if ip is an autoprimary or a domain
+ virtual bool autoPrimaryBackend(const string& /* ip */, const ZoneName& /* domain */, const vector& /* nsset */, string* /* nameserver */, string* /* account */, DNSBackend** /* db */)
{
return false;
}
//! called by PowerDNS to create a new domain
- virtual bool createDomain(const DNSName& /* domain */, const DomainInfo::DomainKind /* kind */, const vector& /* primaries */, const string& /* account */)
+ virtual bool createDomain(const ZoneName& /* domain */, const DomainInfo::DomainKind /* kind */, const vector& /* primaries */, const string& /* account */)
{
return false;
}
- //! called by PowerDNS to create a secondary record for a autoPrimary
- virtual bool createSecondaryDomain(const string& /* ip */, const DNSName& /* domain */, const string& /* nameserver */, const string& /* account */)
+ //! called by PowerDNS to create a secondary record for an autoprimary
+ virtual bool createSecondaryDomain(const string& /* ip */, const ZoneName& /* domain */, const string& /* nameserver */, const string& /* account */)
{
return false;
}
//! called to delete a domain, incl. all metadata, zone contents, etc.
- virtual bool deleteDomain(const DNSName& /* domain */)
+ virtual bool deleteDomain(const ZoneName& /* domain */)
{
return false;
}
@@ -454,19 +471,70 @@
}
//! Search for records, returns true if search was done successfully.
- virtual bool searchRecords(const string& /* pattern */, size_t /* maxResults */, vector& /* result */)
+ virtual bool searchRecords(const string& pattern, size_t maxResults, vector& result);
+
+ //! Search for comments, returns true if search was done successfully.
+ virtual bool searchComments(const string& /* pattern */, size_t /* maxResults */, vector& /* result */)
{
return false;
}
- //! Search for comments, returns true if search was done successfully.
- virtual bool searchComments(const string& /* pattern */, size_t /* maxResults */, vector& /* result */)
+ virtual void viewList(vector& /* result */)
+ {
+ }
+
+ virtual void viewListZones(const string& /* view */, vector& /* result */)
+ {
+ }
+
+ virtual bool viewAddZone(const string& /* view */, const ZoneName& /* zone */)
{
return false;
}
+ virtual bool viewDelZone(const string& /* view */, const ZoneName& /* zone */)
+ {
+ return false;
+ }
+
+ virtual bool networkSet(const Netmask& /* net */, std::string& /* tag */)
+ {
+ return false;
+ }
+
+ virtual bool networkList(vector>& /* networks */)
+ {
+ return false;
+ }
+
+ //! Returns whether backend operations have caused files to be created.
+ virtual bool hasCreatedLocalFiles() const
+ {
+ return false;
+ }
+
+ virtual void rectifyZoneHook(domainid_t /*domain_id*/, bool /*before*/) const
+ {
+ }
+
const string& getPrefix() { return d_prefix; };
+ // The following routine allows callers to retrieve invalid records from
+ // the backend, which would not be returned by get(). This is used by
+ // pdnsutil for diagnostic purposes.
+ // The default implementation simply wraps get() and pretends there are
+ // no invalid or corrupted records in the backend storage.
+
+ virtual bool get_unsafe(DNSResourceRecord& rec, std::vector>& invalid)
+ {
+ invalid.clear();
+ return get(rec);
+ }
+
+ virtual void flush()
+ {
+ }
+
protected:
bool mustDo(const string& key);
const string& getArg(const string& key);
@@ -479,8 +547,8 @@
class BackendFactory
{
public:
- BackendFactory(const string& name) :
- d_name(name) {}
+ BackendFactory(string name) :
+ d_name(std::move(name)) {}
virtual ~BackendFactory() = default;
virtual DNSBackend* make(const string& suffix) = 0;
virtual DNSBackend* makeMetadataOnly(const string& suffix)
@@ -528,9 +596,14 @@
struct SOAData
{
SOAData() :
- domain_id(-1){};
+ domain_id(UnknownDomainID) {};
+#if defined(PDNS_AUTH)
+ const DNSName& qname() const { return zonename.operator const DNSName&(); }
+ ZoneName zonename;
+#else
DNSName qname;
+#endif
DNSName nameserver;
DNSName rname;
uint32_t ttl{};
@@ -540,7 +613,7 @@
uint32_t expire{};
uint32_t minimum{};
DNSBackend* db{};
- int domain_id{};
+ domainid_t domain_id{};
[[nodiscard]] uint32_t getNegativeTTL() const { return min(ttl, minimum); }
};
diff -Nru pdns-recursor-5.2.13/dnslabeltext.cc pdns-recursor-5.4.9/dnslabeltext.cc
--- pdns-recursor-5.2.13/dnslabeltext.cc 2026-08-05 12:02:08.000000000 +0000
+++ pdns-recursor-5.4.9/dnslabeltext.cc 2026-10-26 09:47:08.000000000 +0000
@@ -1,10 +1,11 @@
-#line 1 "dnslabeltext.rl"
+#line 1 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
#include
#include
#include
#include
#include
+#include
#include "dnsname.hh"
#include "namespaces.hh"
#include "dnswriter.hh"
@@ -26,7 +27,7 @@
{
// cerr<<"segmentDNSText("< ret;
-#line 93 "dnslabeltext.cc"
+#line 94 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
cs = dnstext_start;
}
-#line 96 "dnslabeltext.cc"
+#line 97 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
int _klen;
unsigned int _trans;
@@ -175,27 +176,27 @@
switch ( *_acts++ )
{
case 0:
-#line 42 "dnslabeltext.rl"
+#line 43 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
ret.push_back(segment);
segment.clear();
}
break;
case 1:
-#line 46 "dnslabeltext.rl"
+#line 47 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
segment.clear();
}
break;
case 2:
-#line 50 "dnslabeltext.rl"
+#line 51 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
char c = *p;
appendSplit(ret, segment, c);
}
break;
case 3:
-#line 54 "dnslabeltext.rl"
+#line 55 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
char c = *p;
val *= 10;
@@ -204,19 +205,19 @@
}
break;
case 4:
-#line 60 "dnslabeltext.rl"
+#line 61 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
appendSplit(ret, segment, val);
val=0;
}
break;
case 5:
-#line 65 "dnslabeltext.rl"
+#line 66 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
appendSplit(ret, segment, *(p));
}
break;
-#line 204 "dnslabeltext.cc"
+#line 205 "librec-dnslabeltext.a.p/dnslabeltext.cc"
}
}
@@ -233,13 +234,13 @@
while ( __nacts-- > 0 ) {
switch ( *__acts++ ) {
case 0:
-#line 42 "dnslabeltext.rl"
+#line 43 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
ret.push_back(segment);
segment.clear();
}
break;
-#line 225 "dnslabeltext.cc"
+#line 226 "librec-dnslabeltext.a.p/dnslabeltext.cc"
}
}
}
@@ -247,7 +248,7 @@
_out: {}
}
-#line 78 "dnslabeltext.rl"
+#line 79 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
if ( cs < dnstext_first_final ) {
@@ -261,7 +262,7 @@
DNSName::string_t segmentDNSNameRaw(const char* realinput, size_t inputlen)
{
-#line 243 "dnslabeltext.cc"
+#line 244 "librec-dnslabeltext.a.p/dnslabeltext.cc"
static const char _dnsnameraw_actions[] = {
0, 1, 0, 1, 1, 1, 2, 1,
3, 1, 4, 1, 5, 2, 1, 5,
@@ -312,7 +313,7 @@
static const int dnsnameraw_en_main = 1;
-#line 94 "dnslabeltext.rl"
+#line 95 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
(void)dnsnameraw_error; // silence warnings
(void)dnsnameraw_en_main;
@@ -333,12 +334,12 @@
unsigned char labellen=0;
unsigned int lenpos=0;
-#line 311 "dnslabeltext.cc"
+#line 312 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
cs = dnsnameraw_start;
}
-#line 314 "dnslabeltext.cc"
+#line 315 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
int _klen;
unsigned int _trans;
@@ -412,7 +413,7 @@
switch ( *_acts++ )
{
case 0:
-#line 114 "dnslabeltext.rl"
+#line 115 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
if (labellen > 63) {
throw runtime_error("Unable to parse DNS name '"+string(realinput)+"': invalid label length "+std::to_string(labellen));
@@ -422,7 +423,7 @@
}
break;
case 1:
-#line 121 "dnslabeltext.rl"
+#line 122 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
lenpos=ret.size();
ret.append(1, (char)0);
@@ -430,7 +431,7 @@
}
break;
case 2:
-#line 127 "dnslabeltext.rl"
+#line 128 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
char c = *p;
ret.append(1, c);
@@ -438,7 +439,7 @@
}
break;
case 3:
-#line 132 "dnslabeltext.rl"
+#line 133 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
char c = *p;
val *= 10;
@@ -446,7 +447,7 @@
}
break;
case 4:
-#line 137 "dnslabeltext.rl"
+#line 138 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
ret.append(1, val);
labellen++;
@@ -454,13 +455,13 @@
}
break;
case 5:
-#line 143 "dnslabeltext.rl"
+#line 144 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
ret.append(1, *(p));
labellen++;
}
break;
-#line 429 "dnslabeltext.cc"
+#line 430 "librec-dnslabeltext.a.p/dnslabeltext.cc"
}
}
@@ -477,7 +478,7 @@
while ( __nacts-- > 0 ) {
switch ( *__acts++ ) {
case 0:
-#line 114 "dnslabeltext.rl"
+#line 115 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
if (labellen > 63) {
throw runtime_error("Unable to parse DNS name '"+string(realinput)+"': invalid label length "+std::to_string(labellen));
@@ -487,14 +488,14 @@
}
break;
case 4:
-#line 137 "dnslabeltext.rl"
+#line 138 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
ret.append(1, val);
labellen++;
val=0;
}
break;
-#line 460 "dnslabeltext.cc"
+#line 461 "librec-dnslabeltext.a.p/dnslabeltext.cc"
}
}
}
@@ -502,7 +503,7 @@
_out: {}
}
-#line 164 "dnslabeltext.rl"
+#line 165 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
if ( cs < dnsnameraw_first_final ) {
@@ -514,11 +515,11 @@
// Reads an RFC 1035 character string from 'in', puts the resulting bytes in 'out'.
// Returns the amount of bytes read from 'in'
-size_t parseRFC1035CharString(const std::string &in, std::string &val) {
+size_t parseRFC1035CharString(std::string_view in, std::string &val) {
val.clear();
val.reserve(in.size());
- const char *p = in.c_str();
+ const char *p = in.data();
const char *pe = p + in.size();
int cs = 0;
uint8_t escaped_octet = 0;
@@ -531,7 +532,7 @@
* right place.
*/
-#line 493 "dnslabeltext.cc"
+#line 494 "librec-dnslabeltext.a.p/dnslabeltext.cc"
static const char _dns_text_to_string_actions[] = {
0, 1, 0, 1, 2, 1, 3, 2,
0, 1
@@ -597,12 +598,12 @@
static const int dns_text_to_string_en_main = 1;
-#line 557 "dnslabeltext.cc"
+#line 558 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
cs = dns_text_to_string_start;
}
-#line 232 "dnslabeltext.rl"
+#line 233 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
// silence warnings
@@ -610,7 +611,7 @@
(void) dns_text_to_string_error;
(void) dns_text_to_string_en_main;
-#line 566 "dnslabeltext.cc"
+#line 567 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
int _klen;
unsigned int _trans;
@@ -685,7 +686,7 @@
switch ( *_acts++ )
{
case 0:
-#line 194 "dnslabeltext.rl"
+#line 195 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
escaped_octet *= 10;
escaped_octet += (*p)-'0';
@@ -693,26 +694,26 @@
}
break;
case 1:
-#line 200 "dnslabeltext.rl"
+#line 201 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
val += escaped_octet;
escaped_octet = 0;
}
break;
case 2:
-#line 205 "dnslabeltext.rl"
+#line 206 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
val += (*p);
counter++;
}
break;
case 3:
-#line 210 "dnslabeltext.rl"
+#line 211 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
counter++;
}
break;
-#line 663 "dnslabeltext.cc"
+#line 664 "librec-dnslabeltext.a.p/dnslabeltext.cc"
}
}
@@ -725,7 +726,7 @@
_out: {}
}
-#line 239 "dnslabeltext.rl"
+#line 240 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
return counter;
}
@@ -743,7 +744,7 @@
std::string tmp;
-#line 690 "dnslabeltext.cc"
+#line 691 "librec-dnslabeltext.a.p/dnslabeltext.cc"
static const char _dns_text_to_value_list_actions[] = {
0, 1, 0, 1, 2, 1, 3, 2,
2, 3, 2, 3, 1
@@ -794,12 +795,12 @@
static const int dns_text_to_value_list_en_main = 3;
-#line 739 "dnslabeltext.cc"
+#line 740 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
cs = dns_text_to_value_list_start;
}
-#line 288 "dnslabeltext.rl"
+#line 289 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
// silence warnings
@@ -807,7 +808,7 @@
(void) dns_text_to_value_list_error;
(void) dns_text_to_value_list_en_main;
-#line 748 "dnslabeltext.cc"
+#line 749 "librec-dnslabeltext.a.p/dnslabeltext.cc"
{
int _klen;
unsigned int _trans;
@@ -882,20 +883,20 @@
switch ( *_acts++ )
{
case 0:
-#line 259 "dnslabeltext.rl"
+#line 260 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
tmp += (*p);
counter++;
}
break;
case 1:
-#line 264 "dnslabeltext.rl"
+#line 265 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
tmp += (*p);
}
break;
case 2:
-#line 268 "dnslabeltext.rl"
+#line 269 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
val.push_back(tmp);
tmp.clear();
@@ -903,12 +904,12 @@
}
break;
case 3:
-#line 274 "dnslabeltext.rl"
+#line 275 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
counter++;
}
break;
-#line 844 "dnslabeltext.cc"
+#line 845 "librec-dnslabeltext.a.p/dnslabeltext.cc"
}
}
@@ -925,14 +926,14 @@
while ( __nacts-- > 0 ) {
switch ( *__acts++ ) {
case 2:
-#line 268 "dnslabeltext.rl"
+#line 269 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
{
val.push_back(tmp);
tmp.clear();
counter++;
}
break;
-#line 866 "dnslabeltext.cc"
+#line 867 "librec-dnslabeltext.a.p/dnslabeltext.cc"
}
}
}
@@ -940,7 +941,7 @@
_out: {}
}
-#line 295 "dnslabeltext.rl"
+#line 296 "../../pdns-recursor/pdns/recursordist/./dnslabeltext.rl"
if ( cs < dns_text_to_value_list_first_final ) {
throw runtime_error("Unable to parse DNS SVCB value list '"+in+"'");
diff -Nru pdns-recursor-5.2.13/dnslabeltext.rl pdns-recursor-5.4.9/dnslabeltext.rl
--- pdns-recursor-5.2.13/dnslabeltext.rl 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dnslabeltext.rl 2026-10-26 09:46:36.000000000 +0000
@@ -3,6 +3,7 @@
#include
#include
#include
+#include
#include "dnsname.hh"
#include "namespaces.hh"
#include "dnswriter.hh"
@@ -172,11 +173,11 @@
// Reads an RFC 1035 character string from 'in', puts the resulting bytes in 'out'.
// Returns the amount of bytes read from 'in'
-size_t parseRFC1035CharString(const std::string &in, std::string &val) {
+size_t parseRFC1035CharString(std::string_view in, std::string &val) {
val.clear();
val.reserve(in.size());
- const char *p = in.c_str();
+ const char *p = in.data();
const char *pe = p + in.size();
int cs = 0;
uint8_t escaped_octet = 0;
diff -Nru pdns-recursor-5.2.13/dnsmessage.proto pdns-recursor-5.4.9/dnsmessage.proto
--- pdns-recursor-5.2.13/dnsmessage.proto 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dnsmessage.proto 2026-10-26 09:46:36.000000000 +0000
@@ -170,6 +170,8 @@
LuaNoData = 108;
LuaNXDomain = 109;
LuaPostResolveFFI = 110;
+
+ AuthRequest = 120;
}
message Event {
@@ -190,6 +192,10 @@
optional uint32 outgoingQueries = 27; // Number of outgoing queries used to answer the query
optional uint32 headerFlags = 28; // Flags field in wire format, 16 bits used
optional uint32 ednsVersion = 29; // EDNS version and flags in wire format, see https://www.rfc-editor.org/rfc/rfc6891.html#section-6.1.3
+ optional bytes openTelemetryData = 30; // Protobuf encoded Open Telemetry Data, see https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/trace/v1/trace.proto
+ optional uint32 ede = 31; // EDNS error code, actually 16 bits
+ optional string edeText = 32; // EDNS error text
+ optional bytes openTelemetryTraceID = 33; // OpenTelemetry TraceID
}
message PBDNSMessageList {
diff -Nru pdns-recursor-5.2.13/dnsname.cc pdns-recursor-5.4.9/dnsname.cc
--- pdns-recursor-5.2.13/dnsname.cc 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dnsname.cc 2026-10-26 09:46:36.000000000 +0000
@@ -29,7 +29,26 @@
#include
-const DNSName g_rootdnsname("."), g_wildcarddnsname("*");
+const DNSName g_rootdnsname(".");
+const DNSName g_wildcarddnsname("*");
+const DNSName g_coodnsname("coo");
+const DNSName g_groupdnsname("group");
+const DNSName g_versiondnsname("version");
+const DNSName g_zonesdnsname("zones");
+
+const DNSName g_gsstsigdnsname("gss-tsig");
+const DNSName g_hmacmd5dnsname("hmac-md5");
+const DNSName g_hmacmd5dnsname_long("hmac-md5.sig-alg.reg.int");
+const DNSName g_hmacsha1dnsname("hmac-sha1");
+const DNSName g_hmacsha224dnsname("hmac-sha224");
+const DNSName g_hmacsha256dnsname("hmac-sha256");
+const DNSName g_hmacsha384dnsname("hmac-sha384");
+const DNSName g_hmacsha512dnsname("hmac-sha512");
+
+const ZoneName g_rootzonename(".");
+
+uint16_t DNSName::s_maxPointersToPointers = 4;
+uint16_t DNSName::s_maxPointersPerName = 10;
/* raw storage
in DNS label format, with trailing 0. W/o trailing 0, we are 'empty'
@@ -99,7 +118,7 @@
}
}
-DNSName::DNSName(const char* pos, size_t len, size_t offset, bool uncompress, uint16_t* qtype, uint16_t* qclass, unsigned int* consumed, uint16_t minOffset)
+DNSName::DNSName(const char* pos, size_t len, size_t offset, bool uncompress, uint16_t* qtype, uint16_t* qclass, unsigned int* consumed, uint16_t minOffset, size_t* pointerBudget)
{
if (offset >= len)
throw std::range_error("Trying to read past the end of the buffer ("+std::to_string(offset)+ " >= "+std::to_string(len)+")");
@@ -110,7 +129,7 @@
}
}
- packetParser(pos, len, offset, uncompress, qtype, qclass, consumed, 0, minOffset);
+ packetParser(pos, len, offset, uncompress, qtype, qclass, consumed, 0, minOffset, 0, pointerBudget);
}
static void checkLabelLength(uint8_t length)
@@ -183,7 +202,7 @@
}
// this should be the __only__ dns name parser in PowerDNS.
-void DNSName::packetParser(const char* qpos, size_t len, size_t offset, bool uncompress, uint16_t* qtype, uint16_t* qclass, unsigned int* consumed, int depth, uint16_t minOffset)
+void DNSName::packetParser(const char* qpos, size_t len, size_t offset, bool uncompress, uint16_t* qtype, uint16_t* qclass, unsigned int* consumed, int depth, uint16_t minOffset, uint16_t pointerChainLength, size_t *pointerBudget)
{
if (offset >= len) {
throw std::range_error("Trying to read past the end of the buffer ("+std::to_string(offset)+ " >= "+std::to_string(len)+")");
@@ -197,7 +216,24 @@
pdns::views::UnsignedCharView view(qpos, len);
auto pos = parsePacketUncompressed(view, offset, uncompress);
+
labellen = view.at(pos);
+ if (pos == offset && labellen != 0) {
+ // It's a pointer
+ if (pointerBudget != nullptr) {
+ if (*pointerBudget == 0) {
+ throw std::range_error("Too many compression pointers processed in packet");
+ }
+ (*pointerBudget)--;
+ }
+ // Are we chasing a pointer chain already for this name?
+ if (pointerChainLength++ > s_maxPointersToPointers) {
+ throw std::range_error("Too many pointer to pointers during decompression (" + std::to_string(pointerChainLength) + ")");
+ }
+ }
+ else {
+ pointerChainLength = 0; // not an immediate pointer to pointer case any more
+ }
pos++;
if (labellen != 0 && pos < view.size()) {
if (labellen < 0xc0) {
@@ -219,11 +255,11 @@
throw std::range_error("Invalid label position during decompression ("+std::to_string(newpos)+ " < "+std::to_string(minOffset)+")");
}
- if (++depth > 100) {
- throw std::range_error("Abort label decompression after 100 redirects");
+ if (++depth > s_maxPointersPerName) {
+ throw std::range_error("Abort label decompression after too many redirects (" + std::to_string(depth) + ")");
}
- packetParser(qpos, len, newpos, true, nullptr, nullptr, nullptr, depth, minOffset);
+ packetParser(qpos, len, newpos, true, nullptr, nullptr, nullptr, depth, minOffset, pointerChainLength, pointerBudget);
pos++;
}
@@ -262,7 +298,7 @@
void DNSName::toString(std::string& output, const std::string& separator, const bool trailing) const
{
if (empty()) {
- throw std::out_of_range("Attempt to print an unset dnsname");
+ throw std::out_of_range("Attempt to print an unset DNSName");
}
if (isRoot()) {
@@ -303,7 +339,7 @@
std::string DNSName::toDNSString() const
{
if (empty()) {
- throw std::out_of_range("Attempt to DNSString an unset dnsname");
+ throw std::out_of_range("Attempt to DNSString an unset DNSName");
}
return std::string(d_storage.c_str(), d_storage.length());
@@ -329,7 +365,7 @@
bool DNSName::isPartOf(const DNSName& parent) const
{
if(parent.empty() || empty()) {
- throw std::out_of_range("empty dnsnames aren't part of anything");
+ throw std::out_of_range("empty DNSNames aren't part of anything");
}
if(parent.d_storage.size() > d_storage.size()) {
@@ -351,7 +387,7 @@
return true;
}
if (static_cast(*us) > 63) {
- throw std::out_of_range("illegal label length in dnsname");
+ throw std::out_of_range("illegal label length in DNSName");
}
}
return false;
@@ -466,12 +502,116 @@
d_storage = prep+d_storage;
}
-bool DNSName::slowCanonCompare(const DNSName& rhs) const
+int DNSName::slowCanonCompare_three_way(const DNSName& rhs) const
+{
+ // Unfortunately we can't use std::lexicographical_compare_three_way() yet
+ // as this would require C++20.
+ const auto ours = getRawLabels();
+ const auto rhsLabels = rhs.getRawLabels();
+ auto iter1 = ours.rbegin();
+ const auto& last1 = ours.rend();
+ auto iter2 = rhsLabels.rbegin();
+ const auto& last2 = rhsLabels.rend();
+ while (iter1 != last1 && iter2 != last2) {
+ if (int res = pdns_ilexicographical_compare_three_way(*iter1, *iter2); res != 0) {
+ return res;
+ }
+ ++iter1; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+ ++iter2; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+ }
+ if (iter1 == last1) {
+ if (iter2 != last2) {
+ return -1; // lt
+ }
+ }
+ else {
+ return 1; // gt
+ }
+ return 0; // eq
+}
+
+int DNSName::canonCompare_three_way(const DNSName& rhs, bool pretty) const
{
- auto ours=getRawLabels(), rhsLabels = rhs.getRawLabels();
- return std::lexicographical_compare(ours.rbegin(), ours.rend(), rhsLabels.rbegin(), rhsLabels.rend(), CIStringCompare());
+ // 01234567890abcd
+ // us: 1a3www4ds9a2nl
+ // rhs: 3www6online3com
+ // to compare, we start at the back, is nl < com? no -> done
+ //
+ // 0,2,6,a
+ // 0,4,a
+
+ std::array ourpos{};
+ std::array rhspos{};
+ uint8_t ourcount=0;
+ uint8_t rhscount=0;
+ //cout<<"Asked to compare "<(chr)) == 0) {
+ isNumerical = false;
+ break;
+ }
+ }
+ if (isNumerical) {
+ for (const auto chr : rhsstr) {
+ if (std::isdigit(static_cast(chr)) == 0) {
+ isNumerical = false;
+ break;
+ }
+ }
+ }
+ if (isNumerical) {
+ return ourlen < rhslen ? -1 : 1;
+ }
+ }
+ }
+
+ int res = pdns_ilexicographical_compare_three_way(ourstr, rhsstr);
+ if (res != 0) {
+ return res;
+ }
+ }
}
+
vector DNSName::getRawLabels() const
{
vector ret;
@@ -523,9 +663,17 @@
/*
* Returns true if the DNSName is a valid RFC 1123 hostname, this function uses
* a regex on the string, so it is probably best not used when speed is essential.
+ *
+ * If allowUnderscore is set, underscore characters (`_') are allowed anywhere
+ * a letter or a digit would have been. In particular, leading underscores are
+ * allowed.
*/
-bool DNSName::isHostname() const
+bool DNSName::isHostname(bool allowUnderscore) const
{
+ if (allowUnderscore) {
+ static Regex hostNameRegexWithUnderscore = Regex("^(([A-Za-z0-9_]([A-Za-z0-9-_]*[A-Za-z0-9_])?)\\.)+$");
+ return hostNameRegexWithUnderscore.match(this->toString());
+ }
static Regex hostNameRegex = Regex("^(([A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])?)\\.)+$");
return hostNameRegex.match(this->toString());
}
@@ -545,8 +693,8 @@
void DNSName::trimToLabels(unsigned int to)
{
- while(countLabels() > to && chopOff()) {
- ;
+ for (auto nlabels = countLabels(); nlabels > to; --nlabels) {
+ chopOff();
}
}
@@ -735,3 +883,199 @@
{
return d_position == 0;
}
+
+bool DNSName::matchesUncompressedName(const std::string_view& wire_uncompressed) const
+{
+ if (wire_uncompressed.empty() != empty() || wire_uncompressed.size() < d_storage.size()) {
+ return false;
+ }
+
+ return pdns_ilexicographical_compare_three_way(std::string_view(wire_uncompressed.data(), d_storage.size()), d_storage) == 0;
+}
+
+#if defined(PDNS_AUTH) // [
+std::ostream & operator<<(std::ostream &ostr, const ZoneName& zone)
+{
+ return ostr << zone.toLogString();
+}
+
+size_t hash_value(ZoneName const& zone)
+{
+ return zone.hash();
+}
+
+// Sugar while ZoneName::operator DNSName are made explicit. These can't be
+// made inline in class DNSName due to chicken-and-egg declaration order
+// between DNSName and ZoneName.
+bool DNSName::isPartOf(const ZoneName& rhs) const
+{
+ return isPartOf(rhs.operator const DNSName&());
+}
+DNSName DNSName::makeRelative(const ZoneName& zone) const
+{
+ return makeRelative(zone.operator const DNSName&());
+}
+void DNSName::makeUsRelative(const ZoneName& zone)
+{
+ makeUsRelative(zone.operator const DNSName&());
+}
+
+std::string_view::size_type ZoneName::findVariantSeparator(std::string_view name)
+{
+ std::string_view::size_type pos{0};
+
+ // Try to be as fast as possible in the non-variant case and exit
+ // quickly if we don't find two dots in a row.
+ while ((pos = name.find('.', pos)) != std::string_view::npos) {
+ ++pos;
+ if (pos >= name.length()) { // trailing single dot
+ return std::string_view::npos;
+ }
+ if (name.at(pos) == '.') {
+ // We have found two dots in a row, but the first dot might have been
+ // escaped. So we now need to count how many \ characters we can find a
+ // row before it; if their number is odd, the first dot is escaped and
+ // we need to keep searching.
+ size_t slashes{0};
+ while (pos >= 2 + slashes && name.at(pos - 2 - slashes) == '\\') {
+ ++slashes;
+ }
+ if ((slashes % 2) == 0) {
+ break;
+ }
+ }
+ }
+ return pos;
+}
+
+ZoneName::ZoneName(std::string_view name)
+{
+ if (auto sep = findVariantSeparator(name); sep != std::string_view::npos) {
+ setVariant(name.substr(sep + 1)); // ignore leading dot in variant name
+ name = name.substr(0, sep); // keep trailing dot in zone name
+ }
+ d_name = DNSName(name);
+}
+
+ZoneName::ZoneName(std::string_view name, std::string_view::size_type sep)
+{
+ if (sep != std::string_view::npos) {
+ setVariant(name.substr(sep + 1)); // ignore leading dot in variant name
+ name = name.substr(0, sep); // keep trailing dot in zone name
+ }
+ d_name = DNSName(name);
+}
+
+void ZoneName::setVariant(std::string_view variant)
+{
+ if (variant.find_first_not_of("abcdefghijklmnopqrstuvwxyz0123456789_-") != std::string_view::npos) {
+ throw std::out_of_range("invalid character in variant name '" + std::string{variant} + "'");
+ }
+ d_variant = variant;
+}
+
+std::string ZoneName::toLogString() const
+{
+ std::string ret = d_name.toLogString();
+ if (!d_variant.empty()) {
+ // Because toLogString() above uses toStringRootDot(), we do not want to
+ // output one too many dots if this is a root-with-variant.
+ ret.push_back('.');
+ if (!d_name.isRoot()) {
+ ret.push_back('.');
+ }
+ ret += d_variant;
+ }
+ return ret;
+}
+
+std::string ZoneName::toString(const std::string& separator, const bool trailing) const
+{
+ std::string ret = d_name.toString(separator, trailing);
+ if (!d_variant.empty()) {
+ if (!trailing) {
+ ret.push_back('.');
+ }
+ ret.push_back('.');
+ ret += d_variant;
+ }
+ return ret;
+}
+
+std::string ZoneName::toStringNoDot() const
+{
+ std::string ret = d_name.toStringNoDot();
+ if (!d_variant.empty()) {
+ ret += "..";
+ ret += d_variant;
+ }
+ return ret;
+}
+
+std::string ZoneName::toStringRootDot() const
+{
+ std::string ret = d_name.toStringRootDot();
+ if (!d_variant.empty()) {
+ if (!d_name.isRoot()) {
+ ret.push_back('.');
+ }
+ ret.push_back('.');
+ ret += d_variant;
+ }
+ return ret;
+}
+
+size_t ZoneName::hash(size_t init) const
+{
+ if (!d_variant.empty()) {
+ init = burtleCI(d_variant, init);
+ }
+
+ return d_name.hash(init);
+}
+
+bool ZoneName::operator<(const ZoneName& rhs) const
+{
+ // Order by DNSName first, by variant second.
+ // Unfortunately we can't use std::lexicographical_compare_three_way() yet
+ // as this would require C++20.
+ auto iter1 = d_name.getStorage().rbegin();
+ const auto last1 = d_name.getStorage().rend();
+ auto iter2 = rhs.d_name.getStorage().rbegin();
+ const auto last2 = rhs.d_name.getStorage().rend();
+ while (iter1 != last1 && iter2 != last2) {
+ auto char1 = dns_tolower(*iter1);
+ auto char2 = dns_tolower(*iter2);
+ if (char1 < char2) {
+ return true;
+ }
+ if (char1 > char2) {
+ return false;
+ }
+ ++iter1; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+ ++iter2; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+ }
+ if (iter1 == last1) {
+ if (iter2 != last2) {
+ return true; // our DNSName is shorter (subset) than the other
+ }
+ }
+ else {
+ return false; // our DNSName is longer (superset) than the other
+ }
+ // At this point, both DNSName compare equal, we have to compare
+ // variants (which are case-sensitive).
+ return d_variant < rhs.d_variant;
+}
+
+int ZoneName::canonCompare_three_way(const ZoneName& rhs) const
+{
+ // Similarly to operator< above, this compares DNSName first, variant
+ // second.
+ if (int res = d_name.canonCompare_three_way(rhs.d_name); res != 0) {
+ return res;
+ }
+ // Both DNSName compare equal.
+ return d_variant.compare(rhs.d_variant);
+}
+#endif // ]
diff -Nru pdns-recursor-5.2.13/dnsname.hh pdns-recursor-5.4.9/dnsname.hh
--- pdns-recursor-5.2.13/dnsname.hh 2026-08-05 12:00:38.000000000 +0000
+++ pdns-recursor-5.4.9/dnsname.hh 2026-10-26 09:46:36.000000000 +0000
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -33,34 +34,34 @@
#include
#include