2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00

4814. [cleanup] Use AS_HELP_STRING for consistent help text. [RT #46521]

This commit is contained in:
Mark Andrews
2017-11-13 11:36:45 +11:00
parent 9eb5aa40aa
commit 6bbbf12936
4 changed files with 508 additions and 434 deletions

View File

@@ -1,3 +1,5 @@
4814. [cleanup] Use AS_HELP_STRING for consistent help text. [RT #46521]
4813. [bug] Address potential read after free errors from 4813. [bug] Address potential read after free errors from
query_synthnodata, query_synthwildcard and query_synthnodata, query_synthwildcard and
query_synthnxdomain. [RT #46547] query_synthnxdomain. [RT #46547]

355
configure vendored
View File

@@ -1686,14 +1686,14 @@ Optional Features:
--enable-fast-install[=PKGS] --enable-fast-install[=PKGS]
optimize for fast installation [default=yes] optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds) --disable-libtool-lock avoid locking (might break parallel builds)
--enable-libbind deprecated --enable-libbind deprecated
--enable-buffer-useinline --enable-buffer-useinline
define ISC_BUFFER_USEINLINE when compiling define ISC_BUFFER_USEINLINE when compiling
[[default=yes]] [default=yes]
--enable-warn-shadow turn on -Wshadow when compiling --enable-warn-shadow turn on -Wshadow when compiling
--enable-warn-error turn on -Werror when compiling --enable-warn-error turn on -Werror when compiling
--enable-developer enable developer build settings --enable-developer enable developer build settings
--enable-afl enable American Fuzzy Lop test harness [default=no] --enable-afl enable American Fuzzy Lop test harness [default=no]
--enable-seccomp enable support for libseccomp system call filtering --enable-seccomp enable support for libseccomp system call filtering
[default=no] [default=no]
--enable-kqueue use BSD kqueue when available [default=yes] --enable-kqueue use BSD kqueue when available [default=yes]
@@ -1705,26 +1705,32 @@ Optional Features:
check OpenSSL version [default=yes] check OpenSSL version [default=yes]
--enable-openssl-hash use OpenSSL for hash functions [default=yes] --enable-openssl-hash use OpenSSL for hash functions [default=yes]
--enable-crypto-rand use the crypto provider for random [default=yes] --enable-crypto-rand use the crypto provider for random [default=yes]
--enable-largefile 64-bit file support --enable-largefile 64-bit file support
--enable-backtrace log stack backtrace on abort [default=yes] --enable-backtrace log stack backtrace on abort [default=yes]
--enable-symtable use internal symbol table for backtrace --enable-symtable use internal symbol table for backtrace
[all|minimal(default)|none] [all|minimal(default)|none]
--enable-ipv6 use IPv6 default=autodetect --enable-ipv6 use IPv6 [default=autodetect]
--disable-tcp-fastopen disable TCP Fast Open support [default=autodetect] --disable-tcp-fastopen disable TCP Fast Open support [default=autodetect]
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_FASTOPEN socket option" >&5
$as_echo_n "checking for TCP_FASTOPEN socket option... " >&6; }
case "$enable_tcp_fastopen" in
yes|''|autodetect
--enable-getifaddrs enable the use of getifaddrs() [yes|no]. --enable-getifaddrs enable the use of getifaddrs() [yes|no].
--disable-isc-spnego use SPNEGO from GSSAPI library --disable-isc-spnego use SPNEGO from GSSAPI library
--disable-chroot disable chroot --disable-chroot disable chroot
--disable-linux-caps disable linux capabilities --disable-linux-caps disable linux capabilities
--enable-atomic enable machine specific atomic operations --enable-atomic enable machine specific atomic operations
[default=autodetect] [default=autodetect]
--enable-fixed-rrset enable fixed rrset ordering [default=no] --enable-fixed-rrset enable fixed rrset ordering [default=no]
--disable-rpz-nsip disable rpz nsip rules [default=enabled] --disable-rpz-nsip disable rpz nsip rules [default=enabled]
--disable-rpz-nsdname disable rpz nsdname rules [default=enabled] --disable-rpz-nsdname disable rpz nsdname rules [default=enabled]
--enable-dnsrps-dl DNS Response Policy Service delayed link [default=$librpz_dl] --enable-dnsrps-dl DNS Response Policy Service delayed link
[default=$librpz_dl]
--enable-dnsrps enable DNS Response Policy Service API --enable-dnsrps enable DNS Response Policy Service API
--enable-dnstap enable dnstap support (requires fstrm, protobuf-c) --enable-dnstap enable dnstap support (requires fstrm, protobuf-c)
--enable-querytrace enable very verbose query trace logging [default=no] --enable-querytrace enable very verbose query trace logging [default=no]
--enable-full-report report values of all configure options --enable-full-report report values of all configure options
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1738,54 +1744,60 @@ Optional Packages:
--with-python-install-dir=PATH --with-python-install-dir=PATH
installation directory for Python modules installation directory for Python modules
--with-geoip=PATH Build with GeoIP support (yes|no|path) --with-geoip=PATH Build with GeoIP support (yes|no|path)
--with-gssapi=[PATH|[/path/]krb5-config] Specify path for system-supplied GSSAPI [default=yes] --with-gssapi=PATH|/path/krb5-config
Specify path for system-supplied GSSAPI
[default=yes]
--with-randomdev=PATH Specify path for random device --with-randomdev=PATH Specify path for random device
--with-locktype=ARG Specify mutex lock type (adaptive or standard) --with-locktype=ARG Specify mutex lock type (adaptive or standard)
--with-libtool use GNU libtool --with-libtool use GNU libtool
--with-openssl=PATH Build with OpenSSL yes|no|path. --with-openssl=PATH Build with OpenSSL [yes|no|path]. (Crypto is
(Crypto is required for DNSSEC) required for DNSSEC)
--with-pkcs11=PATH Build with PKCS11 support yes|no|path --with-pkcs11=PATH Build with PKCS11 support [yes|no|path] (PATH is for
(PATH is for the PKCS11 provider) the PKCS11 provider)
--with-ecdsa Crypto ECDSA --with-ecdsa Crypto ECDSA
--with-gost Crypto GOST yes|no|raw|asn1. --with-gost Crypto GOST [yes|no|raw|asn1].
--with-eddsa Crypto EDDSA yes|all|no. --with-eddsa Crypto EDDSA [yes|all|no].
--with-aes Crypto AES --with-aes Crypto AES
--with-cc-alg=ALG choose the algorithm for Client Cookie [aes|sha1|sha256] --with-cc-alg=ALG choose the algorithm for Client Cookie
--with-lmdb=PATH build with LMDB library yes|no|path [aes|sha1|sha256]
--with-libxml2=PATH build with libxml2 library yes|no|path --with-lmdb=PATH build with LMDB library [yes|no|path]
--with-libjson=PATH build with libjson0 library yes|no|path --with-libxml2=PATH build with libxml2 library [yes|no|path]
--with-libjson=PATH build with libjson0 library [yes|no|path]
--with-zlib=PATH build with zlib for HTTP compression [default=yes] --with-zlib=PATH build with zlib for HTTP compression [default=yes]
--with-purify=PATH use Rational purify --with-purify=PATH use Rational purify
--with-gperftools-profiler use gperftools CPU profiler --with-gperftools-profiler
--with-kame=PATH use Kame IPv6 default path /usr/local/v6 use gperftools CPU profiler
--with-readline=LIBSPEC specify readline library default auto --with-kame=PATH use Kame IPv6 [default path /usr/local/v6]
--with-readline=LIBSPEC specify readline library [default auto]
--with-dnsrps-libname DNSRPS provider library name (librpz.so) --with-dnsrps-libname DNSRPS provider library name (librpz.so)
--with-dnsrps-dir path to DNSRPS provider library --with-dnsrps-dir path to DNSRPS provider library
--with-protobuf-c=path Path where protobuf-c is installed, for dnstap --with-protobuf-c=path Path where protobuf-c is installed, for dnstap
--with-libfstrm=path Path where libfstrm is installed, for dnstap --with-libfstrm=path Path where libfstrm is installed, for dnstap
--with-docbook-xsl=PATH specify path for Docbook-XSL stylesheets --with-docbook-xsl=PATH specify path for Docbook-XSL stylesheets
--with-idn=MPREFIX enable IDN support using idnkit default PREFIX --with-idn=MPREFIX enable IDN support using idnkit [default PREFIX]
--with-libiconv=IPREFIX GNU libiconv are in IPREFIX default PREFIX --with-libiconv=IPREFIX GNU libiconv are in IPREFIX [default PREFIX]
--with-iconv=LIBSPEC specify iconv library default -liconv --with-iconv=LIBSPEC specify iconv library [default -liconv]
--with-idnlib=ARG specify libidnkit --with-idnlib=ARG specify libidnkit
--with-atf=ARG support Automated Test Framework --with-atf support Automated Test Framework
--with-tuning=ARG Specify server tuning (large or default) --with-tuning=ARG Specify server tuning (large or default)
--with-dlopen=ARG support dynamically loadable DLZ drivers --with-dlopen=ARG support dynamically loadable DLZ drivers
--with-dlz-postgres=PATH Build with Postgres DLZ driver yes|no|path. --with-dlz-postgres=PATH
(Required to use Postgres with DLZ) Build with Postgres DLZ driver [yes|no|path].
--with-dlz-mysql=PATH Build with MySQL DLZ driver yes|no|path. (Required to use Postgres with DLZ)
(Required to use MySQL with DLZ) --with-dlz-mysql=PATH Build with MySQL DLZ driver [yes|no|path]. (Required
--with-dlz-bdb=PATH Build with Berkeley DB DLZ driver yes|no|path. to use MySQL with DLZ)
(Required to use Berkeley DB with DLZ) --with-dlz-bdb=PATH Build with Berkeley DB DLZ driver [yes|no|path].
--with-dlz-filesystem=ARG Build with filesystem DLZ driver yes|no. (Required to use Berkeley DB with DLZ)
(Required to use file system driver with DLZ) --with-dlz-filesystem=ARG
--with-dlz-ldap=PATH Build with LDAP DLZ driver yes|no|path. Build with filesystem DLZ driver [yes|no]. (Required
(Required to use LDAP with DLZ) to use file system driver with DLZ)
--with-dlz-odbc=PATH Build with ODBC DLZ driver yes|no|path. --with-dlz-ldap=PATH Build with LDAP DLZ driver [yes|no|path]. (Required
(Required to use ODBC with DLZ) to use LDAP with DLZ)
--with-dlz-stub=ARG Build with stub DLZ driver yes|no. --with-dlz-odbc=PATH Build with ODBC DLZ driver [yes|no|path]. (Required
(Required to use stub driver with DLZ) to use ODBC with DLZ)
--with-dlz-stub=ARG Build with stub DLZ driver [yes|no]. (Required to
use stub driver with DLZ)
--with-make-clean run "make clean" at end of configure [yes|no] --with-make-clean run "make clean" at end of configure [yes|no]
Some influential environment variables: Some influential environment variables:
@@ -11943,24 +11955,24 @@ $as_echo_n "checking python2 version >= 2.7 or python3 version >= 3.2... " >&6;
if ${PYTHON:-false} -c "$testminvers"; then if ${PYTHON:-false} -c "$testminvers"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; } $as_echo "found" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; } $as_echo "not found" >&6; }
unset ac_cv_path_PYTHON unset ac_cv_path_PYTHON
unset PYTHON unset PYTHON
continue continue
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'argparse'" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'argparse'" >&5
$as_echo_n "checking python module 'argparse'... " >&6; } $as_echo_n "checking python module 'argparse'... " >&6; }
if ${PYTHON:-false} -c "$testargparse"; then if ${PYTHON:-false} -c "$testargparse"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; } $as_echo "found" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; } $as_echo "not found" >&6; }
unset ac_cv_path_PYTHON unset ac_cv_path_PYTHON
unset PYTHON unset PYTHON
continue continue
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'ply'" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'ply'" >&5
@@ -11969,11 +11981,11 @@ $as_echo_n "checking python module 'ply'... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; } $as_echo "found" >&6; }
break break
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; } $as_echo "not found" >&6; }
unset ac_cv_path_PYTHON unset ac_cv_path_PYTHON
unset PYTHON unset PYTHON
fi fi
done done
if test "X$PYTHON" != "X" if test "X$PYTHON" != "X"
@@ -13400,12 +13412,12 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
$as_echo "#define HAVE_UNAME 1" >>confdefs.h $as_echo "#define HAVE_UNAME 1" >>confdefs.h
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: uname is not correctly supported" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: uname is not correctly supported" >&5
$as_echo "$as_me: WARNING: uname is not correctly supported" >&2;} $as_echo "$as_me: WARNING: uname is not correctly supported" >&2;}
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -15465,12 +15477,12 @@ else
fi fi
case "$locktype" in case "$locktype" in
adaptive) adaptive)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_ADAPTIVE_NP" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_ADAPTIVE_NP" >&5
$as_echo_n "checking for PTHREAD_MUTEX_ADAPTIVE_NP... " >&6; } $as_echo_n "checking for PTHREAD_MUTEX_ADAPTIVE_NP... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@@ -15499,15 +15511,15 @@ else
$as_echo "using standard lock type" >&6; } $as_echo "using standard lock type" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;; ;;
standard) standard)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using standard lock type" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: using standard lock type" >&5
$as_echo "using standard lock type" >&6; } $as_echo "using standard lock type" >&6; }
;; ;;
*) *)
as_fn_error $? "You must specify \"adaptive\" or \"standard\" for --with-locktype." "$LINENO" 5 as_fn_error $? "You must specify \"adaptive\" or \"standard\" for --with-locktype." "$LINENO" 5
;; ;;
esac esac
for ac_header in sched.h for ac_header in sched.h
do : do :
@@ -15986,7 +15998,7 @@ If you do not want OpenSSL, use --without-openssl" "$LINENO" 5
*) *)
if test "yes" = "$want_native_pkcs11" if test "yes" = "$want_native_pkcs11"
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
$as_echo "" >&6; } $as_echo "" >&6; }
as_fn_error $? "OpenSSL and native PKCS11 cannot be used together." "$LINENO" 5 as_fn_error $? "OpenSSL and native PKCS11 cannot be used together." "$LINENO" 5
fi fi
@@ -16510,7 +16522,7 @@ $as_echo_n "checking for OpenSSL AES support... " >&6; }
if test "$cross_compiling" = yes; then : if test "$cross_compiling" = yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using --with-aes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: using --with-aes" >&5
$as_echo "using --with-aes" >&6; } $as_echo "using --with-aes" >&6; }
# Expect cross-compiling with a modern OpenSSL # Expect cross-compiling with a modern OpenSSL
have_aes="evp" have_aes="evp"
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17257,8 +17269,8 @@ then
$as_echo "#define HAVE_LMDB 1" >>confdefs.h $as_echo "#define HAVE_LMDB 1" >>confdefs.h
NZD_TOOLS="nzd" NZD_TOOLS="nzd"
NZDSRCS='${NZDSRCS}' NZDSRCS='${NZDSRCS}'
NZDTARGETS='${NZDTARGETS}' NZDTARGETS='${NZDTARGETS}'
fi fi
@@ -18821,11 +18833,6 @@ if test "${enable_tcp_fastopen+set}" = set; then :
enableval=$enable_tcp_fastopen; enableval=$enable_tcp_fastopen;
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_FASTOPEN socket option" >&5
$as_echo_n "checking for TCP_FASTOPEN socket option... " >&6; }
case "$enable_tcp_fastopen" in
yes|''|autodetect)
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@@ -19389,11 +19396,11 @@ else
#include <stdio.h> #include <stdio.h>
main() { main() {
size_t j = 0; size_t j = 0;
char buf[100]; char buf[100];
buf[0] = 0; buf[0] = 0;
sprintf(buf, "%zu", j); sprintf(buf, "%zu", j);
exit(strcmp(buf, "0") != 0); exit(strcmp(buf, "0") != 0);
} }
_ACEOF _ACEOF
@@ -19405,9 +19412,9 @@ else
$as_echo "no" >&6; } $as_echo "no" >&6; }
ISC_PRINT_OBJS="print.$O" ISC_PRINT_OBJS="print.$O"
ISC_PRINT_SRCS="print.c" ISC_PRINT_SRCS="print.c"
ISC_PLATFORM_NEEDPRINTF='#define ISC_PLATFORM_NEEDPRINTF 1' ISC_PLATFORM_NEEDPRINTF='#define ISC_PLATFORM_NEEDPRINTF 1'
ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1' ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1'
ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1' ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1'
ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1" ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1"
fi fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -19736,11 +19743,11 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
ISC_PLATFORM_HAVESTATNSEC="#define ISC_PLATFORM_HAVESTATNSEC 1" ISC_PLATFORM_HAVESTATNSEC="#define ISC_PLATFORM_HAVESTATNSEC 1"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
ISC_PLATFORM_HAVESTATNSEC="#undef ISC_PLATFORM_HAVESTATNSEC" ISC_PLATFORM_HAVESTATNSEC="#undef ISC_PLATFORM_HAVESTATNSEC"
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -20240,7 +20247,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
esac esac
;; ;;
no) no)
have_stdatomic=no have_stdatomic=no
ISC_PLATFORM_HAVESTDATOMIC="#undef ISC_PLATFORM_HAVESTDATOMIC" ISC_PLATFORM_HAVESTDATOMIC="#undef ISC_PLATFORM_HAVESTDATOMIC"
use_atomic=no use_atomic=no
arch=noatomic arch=noatomic
@@ -20525,7 +20532,7 @@ int
main () main ()
{ {
return (__builtin_expect(1, 1) ? 1 : 0); return (__builtin_expect(1, 1) ? 1 : 0);
; ;
return 0; return 0;
@@ -20533,14 +20540,14 @@ main ()
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
have_builtin_expect=yes have_builtin_expect=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
else else
have_builtin_expect=no have_builtin_expect=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi fi
@@ -20564,7 +20571,7 @@ int
main () main ()
{ {
return (__builtin_clz(0xff) == 24 ? 1 : 0); return (__builtin_clz(0xff) == 24 ? 1 : 0);
; ;
return 0; return 0;
@@ -20572,14 +20579,14 @@ main ()
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
have_builtin_clz=yes have_builtin_clz=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
else else
have_builtin_clz=no have_builtin_clz=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi fi
@@ -20981,9 +20988,9 @@ else
fi fi
if test "x$enable_dnsrps" != "xno"; then if test "x$enable_dnsrps" != "xno"; then
if test "x$dnsrps_avail" != "xyes"; then if test "x$dnsrps_avail" != "xyes"; then
as_fn_error $? "dlopen and librpz.so needed for DNSRPS" "$LINENO" 5 as_fn_error $? "dlopen and librpz.so needed for DNSRPS" "$LINENO" 5
fi fi
if test "x$dnsrps_lib_open" = "x0"; then if test "x$dnsrps_lib_open" = "x0"; then
as_fn_error $? "dlopen and librpz.so needed for DNSRPS" "$LINENO" 5 as_fn_error $? "dlopen and librpz.so needed for DNSRPS" "$LINENO" 5
fi fi
@@ -22251,7 +22258,7 @@ if test "no" != "$atf"; then
$as_echo "#define ATF_TEST 1" >>confdefs.h $as_echo "#define ATF_TEST 1" >>confdefs.h
STD_CINCLUDES="$STD_CINCLUDES -I$atf/include" STD_CINCLUDES="$STD_CINCLUDES -I$atf/include"
STD_CDEFINES="$STD_CDEFINES -DNS_HOOKS_ENABLE=1" STD_CDEFINES="$STD_CDEFINES -DNS_HOOKS_ENABLE=1"
ATFBIN="$atf/bin" ATFBIN="$atf/bin"
ATFLIBS="-L$atf/lib -latf-c" ATFLIBS="-L$atf/lib -latf-c"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exp in -lm" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exp in -lm" >&5
@@ -26196,9 +26203,9 @@ yes)
then then
if test "yes" = "$silent" if test "yes" = "$silent"
then then
make clean > /dev/null make clean > /dev/null
else else
make clean make clean
fi fi
fi fi
;; ;;
@@ -26216,84 +26223,84 @@ report() {
echo "-------------------------------------------------------------------------------" echo "-------------------------------------------------------------------------------"
echo "Optional features enabled:" echo "Optional features enabled:"
if $use_threads; then if $use_threads; then
echo " Multiprocessing support (--enable-threads)" echo " Multiprocessing support (--enable-threads)"
if test "yes" = "$enable_full_report" -o "standard" = "$locktype"; then if test "yes" = "$enable_full_report" -o "standard" = "$locktype"; then
echo " Mutex lock type: $locktype" echo " Mutex lock type: $locktype"
fi fi
fi fi
test "large" = "$use_tuning" && echo " Large-system tuning (--with-tuning)" test "large" = "$use_tuning" && echo " Large-system tuning (--with-tuning)"
test "no" = "$use_dnstap" || \ test "no" = "$use_dnstap" || \
echo " Allow 'dnstap' packet logging (--enable-dnstap)" echo " Allow 'dnstap' packet logging (--enable-dnstap)"
test "no" = "$use_geoip" || echo " GeoIP access control (--with-geoip)" test "no" = "$use_geoip" || echo " GeoIP access control (--with-geoip)"
test "no" = "$use_gssapi" || echo " GSS-API (--with-gssapi)" test "no" = "$use_gssapi" || echo " GSS-API (--with-gssapi)"
if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then
echo " Algorithm: $with_cc_alg" echo " Algorithm: $with_cc_alg"
fi fi
# these lines are only printed if run with --enable-full-report # these lines are only printed if run with --enable-full-report
if test "yes" = "$enable_full_report"; then if test "yes" = "$enable_full_report"; then
test "no" = "$enable_ipv6" -o "no" = "$found_ipv6" || \ test "no" = "$enable_ipv6" -o "no" = "$found_ipv6" || \
echo " IPv6 support (--enable-ipv6)" echo " IPv6 support (--enable-ipv6)"
test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \ test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \
echo " OpenSSL cryptography/DNSSEC (--with-openssl)" echo " OpenSSL cryptography/DNSSEC (--with-openssl)"
test "no" = "$want_crypto_rand" || \ test "no" = "$want_crypto_rand" || \
echo " Crypto provider entropy source (--enable-crypto-rand)" echo " Crypto provider entropy source (--enable-crypto-rand)"
test "X$PYTHON" = "X" || echo " Python tools (--with-python)" test "X$PYTHON" = "X" || echo " Python tools (--with-python)"
test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)" test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)"
test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)" test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)"
test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)" test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)"
test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)" test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
fi fi
if test "no" != "$use_pkcs11"; then if test "no" != "$use_pkcs11"; then
if test "yes" = "$want_native_pkcs11"; then if test "yes" = "$want_native_pkcs11"; then
echo " Native PKCS#11/Cryptoki support (--enable-native-pkcs11)" echo " Native PKCS#11/Cryptoki support (--enable-native-pkcs11)"
else else
echo " PKCS#11/Cryptoki support using OpenSSL (--with-pkcs11)" echo " PKCS#11/Cryptoki support using OpenSSL (--with-pkcs11)"
fi fi
echo " Provider library: $PKCS11_PROVIDER" echo " Provider library: $PKCS11_PROVIDER"
fi fi
if test "yes" = "$OPENSSL_GOST" -o "yes" = "$PKCS11_GOST"; then if test "yes" = "$OPENSSL_GOST" -o "yes" = "$PKCS11_GOST"; then
echo " GOST algorithm support (encoding: $gosttype) (--with-gost)" echo " GOST algorithm support (encoding: $gosttype) (--with-gost)"
fi fi
test "yes" = "$OPENSSL_ECDSA" -o "$PKCS11_ECDSA" && \ test "yes" = "$OPENSSL_ECDSA" -o "$PKCS11_ECDSA" && \
echo " ECDSA algorithm support (--with-ecdsa)" echo " ECDSA algorithm support (--with-ecdsa)"
test "yes" = "$OPENSSL_ED25519" -o "$PKCS11_ED25519" && \ test "yes" = "$OPENSSL_ED25519" -o "$PKCS11_ED25519" && \
echo " EDDSA algorithm support (--with-eddsa)" echo " EDDSA algorithm support (--with-eddsa)"
test "yes" = "$enable_dnsrps" && \ test "yes" = "$enable_dnsrps" && \
echo " DNS Response Policy Service interface (--enable-dnsrps)" echo " DNS Response Policy Service interface (--enable-dnsrps)"
test "yes" = "$enable_fixed" && \ test "yes" = "$enable_fixed" && \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)" echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "yes" = "$enable_seccomp" && \ test "yes" = "$enable_seccomp" && \
echo " Use libseccomp system call filtering (--enable-seccomp)" echo " Use libseccomp system call filtering (--enable-seccomp)"
test "yes" = "$want_backtrace" && \ test "yes" = "$want_backtrace" && \
echo " Print backtrace on crash (--enable-backtrace)" echo " Print backtrace on crash (--enable-backtrace)"
test "minimal" = "$want_symtable" && \ test "minimal" = "$want_symtable" && \
echo " Use symbol table for backtrace, named only (--enable-symtable)" echo " Use symbol table for backtrace, named only (--enable-symtable)"
test "yes" = "$want_symtable" -o "all" = "$want_symtable" && \ test "yes" = "$want_symtable" -o "all" = "$want_symtable" && \
echo " Use symbol table for backtrace, all binaries (--enable-symtable=all)" echo " Use symbol table for backtrace, all binaries (--enable-symtable=all)"
test "no" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)" test "no" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)"
test "yes" = "$want_querytrace" && \ test "yes" = "$want_querytrace" && \
echo " Very verbose query trace logging (--enable-querytrace)" echo " Very verbose query trace logging (--enable-querytrace)"
test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)" test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)"
echo " Cryptographic library for DNSSEC: $CRYPTOLIB" echo " Cryptographic library for DNSSEC: $CRYPTOLIB"
echo " Dynamically loadable zone (DLZ) drivers:" echo " Dynamically loadable zone (DLZ) drivers:"
test "no" = "$use_dlz_bdb" || \ test "no" = "$use_dlz_bdb" || \
echo " Berkeley DB (--with-dlz-bdb)" echo " Berkeley DB (--with-dlz-bdb)"
test "no" = "$use_dlz_ldap" || \ test "no" = "$use_dlz_ldap" || \
echo " LDAP (--with-dlz-ldap)" echo " LDAP (--with-dlz-ldap)"
test "no" = "$use_dlz_mysql" || \ test "no" = "$use_dlz_mysql" || \
echo " MySQL (--with-dlz-mysql)" echo " MySQL (--with-dlz-mysql)"
test "no" = "$use_dlz_odbc" || \ test "no" = "$use_dlz_odbc" || \
echo " ODBC (--with-dlz-odbc)" echo " ODBC (--with-dlz-odbc)"
test "no" = "$use_dlz_postgres" || \ test "no" = "$use_dlz_postgres" || \
echo " Postgres (--with-dlz-postgres)" echo " Postgres (--with-dlz-postgres)"
test "no" = "$use_dlz_filesystem" || \ test "no" = "$use_dlz_filesystem" || \
echo " Filesystem (--with-dlz-filesystem)" echo " Filesystem (--with-dlz-filesystem)"
test "no" = "$use_dlz_stub" || \ test "no" = "$use_dlz_stub" || \
echo " Stub (--with-dlz-stub)" echo " Stub (--with-dlz-stub)"
test "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" = "no no no no no no no" && echo " None" test "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" = "no no no no no no no" && echo " None"
echo "-------------------------------------------------------------------------------" echo "-------------------------------------------------------------------------------"
@@ -26301,43 +26308,43 @@ report() {
echo "Features disabled or unavailable on this platform:" echo "Features disabled or unavailable on this platform:"
$use_threads || echo " Multiprocessing support (--enable-threads)" $use_threads || echo " Multiprocessing support (--enable-threads)"
test "no" = "$enable_ipv6" -o "no" = "$found_ipv6" && \ test "no" = "$enable_ipv6" -o "no" = "$found_ipv6" && \
echo " IPv6 support (--enable-ipv6)" echo " IPv6 support (--enable-ipv6)"
test "large" = "$use_tuning" || echo " Large-system tuning (--with-tuning)" test "large" = "$use_tuning" || echo " Large-system tuning (--with-tuning)"
test "no" = "$use_dnstap" && \ test "no" = "$use_dnstap" && \
echo " Allow 'dnstap' packet logging (--enable-dnstap)" echo " Allow 'dnstap' packet logging (--enable-dnstap)"
test "no" = "$use_geoip" && echo " GeoIP access control (--with-geoip)" test "no" = "$use_geoip" && echo " GeoIP access control (--with-geoip)"
test "no" = "$use_gssapi" && echo " GSS-API (--with-gssapi)" test "no" = "$use_gssapi" && echo " GSS-API (--with-gssapi)"
test "no" = "$enable_dnsrps" && \ test "no" = "$enable_dnsrps" && \
echo " DNS Response Policy Service interface (--enable-dnsrps)" echo " DNS Response Policy Service interface (--enable-dnsrps)"
test "yes" = "$enable_fixed" || \ test "yes" = "$enable_fixed" || \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)" echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
if test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" if test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11"
then then
echo " OpenSSL cryptography/DNSSEC (--with-openssl)" echo " OpenSSL cryptography/DNSSEC (--with-openssl)"
elif test "no" = "$use_pkcs11"; then elif test "no" = "$use_pkcs11"; then
echo " PKCS#11/Cryptoki support (--with-pkcs11)" echo " PKCS#11/Cryptoki support (--with-pkcs11)"
fi fi
test "yes" = "$want_native_pkcs11" || test "yes" = "$want_native_pkcs11" ||
echo " Native PKCS#11/Cryptoki support (--enable-native-pkcs11)" echo " Native PKCS#11/Cryptoki support (--enable-native-pkcs11)"
test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_GOST" -o "yes" = "$PKCS11_GOST" || \ test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_GOST" -o "yes" = "$PKCS11_GOST" || \
echo " GOST algorithm support (--with-gost)" echo " GOST algorithm support (--with-gost)"
test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ECDSA" -o "yes" = "$PKCS11_ECDSA" || \ test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ECDSA" -o "yes" = "$PKCS11_ECDSA" || \
echo " ECDSA algorithm support (--with-ecdsa)" echo " ECDSA algorithm support (--with-ecdsa)"
test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \ test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \
echo " EDDSA algorithm support (--with-eddsa)" echo " EDDSA algorithm support (--with-eddsa)"
test "yes" = "$want_crypto_rand" || \ test "yes" = "$want_crypto_rand" || \
echo " Crypto provider entropy source (--enable-crypto-rand)" echo " Crypto provider entropy source (--enable-crypto-rand)"
test "yes" = "$enable_seccomp" || \ test "yes" = "$enable_seccomp" || \
echo " Use libseccomp system call filtering (--enable-seccomp)" echo " Use libseccomp system call filtering (--enable-seccomp)"
test "yes" = "$want_backtrace" || \ test "yes" = "$want_backtrace" || \
echo " Print backtrace on crash (--enable-backtrace)" echo " Print backtrace on crash (--enable-backtrace)"
test "yes" = "$want_querytrace" || \ test "yes" = "$want_querytrace" || \
echo " Very verbose query trace logging (--enable-querytrace)" echo " Very verbose query trace logging (--enable-querytrace)"
test "yes" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)" test "yes" = "$use_libtool" || echo " Use GNU libtool (--with-libtool)"
test "no" = "$atf" && echo " Automated Testing Framework (--with-atf)" test "no" = "$atf" && echo " Automated Testing Framework (--with-atf)"
@@ -26356,20 +26363,20 @@ report() {
if test "X$ac_unrecognized_opts" != "X"; then if test "X$ac_unrecognized_opts" != "X"; then
echo echo
echo "Unrecognized options:" echo "Unrecognized options:"
echo " $ac_unrecognized_opts" echo " $ac_unrecognized_opts"
fi fi
if test "yes" != "$enable_full_report"; then if test "yes" != "$enable_full_report"; then
echo "-------------------------------------------------------------------------------" echo "-------------------------------------------------------------------------------"
echo "For more detail, use --enable-full-report." echo "For more detail, use --enable-full-report."
fi fi
echo "===============================================================================" echo "==============================================================================="
} }
if test "yes" != "$silent"; then if test "yes" != "$silent"; then
report report
fi fi
if test "X$CRYPTO" = "X"; then if test "X$CRYPTO" = "X"; then

File diff suppressed because it is too large Load Diff

View File

@@ -57,8 +57,9 @@ AC_DEFUN(DLZ_ADD_DRIVER, [
AC_MSG_CHECKING(for Postgres DLZ driver) AC_MSG_CHECKING(for Postgres DLZ driver)
AC_ARG_WITH(dlz_postgres, AC_ARG_WITH(dlz_postgres,
[ --with-dlz-postgres[=PATH] Build with Postgres DLZ driver [yes|no|path]. AS_HELP_STRING([--with-dlz-postgres[=PATH]],
(Required to use Postgres with DLZ)], [Build with Postgres DLZ driver [yes|no|path].
(Required to use Postgres with DLZ)]),
use_dlz_postgres="$withval", use_dlz_postgres="no") use_dlz_postgres="$withval", use_dlz_postgres="no")
if test "$use_dlz_postgres" != "no" if test "$use_dlz_postgres" != "no"
@@ -126,8 +127,9 @@ esac
AC_MSG_CHECKING(for MySQL DLZ driver) AC_MSG_CHECKING(for MySQL DLZ driver)
AC_ARG_WITH(dlz_mysql, AC_ARG_WITH(dlz_mysql,
[ --with-dlz-mysql[=PATH] Build with MySQL DLZ driver [yes|no|path]. AS_HELP_STRING([--with-dlz-mysql[=PATH]],
(Required to use MySQL with DLZ)], [Build with MySQL DLZ driver [yes|no|path].
(Required to use MySQL with DLZ)]),
use_dlz_mysql="$withval", use_dlz_mysql="no") use_dlz_mysql="$withval", use_dlz_mysql="no")
AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config) AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config)
@@ -232,8 +234,9 @@ esac
AC_MSG_CHECKING(for Berkeley DB DLZ driver...) AC_MSG_CHECKING(for Berkeley DB DLZ driver...)
AC_ARG_WITH(dlz_bdb, AC_ARG_WITH(dlz_bdb,
[ --with-dlz-bdb[=PATH] Build with Berkeley DB DLZ driver [yes|no|path]. AS_HELP_STRING([--with-dlz-bdb[=PATH]],
(Required to use Berkeley DB with DLZ)], [Build with Berkeley DB DLZ driver [yes|no|path].
(Required to use Berkeley DB with DLZ)]),
use_dlz_bdb="$withval", use_dlz_bdb="no") use_dlz_bdb="$withval", use_dlz_bdb="no")
case "$use_dlz_bdb" in case "$use_dlz_bdb" in
@@ -356,8 +359,9 @@ esac
AC_MSG_CHECKING(for file system DLZ driver) AC_MSG_CHECKING(for file system DLZ driver)
AC_ARG_WITH(dlz_filesystem, AC_ARG_WITH(dlz_filesystem,
[ --with-dlz-filesystem[=ARG] Build with filesystem DLZ driver [yes|no]. AS_HELP_STRING([--with-dlz-filesystem[=ARG]],
(Required to use file system driver with DLZ)], [Build with filesystem DLZ driver [yes|no].
(Required to use file system driver with DLZ)]),
use_dlz_filesystem="$withval", use_dlz_filesystem="no") use_dlz_filesystem="$withval", use_dlz_filesystem="no")
case "$use_dlz_filesystem" in case "$use_dlz_filesystem" in
@@ -378,8 +382,9 @@ esac
AC_MSG_CHECKING(for LDAP DLZ driver) AC_MSG_CHECKING(for LDAP DLZ driver)
AC_ARG_WITH(dlz_ldap, AC_ARG_WITH(dlz_ldap,
[ --with-dlz-ldap[=PATH] Build with LDAP DLZ driver [yes|no|path]. AS_HELP_STRING([--with-dlz-ldap[=PATH]],
(Required to use LDAP with DLZ)], [Build with LDAP DLZ driver [yes|no|path].
(Required to use LDAP with DLZ)]),
use_dlz_ldap="$withval", use_dlz_ldap="no") use_dlz_ldap="$withval", use_dlz_ldap="no")
if test "$use_dlz_ldap" = "yes" if test "$use_dlz_ldap" = "yes"
@@ -424,8 +429,9 @@ esac
AC_MSG_CHECKING(for ODBC DLZ driver) AC_MSG_CHECKING(for ODBC DLZ driver)
AC_ARG_WITH(dlz_odbc, AC_ARG_WITH(dlz_odbc,
[ --with-dlz-odbc[=PATH] Build with ODBC DLZ driver [yes|no|path]. AS_HELP_STRING([--with-dlz-odbc[=PATH]],
(Required to use ODBC with DLZ)], [Build with ODBC DLZ driver [yes|no|path].
(Required to use ODBC with DLZ)]),
use_dlz_odbc="$withval", use_dlz_odbc="no") use_dlz_odbc="$withval", use_dlz_odbc="no")
if test "$use_dlz_odbc" = "yes" if test "$use_dlz_odbc" = "yes"
@@ -481,8 +487,9 @@ esac
AC_MSG_CHECKING(for stub DLZ driver) AC_MSG_CHECKING(for stub DLZ driver)
AC_ARG_WITH(dlz_stub, AC_ARG_WITH(dlz_stub,
[ --with-dlz-stub[=ARG] Build with stub DLZ driver [yes|no]. AS_HELP_STRING([--with-dlz-stub[=ARG]],
(Required to use stub driver with DLZ)], [Build with stub DLZ driver [yes|no].
(Required to use stub driver with DLZ)]),
use_dlz_stub="$withval", use_dlz_stub="no") use_dlz_stub="$withval", use_dlz_stub="no")
case "$use_dlz_stub" in case "$use_dlz_stub" in