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

(cherry picked from commit 6bbbf12936)
This commit is contained in:
Mark Andrews
2017-11-13 12:39:48 +11:00
parent c799c10ffe
commit e3286b980e
4 changed files with 301 additions and 259 deletions
+2
View File
@@ -1,3 +1,5 @@
4814. [cleanup] Use AS_HELP_STRING for consistent help text. [RT #46521]
4812. [bug] Minor improvements to stability and consistency of code
handling managed keys. [RT #46468]
Vendored
+98 -95
View File
@@ -1669,9 +1669,9 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-libbind deprecated
--enable-warn-shadow turn on -Wshadow when compiling
--enable-warn-error turn on -Werror when compiling
--enable-libbind deprecated
--enable-warn-shadow turn on -Wshadow when compiling
--enable-warn-error turn on -Werror when compiling
--enable-developer enable developer build settings
--enable-newstats use the new statistics
--enable-rrl use DNS Response Rate Limiting
@@ -1682,28 +1682,26 @@ Optional Features:
Check OpenSSL Version [default=yes]
--enable-openssl-hash use OpenSSL for hash functions [default=no]
--enable-threads enable multithreading
--enable-largefile 64-bit file support
--enable-largefile 64-bit file support
--enable-backtrace log stack backtrace on abort [default=yes]
--enable-symtable use internal symbol table for backtrace
[all|minimal(default)|none]
[all|minimal(default)|none]
--enable-exportlib build exportable library (GNU make required)
[default=no]
--enable-ipv6 use IPv6 default=autodetect
--enable-getifaddrs Enable the use of getifaddrs() [yes|no].
--enable-ipv6 use IPv6 [default=autodetect]
--enable-getifaddrs enable the use of getifaddrs() [yes|no].
--disable-isc-spnego use SPNEGO from GSSAPI library
--disable-chroot disable chroot
--disable-linux-caps disable linux capabilities
--enable-atomic enable machine specific atomic operations
[default=autodetect]
--enable-fixed-rrset enable fixed rrset ordering
[default=no]
--disable-rpz-nsip disable rpz-nsip rules [default=enabled]
--disable-rpz-nsdname disable rpz-nsdname rules [default=enabled]
--disable-linux-caps disable linux capabilities
--enable-atomic enable machine specific atomic operations
[default=autodetect]
--enable-fixed-rrset enable fixed rrset ordering [default=no]
--disable-rpz-nsip disable rpz nsip rules [default=enabled]
--disable-rpz-nsdname disable rpz nsdname rules [default=enabled]
--enable-fetchlimit enable recursive fetch limits [default=no]
--enable-filter-aaaa enable filtering of AAAA records over IPv4
[default=no]
--enable-filter-aaaa enable filtering of AAAA records [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:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1713,53 +1711,58 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
--with-python=PATH Specify path to python interpreter
--with-python=PATH specify path to python interpreter
--with-python-install-dir=PATH
installation directory for Python modules
--with-openssl=PATH Build with OpenSSL yes|no|path.
(Required for DNSSEC)
--with-openssl=PATH Build with OpenSSL [yes|no|path]. (Required for
DNSSEC)
--with-ecdsa OpenSSL ECDSA
--with-gost OpenSSL GOST
--with-eddsa OpenSSL EDDSA
--with-pkcs11=PATH Build with PKCS11 support yes|no|path
(PATH is for the PKCS11 provider)
--with-gssapi=[PATH|[/path/]krb5-config] Specify path for system-supplied GSSAPI [default=yes]
--with-pkcs11=PATH Build with PKCS11 support [yes|no|path] (PATH is for
the PKCS11 provider)
--with-gssapi=PATH|/path/krb5-config
Specify path for system-supplied GSSAPI
[default=yes]
--with-randomdev=PATH Specify path for random device
--with-libxml2=PATH Build with libxml2 library yes|no|path
--with-libxml2=PATH build with libxml2 library [yes|no|path]
--with-purify=PATH use Rational purify
--with-libtool use GNU libtool
--with-gperftools-profiler use gperftools CPU profiler
--with-gperftools-profiler
use gperftools CPU profiler
--with-export-libdir=PATH
installation directory for the export library
[EPREFIX/lib/bind9]
installation directory for the export library
[[EPREFIX/lib/bind9]]
--with-export-includedir=PATH
installation directory for the header files of the
export library [PREFIX/include/bind9]
--with-kame=PATH use Kame IPv6 default path /usr/local/v6
--with-readline=LIBSPEC specify readline library default auto
installation directory for the header files of the
export library [[PREFIX/include/bind9]]
--with-kame=PATH use Kame IPv6 [default path /usr/local/v6]
--with-readline=LIBSPEC specify readline library [default auto]
--with-docbook-xsl=PATH Specify path for Docbook-XSL stylesheets
--with-idn=MPREFIX enable IDN support using idnkit default PREFIX
--with-libiconv=IPREFIX GNU libiconv are in IPREFIX default PREFIX
--with-iconv=LIBSPEC specify iconv library default -liconv
--with-docbook-xsl=PATH specify path for Docbook-XSL stylesheets
--with-idn=MPREFIX enable IDN support using idnkit [default PREFIX]
--with-libiconv=IPREFIX GNU libiconv are in IPREFIX [default PREFIX]
--with-iconv=LIBSPEC specify iconv library [default -liconv]
--with-idnlib=ARG specify libidnkit
--with-atf=ARG Automated Test Framework support
--with-dlopen=ARG Support dynamically loadable DLZ drivers
--with-dlz-postgres=PATH Build with Postgres DLZ driver yes|no|path.
(Required to use Postgres with DLZ)
--with-dlz-mysql=PATH Build with MySQL DLZ driver yes|no|path.
(Required to use MySQL with DLZ)
--with-dlz-bdb=PATH Build with Berkeley DB DLZ driver yes|no|path.
(Required to use Berkeley DB with DLZ)
--with-dlz-filesystem=ARG Build with filesystem DLZ driver yes|no.
(Required to use file system driver with DLZ)
--with-dlz-ldap=PATH Build with LDAP DLZ driver yes|no|path.
(Required to use LDAP with DLZ)
--with-dlz-odbc=PATH Build with ODBC DLZ driver yes|no|path.
(Required 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-atf support Automated Test Framework
--with-dlopen=ARG support dynamically loadable DLZ drivers
--with-dlz-postgres=PATH
Build with Postgres DLZ driver [yes|no|path].
(Required to use Postgres with DLZ)
--with-dlz-mysql=PATH Build with MySQL DLZ driver [yes|no|path]. (Required
to use MySQL with DLZ)
--with-dlz-bdb=PATH Build with Berkeley DB DLZ driver [yes|no|path].
(Required to use Berkeley DB with DLZ)
--with-dlz-filesystem=ARG
Build with filesystem DLZ driver [yes|no]. (Required
to use file system driver with DLZ)
--with-dlz-ldap=PATH Build with LDAP DLZ driver [yes|no|path]. (Required
to use LDAP with DLZ)
--with-dlz-odbc=PATH Build with ODBC DLZ driver [yes|no|path]. (Required
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]
Some influential environment variables:
CC C compiler command
@@ -11746,12 +11749,12 @@ $as_echo_n "checking python2 version >= 2.7 or python3 version >= 3.2... " >&6;
if ${PYTHON:-false} -c "$testminvers"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
unset ac_cv_path_PYTHON
unset PYTHON
continue
unset ac_cv_path_PYTHON
unset PYTHON
continue
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'argparse'" >&5
$as_echo_n "checking python module 'argparse'... " >&6; }
@@ -13162,12 +13165,12 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define HAVE_UNAME 1" >>confdefs.h
$as_echo "#define HAVE_UNAME 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$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;}
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -17809,10 +17812,10 @@ fi
ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
if test "x$ac_cv_func_strlcpy" = xyes; then :
ISC_PLATFORM_NEEDSTRLCPY="#undef ISC_PLATFORM_NEEDSTRLCPY"
LWRES_PLATFORM_NEEDSTRLCPY="#undef LWRES_PLATFORM_NEEDSTRLCPY"
LWRES_PLATFORM_NEEDSTRLCPY="#undef LWRES_PLATFORM_NEEDSTRLCPY"
else
ISC_PLATFORM_NEEDSTRLCPY="#define ISC_PLATFORM_NEEDSTRLCPY 1"
LWRES_PLATFORM_NEEDSTRLCPY="#define LWRES_PLATFORM_NEEDSTRLCPY 1"
LWRES_PLATFORM_NEEDSTRLCPY="#define LWRES_PLATFORM_NEEDSTRLCPY 1"
fi
@@ -18037,11 +18040,11 @@ else
#include <stdio.h>
main() {
size_t j = 0;
char buf[100];
buf[0] = 0;
sprintf(buf, "%zu", j);
exit(strcmp(buf, "0") != 0);
size_t j = 0;
char buf[100];
buf[0] = 0;
sprintf(buf, "%zu", j);
exit(strcmp(buf, "0") != 0);
}
_ACEOF
@@ -18053,9 +18056,9 @@ else
$as_echo "no" >&6; }
ISC_PRINT_OBJS="print.$O"
ISC_PRINT_SRCS="print.c"
ISC_PLATFORM_NEEDPRINTF='#define ISC_PLATFORM_NEEDPRINTF 1'
ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1'
ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1'
ISC_PLATFORM_NEEDPRINTF='#define ISC_PLATFORM_NEEDPRINTF 1'
ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1'
ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1'
ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1"
LWRES_PLATFORM_NEEDVSNPRINTF="#define LWRES_PLATFORM_NEEDVSNPRINTF 1"
fi
@@ -18391,11 +18394,11 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
ISC_PLATFORM_HAVESTATNSEC="#define ISC_PLATFORM_HAVESTATNSEC 1"
ISC_PLATFORM_HAVESTATNSEC="#define ISC_PLATFORM_HAVESTATNSEC 1"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
ISC_PLATFORM_HAVESTATNSEC="#undef ISC_PLATFORM_HAVESTATNSEC"
ISC_PLATFORM_HAVESTATNSEC="#undef ISC_PLATFORM_HAVESTATNSEC"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -18898,7 +18901,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
esac
;;
no)
have_stdatomic=no
have_stdatomic=no
ISC_PLATFORM_HAVESTDATOMIC="#undef ISC_PLATFORM_HAVESTDATOMIC"
use_atomic=no
arch=noatomic
@@ -19216,7 +19219,7 @@ int
main ()
{
return (__builtin_expect(1, 1) ? 1 : 0);
return (__builtin_expect(1, 1) ? 1 : 0);
;
return 0;
@@ -19224,14 +19227,14 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
have_builtin_expect=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
have_builtin_expect=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
have_builtin_expect=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
have_builtin_expect=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -23999,9 +24002,9 @@ yes)
then
if test "yes" = "$silent"
then
make clean > /dev/null
else
make clean
make clean > /dev/null
else
make clean
fi
fi
;;
@@ -24029,17 +24032,17 @@ report() {
test "yes" = "$enable_newstats" && \
echo " New statistics (--enable-newstats)"
test "yes" = "$enable_fixed" && \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "yes" = "$enable_filter" && \
echo " AAAA filtering (--enable-filter-aaaa)"
test "yes" = "$want_backtrace" && \
echo " Print backtrace on crash (--enable-backtrace)"
echo " Print backtrace on crash (--enable-backtrace)"
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" && \
echo " Use symbol table for backtrace, all binaries (--enable-symtable=all)"
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)"
# these lines are only printed if run with --enable-full-report
@@ -24060,17 +24063,17 @@ report() {
echo " Dynamically loadable zone (DLZ) drivers:"
test "no" = "$use_dlz_bdb" || \
echo " Berkeley DB (--with-dlz-bdb)"
echo " Berkeley DB (--with-dlz-bdb)"
test "no" = "$use_dlz_ldap" || \
echo " LDAP (--with-dlz-ldap)"
echo " LDAP (--with-dlz-ldap)"
test "no" = "$use_dlz_mysql" || \
echo " MySQL (--with-dlz-mysql)"
echo " MySQL (--with-dlz-mysql)"
test "no" = "$use_dlz_odbc" || \
echo " ODBC (--with-dlz-odbc)"
echo " ODBC (--with-dlz-odbc)"
test "no" = "$use_dlz_postgres" || \
echo " Postgres (--with-dlz-postgres)"
echo " Postgres (--with-dlz-postgres)"
test "no" = "$use_dlz_filesystem" || \
echo " Filesystem (--with-dlz-filesystem)"
echo " Filesystem (--with-dlz-filesystem)"
test "no" = "$use_dlz_stub" || \
echo " Stub (--with-dlz-stub)"
test "no no no no no no no" = "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" && echo " None"
@@ -24091,7 +24094,7 @@ report() {
test "yes" = "$enable_fixed" || \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "yes" = "$want_backtrace" || \
echo " Print backtrace on crash (--enable-backtrace)"
echo " Print backtrace on crash (--enable-backtrace)"
test "yes" = "$want_querytrace" || \
echo " Very verbose query trace logging (--enable-querytrace)"
test "no" = "$atf" && echo " Automated Testing Framework (--with-atf)"
@@ -24113,9 +24116,9 @@ report() {
echo " localstatedir: $localstatedir"
if test "X$ac_unrecognized_opts" != "X"; then
echo
echo "Unrecognized options:"
echo " $ac_unrecognized_opts"
echo
echo "Unrecognized options:"
echo " $ac_unrecognized_opts"
fi
if test "yes" != "$enable_full_report"; then
@@ -24126,7 +24129,7 @@ report() {
}
if test "yes" != "$silent"; then
report
report
fi
if test "X$USE_OPENSSL" = "X"; then
+180 -150
View File
@@ -52,7 +52,7 @@ AC_SUBST(CCNOOPT)
AC_SUBST(BACKTRACECFLAGS)
# Warn if the user specified libbind, which is now deprecated
AC_ARG_ENABLE(libbind, [ --enable-libbind deprecated])
AC_ARG_ENABLE(libbind, AS_HELP_STRING([--enable-libbind], [deprecated]))
case "$enable_libbind" in
yes)
@@ -63,11 +63,17 @@ It is available from http://www.isc.org as a separate download.])
;;
esac
AC_ARG_ENABLE(warn_shadow, [ --enable-warn-shadow turn on -Wshadow when compiling])
AC_ARG_ENABLE(warn_shadow,
AS_HELP_STRING([--enable-warn-shadow],
[turn on -Wshadow when compiling]))
AC_ARG_ENABLE(warn_error, [ --enable-warn-error turn on -Werror when compiling])
AC_ARG_ENABLE(warn_error,
AS_HELP_STRING([--enable-warn-error],
[turn on -Werror when compiling]))
AC_ARG_ENABLE(developer, [ --enable-developer enable developer build settings])
AC_ARG_ENABLE(developer,
AS_HELP_STRING([--enable-developer],
[enable developer build settings]))
XTARGETS=
case "$enable_developer" in
yes)
@@ -155,10 +161,11 @@ AC_SUBST(PERL)
# If python is unavailable, we simply don't build those.
#
AC_ARG_WITH(python,
[ --with-python=PATH Specify path to python interpreter],
use_python="$withval", use_python="unspec")
AS_HELP_STRING([--with-python=PATH],
[specify path to python interpreter]),
use_python="$withval", use_python="unspec")
AC_ARG_WITH(python-install-dir,
AC_HELP_STRING([--with-python-install-dir=PATH],
AS_HELP_STRING([--with-python-install-dir=PATH],
[installation directory for Python modules]),
use_python_install_dir="$withval", use_python_install_dir="unspec")
@@ -188,11 +195,11 @@ case "$use_python" in
AC_MSG_CHECKING([python2 version >= 2.7 or python3 version >= 3.2])
if ${PYTHON:-false} -c "$testminvers"; then
AC_MSG_RESULT([found])
else
AC_MSG_RESULT([not found])
unset ac_cv_path_PYTHON
unset PYTHON
continue
else
AC_MSG_RESULT([not found])
unset ac_cv_path_PYTHON
unset PYTHON
continue
fi
AC_MSG_CHECKING([python module 'argparse'])
if ${PYTHON:-false} -c "$testargparse"; then
@@ -524,9 +531,9 @@ printf("running on %s %s %s for %s\n",
uts.sysname, uts.release, uts.version, uts.machine);
],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNAME)],
[AC_MSG_RESULT(no)
AC_MSG_WARN([uname is not correctly supported])])
AC_DEFINE(HAVE_UNAME)],
[AC_MSG_RESULT(no)
AC_MSG_WARN([uname is not correctly supported])])
#
# check for GCC noreturn attribute
@@ -598,7 +605,8 @@ AC_SUBST(RRLLINKSRCS)
# check if we have kqueue
#
AC_ARG_ENABLE(kqueue,
[ --enable-kqueue use BSD kqueue when available [[default=yes]]],
AS_HELP_STRING([--enable-kqueue],
[use BSD kqueue when available [default=yes]]),
want_kqueue="$enableval", want_kqueue="yes")
case $want_kqueue in
yes)
@@ -623,7 +631,8 @@ AC_SUBST(ISC_PLATFORM_HAVEKQUEUE)
# so we need to try running the code, not just test its existence.
#
AC_ARG_ENABLE(epoll,
[ --enable-epoll use Linux epoll when available [[default=auto]]],
AS_HELP_STRING([--enable-epoll],
[use Linux epoll when available [default=auto]]),
want_epoll="$enableval", want_epoll="auto")
case $want_epoll in
auto)
@@ -656,7 +665,8 @@ AC_SUBST(ISC_PLATFORM_HAVEEPOLL)
# check if we support /dev/poll
#
AC_ARG_ENABLE(devpoll,
[ --enable-devpoll use /dev/poll when available [[default=yes]]],
AS_HELP_STRING([--enable-devpoll],
[use /dev/poll when available [default=yes]]),
want_devpoll="$enableval", want_devpoll="yes")
case $want_devpoll in
yes)
@@ -723,9 +733,10 @@ AC_C_BIGENDIAN
OPENSSL_WARNING=
AC_MSG_CHECKING(for OpenSSL library)
AC_ARG_WITH(openssl,
[ --with-openssl[=PATH] Build with OpenSSL [yes|no|path].
(Required for DNSSEC)],
use_openssl="$withval", use_openssl="auto")
AS_HELP_STRING([--with-openssl[=PATH]],
[Build with OpenSSL [yes|no|path]. (Required
for DNSSEC)]),
use_openssl="$withval", use_openssl="auto")
openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
if test "auto" = "$use_openssl"
@@ -961,7 +972,7 @@ int main() {
[AC_MSG_RESULT(no)
have_ecdsa="no"],
[AC_MSG_RESULT(using --with-ecdsa)])
AC_ARG_WITH(ecdsa, [ --with-ecdsa OpenSSL ECDSA],
AC_ARG_WITH(ecdsa, AS_HELP_STRING([--with-ecdsa], [OpenSSL ECDSA]),
with_ecdsa="$withval", with_ecdsa="auto")
case "$with_ecdsa" in
yes)
@@ -1018,7 +1029,7 @@ int main() {
[AC_MSG_RESULT(no)
have_gost="no"],
[AC_MSG_RESULT(using --with-gost)])
AC_ARG_WITH(gost, [ --with-gost OpenSSL GOST],
AC_ARG_WITH(gost, AS_HELP_STRING([--with-gost], [ OpenSSL GOST]),
with_gost="$withval", with_gost="auto")
case "$with_gost" in
yes)
@@ -1068,7 +1079,7 @@ int main() {
[AC_MSG_RESULT(no)
have_ed25519="no"],
[AC_MSG_RESULT(using --with-eddsa)])
AC_ARG_WITH(eddsa, [ --with-eddsa OpenSSL EDDSA],
AC_ARG_WITH(eddsa, AS_HELP_STRING([--with-eddsa], [OpenSSL EDDSA]),
with_eddsa="$withval", with_eddsa="auto")
case "$with_eddsa" in
yes)
@@ -1158,9 +1169,10 @@ AC_SUBST(ISC_OPENSSL_INC)
AC_MSG_CHECKING(for PKCS11 support)
AC_ARG_WITH(pkcs11,
[ --with-pkcs11[=PATH] Build with PKCS11 support [yes|no|path]
(PATH is for the PKCS11 provider)],
use_pkcs11="$withval", use_pkcs11="no")
AS_HELP_STRING([--with-pkcs11[=PATH]],
[Build with PKCS11 support [yes|no|path]
(PATH is for the PKCS11 provider)]),
use_pkcs11="$withval", use_pkcs11="no")
case "$use_pkcs11" in
no|'')
@@ -1192,8 +1204,10 @@ AC_SUBST(PKCS11_PROVIDER)
AC_MSG_CHECKING(for GSSAPI library)
AC_ARG_WITH(gssapi,
[ --with-gssapi=[[PATH|[/path/]krb5-config]] Specify path for system-supplied GSSAPI [[default=yes]]],
use_gssapi="$withval", use_gssapi="yes")
AS_HELP_STRING([--with-gssapi=[PATH|[/path/]krb5-config]],
[Specify path for system-supplied GSSAPI
[default=yes]]),
use_gssapi="$withval", use_gssapi="yes")
# first try using krb5-config, if that does not work then fall back to "yes" method.
@@ -1309,7 +1323,7 @@ case "$use_gssapi" in
DNS_GSSAPI_LIBS="-framework Kerberos"
AC_MSG_RESULT(framework)
;;
*)
AC_MSG_RESULT(looking in $use_gssapi/lib)
USE_GSSAPI='-DGSSAPI'
@@ -1470,8 +1484,9 @@ AC_SUBST(DNS_CRYPTO_LIBS)
#
AC_MSG_CHECKING(for random device)
AC_ARG_WITH(randomdev,
[ --with-randomdev=PATH Specify path for random device],
use_randomdev="$withval", use_randomdev="unspec")
AS_HELP_STRING([--with-randomdev=PATH],
[Specify path for random device]),
use_randomdev="$withval", use_randomdev="unspec")
case "$use_randomdev" in
unspec)
@@ -1492,7 +1507,7 @@ case "$use_randomdev" in
AC_CHECK_FILE($devrandom,
AC_DEFINE_UNQUOTED(PATH_RANDOMDEV,
"$devrandom"),)
;;
yes)
AC_MSG_ERROR([--with-randomdev must specify a path])
@@ -1692,8 +1707,9 @@ AC_SUBST(ISC_THREAD_DIR)
#
AC_MSG_CHECKING(for libxml2 library)
AC_ARG_WITH(libxml2,
[ --with-libxml2[=PATH] Build with libxml2 library [yes|no|path]],
use_libxml2="$withval", use_libxml2="auto")
AS_HELP_STRING([--with-libxml2[=PATH]],
[build with libxml2 library [yes|no|path]]),
use_libxml2="$withval", use_libxml2="auto")
case "$use_libxml2" in
no)
@@ -1770,7 +1786,8 @@ fi
#
# Large File
#
AC_ARG_ENABLE(largefile, [ --enable-largefile 64-bit file support],
AC_ARG_ENABLE(largefile,
AS_HELP_STRING([--enable-largefile], [64-bit file support]),
want_largefile="yes", want_largefile="no")
case $want_largefile in
yes)
@@ -1922,8 +1939,8 @@ esac
#
AC_MSG_CHECKING(whether to use purify)
AC_ARG_WITH(purify,
[ --with-purify[=PATH] use Rational purify],
use_purify="$withval", use_purify="no")
AS_HELP_STRING([--with-purify[=PATH]], [use Rational purify]),
use_purify="$withval", use_purify="no")
case "$use_purify" in
no)
@@ -1959,8 +1976,7 @@ esac
AC_SUBST(PURIFY)
AC_ARG_WITH(libtool,
[ --with-libtool use GNU libtool],
AC_ARG_WITH(libtool, AS_HELP_STRING([--with-libtool], [use GNU libtool]),
use_libtool="$withval", use_libtool="no")
case $use_libtool in
@@ -2002,8 +2018,9 @@ AC_SUBST(INSTALL_LIBRARY)
#
AC_MSG_CHECKING(whether to use gperftools profiler)
AC_ARG_WITH(gperftools-profiler,
[ --with-gperftools-profiler use gperftools CPU profiler],
use_profiler="$withval", use_profiler="no")
AS_HELP_STRING([--with-gperftools-profiler],
[use gperftools CPU profiler]),
use_profiler="$withval", use_profiler="no")
case $use_profiler in
yes)
@@ -2022,7 +2039,8 @@ esac
# glibc-compatible backtrace() function.
#
AC_ARG_ENABLE(backtrace,
[ --enable-backtrace log stack backtrace on abort [[default=yes]]],
AS_HELP_STRING([--enable-backtrace],
[log stack backtrace on abort [default=yes]]),
want_backtrace="$enableval", want_backtrace="yes")
case $want_backtrace in
yes)
@@ -2038,9 +2056,10 @@ esac
AC_SUBST(ISC_PLATFORM_USEBACKTRACE)
AC_ARG_ENABLE(symtable,
[ --enable-symtable use internal symbol table for backtrace
[[all|minimal(default)|none]]],
want_symtable="$enableval", want_symtable="minimal")
AS_HELP_STRING([--enable-symtable],
[use internal symbol table for backtrace
[all|minimal(default)|none]]),
want_symtable="$enableval", want_symtable="minimal")
case $want_symtable in
yes|all|minimal) # "yes" is a hidden value equivalent to "minimal"
if test "" = "$PERL"
@@ -2122,20 +2141,20 @@ esac
AC_SUBST(BIND9_CO_RULE)
AC_ARG_WITH(export-libdir,
[ --with-export-libdir[=PATH]
installation directory for the export library
[[EPREFIX/lib/bind9]]],
export_libdir="$withval",)
AS_HELP_STRING([--with-export-libdir[=PATH]],
[installation directory for the export library
[[EPREFIX/lib/bind9]]]),
export_libdir="$withval",)
if test -z "$export_libdir"; then
export_libdir="\${exec_prefix}/lib/bind9/"
fi
AC_SUBST(export_libdir)
AC_ARG_WITH(export-includedir,
[ --with-export-includedir[=PATH]
installation directory for the header files of the
export library [[PREFIX/include/bind9]]],
export_includedir="$withval",)
AS_HELP_STRING([--with-export-includedir[=PATH]],
[installation directory for the header files of the
export library [[PREFIX/include/bind9]]]),
export_includedir="$withval",)
if test -z "$export_includedir"; then
export_includedir="\${prefix}/include/bind9/"
fi
@@ -2150,7 +2169,7 @@ AC_SUBST(export_includedir)
# IPv6
#
AC_ARG_ENABLE(ipv6,
[ --enable-ipv6 use IPv6 [default=autodetect]])
AS_HELP_STRING([--enable-ipv6], [use IPv6 [default=autodetect]]))
case "$enable_ipv6" in
yes|''|autodetect)
@@ -2181,8 +2200,9 @@ AC_TRY_COMPILE([
#
AC_MSG_CHECKING(for Kame IPv6 support)
AC_ARG_WITH(kame,
[ --with-kame[=PATH] use Kame IPv6 [default path /usr/local/v6]],
use_kame="$withval", use_kame="no")
AS_HELP_STRING([--with-kame[=PATH]],
[use Kame IPv6 [default path /usr/local/v6]]),
use_kame="$withval", use_kame="no")
case "$use_kame" in
no)
@@ -2705,8 +2725,9 @@ AC_SUBST(ISC_LWRES_GETNAMEINFOPROTO)
AC_SUBST(ISC_IRS_GETNAMEINFOSOCKLEN)
AC_ARG_ENABLE(getifaddrs,
[ --enable-getifaddrs Enable the use of getifaddrs() [[yes|no]].],
want_getifaddrs="$enableval", want_getifaddrs="yes")
AS_HELP_STRING([--enable-getifaddrs],
[enable the use of getifaddrs() [yes|no].]),
want_getifaddrs="$enableval", want_getifaddrs="yes")
#
# This interface iteration code for getifaddrs() will fall back to using
@@ -2779,9 +2800,9 @@ AC_SUBST(GENRANDOMLIB)
AC_CHECK_FUNC(strlcpy,
[ISC_PLATFORM_NEEDSTRLCPY="#undef ISC_PLATFORM_NEEDSTRLCPY"
LWRES_PLATFORM_NEEDSTRLCPY="#undef LWRES_PLATFORM_NEEDSTRLCPY"],
LWRES_PLATFORM_NEEDSTRLCPY="#undef LWRES_PLATFORM_NEEDSTRLCPY"],
[ISC_PLATFORM_NEEDSTRLCPY="#define ISC_PLATFORM_NEEDSTRLCPY 1"
LWRES_PLATFORM_NEEDSTRLCPY="#define LWRES_PLATFORM_NEEDSTRLCPY 1"])
LWRES_PLATFORM_NEEDSTRLCPY="#define LWRES_PLATFORM_NEEDSTRLCPY 1"])
AC_SUBST(ISC_PLATFORM_NEEDSTRLCPY)
AC_SUBST(LWRES_PLATFORM_NEEDSTRLCPY)
@@ -2797,8 +2818,9 @@ AC_SUBST(ISC_PLATFORM_NEEDSTRCASESTR)
AC_SUBST(READLINE_LIB)
AC_ARG_WITH(readline,
[ --with-readline[=LIBSPEC] specify readline library [default auto]],
use_readline="$withval", use_readline="auto")
AS_HELP_STRING([--with-readline[=LIBSPEC]],
[specify readline library [default auto]]),
use_readline="$withval", use_readline="auto")
case "$use_readline" in
no) ;;
*)
@@ -2885,23 +2907,23 @@ AC_MSG_CHECKING(printf for %z support)
AC_TRY_RUN([
#include <stdio.h>
main() {
size_t j = 0;
char buf[100];
buf[0] = 0;
sprintf(buf, "%zu", j);
exit(strcmp(buf, "0") != 0);
size_t j = 0;
char buf[100];
buf[0] = 0;
sprintf(buf, "%zu", j);
exit(strcmp(buf, "0") != 0);
}
],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
ISC_PRINT_OBJS="print.$O"
ISC_PRINT_SRCS="print.c"
ISC_PLATFORM_NEEDPRINTF='#define ISC_PLATFORM_NEEDPRINTF 1'
ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1'
ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1'
ISC_PLATFORM_NEEDPRINTF='#define ISC_PLATFORM_NEEDPRINTF 1'
ISC_PLATFORM_NEEDFPRINTF='#define ISC_PLATFORM_NEEDFPRINTF 1'
ISC_PLATFORM_NEEDFSRINTF='#define ISC_PLATFORM_NEEDSPRINTF 1'
ISC_PLATFORM_NEEDVSNPRINTF="#define ISC_PLATFORM_NEEDVSNPRINTF 1"
LWRES_PLATFORM_NEEDVSNPRINTF="#define LWRES_PLATFORM_NEEDVSNPRINTF 1"],
[AC_MSG_RESULT(assuming target platform supports %z)])
[AC_MSG_RESULT(assuming target platform supports %z)])
AC_SUBST(ISC_PLATFORM_NEEDPRINTF)
AC_SUBST(ISC_PLATFORM_NEEDFPRINTF)
@@ -2920,7 +2942,8 @@ AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR))
# Use our own SPNEGO implementation?
#
AC_ARG_ENABLE(isc-spnego,
[ --disable-isc-spnego use SPNEGO from GSSAPI library])
AS_HELP_STRING([--disable-isc-spnego],
[use SPNEGO from GSSAPI library]))
if test -n "$USE_GSSAPI"
then
@@ -2985,8 +3008,7 @@ AC_SUBST(LWRES_PLATFORM_QUADFORMAT)
#
# Note it is very recommended to *not* disable chroot(),
# this is only because chroot() was made obsolete by Posix.
AC_ARG_ENABLE(chroot,
[ --disable-chroot disable chroot])
AC_ARG_ENABLE(chroot, AS_HELP_STRING([--disable-chroot], [disable chroot]))
case "$enable_chroot" in
yes|'')
AC_CHECK_FUNCS(chroot)
@@ -2995,7 +3017,8 @@ case "$enable_chroot" in
;;
esac
AC_ARG_ENABLE(linux-caps,
[ --disable-linux-caps disable linux capabilities])
AS_HELP_STRING([--disable-linux-caps],
[disable linux capabilities]))
case "$enable_linux_caps" in
yes|'')
AC_CHECK_HEADERS(linux/types.h)
@@ -3051,9 +3074,9 @@ AC_DEFINE(NEED_OPTARG, 1, [Defined if extern char *optarg is not declared.])])
AC_MSG_CHECKING(st_mtim.tv_nsec)
AC_TRY_COMPILE([#include <sys/fcntl.h>],[struct stat s; return(s.st_mtim.tv_nsec);],
[AC_MSG_RESULT(yes)
ISC_PLATFORM_HAVESTATNSEC="#define ISC_PLATFORM_HAVESTATNSEC 1"],
ISC_PLATFORM_HAVESTATNSEC="#define ISC_PLATFORM_HAVESTATNSEC 1"],
[AC_MSG_RESULT(no)
ISC_PLATFORM_HAVESTATNSEC="#undef ISC_PLATFORM_HAVESTATNSEC"])
ISC_PLATFORM_HAVESTATNSEC="#undef ISC_PLATFORM_HAVESTATNSEC"])
AC_SUBST(ISC_PLATFORM_HAVESTATNSEC)
#
@@ -3264,10 +3287,10 @@ AC_CHECK_HEADERS(stdatomic.h,
ISC_PLATFORM_HAVESTDATOMIC="#undef ISC_PLATFORM_HAVESTDATOMIC"])
AC_ARG_ENABLE(atomic,
[ --enable-atomic enable machine specific atomic operations
[[default=autodetect]]],
enable_atomic="$enableval",
enable_atomic="autodetect")
AS_HELP_STRING([--enable-atomic],
[enable machine specific atomic operations
[default=autodetect]]),
enable_atomic="$enableval", enable_atomic="autodetect")
case "$enable_atomic" in
yes|''|autodetect)
case "$host" in
@@ -3305,7 +3328,7 @@ case "$enable_atomic" in
esac
;;
no)
have_stdatomic=no
have_stdatomic=no
ISC_PLATFORM_HAVESTDATOMIC="#undef ISC_PLATFORM_HAVESTDATOMIC"
use_atomic=no
arch=noatomic
@@ -3485,26 +3508,25 @@ AC_SUBST(ISC_ARCH_DIR)
#
AC_MSG_CHECKING([compiler support for __builtin_expect])
AC_TRY_LINK(, [
return (__builtin_expect(1, 1) ? 1 : 0);
return (__builtin_expect(1, 1) ? 1 : 0);
], [
have_builtin_expect=yes
AC_MSG_RESULT(yes)
have_builtin_expect=yes
AC_MSG_RESULT(yes)
], [
have_builtin_expect=no
AC_MSG_RESULT(no)
have_builtin_expect=no
AC_MSG_RESULT(no)
])
if test "yes" = "$have_builtin_expect"; then
AC_DEFINE(HAVE_BUILTIN_EXPECT, 1, [Define to 1 if the compiler supports __builtin_expect.])
AC_DEFINE(HAVE_BUILTIN_EXPECT, 1, [Define to 1 if the compiler supports __builtin_expect.])
fi
#
# Activate "rrset-order fixed" or not?
#
AC_ARG_ENABLE(fixed-rrset,
[ --enable-fixed-rrset enable fixed rrset ordering
[[default=no]]],
enable_fixed="$enableval",
enable_fixed="no")
AS_HELP_STRING([--enable-fixed-rrset],
[enable fixed rrset ordering [default=no]]),
enable_fixed="$enableval", enable_fixed="no")
case "$enable_fixed" in
yes)
AC_DEFINE(DNS_RDATASET_FIXED, 1,
@@ -3520,9 +3542,9 @@ esac
# Enable response policy rewriting using NS IP addresses
#
AC_ARG_ENABLE(rpz-nsip,
[ --disable-rpz-nsip disable rpz-nsip rules [[default=enabled]]],
enable_nsip="$enableval",
enable_nsip="yes")
AS_HELP_STRING([--disable-rpz-nsip],
[disable rpz nsip rules [default=enabled]]),
enable_nsip="$enableval", enable_nsip="yes")
case "$enable_nsip" in
yes)
AC_DEFINE(ENABLE_RPZ_NSIP, 1,
@@ -3538,9 +3560,9 @@ esac
# Enable response policy rewriting using NS name
#
AC_ARG_ENABLE(rpz-nsdname,
[ --disable-rpz-nsdname disable rpz-nsdname rules [[default=enabled]]],
enable_nsdname="$enableval",
enable_nsdname="yes")
AS_HELP_STRING([--disable-rpz-nsdname],
[disable rpz nsdname rules [default=enabled]]),
enable_nsdname="$enableval", enable_nsdname="yes")
case "$enable_nsdname" in
yes)
AC_DEFINE(ENABLE_RPZ_NSDNAME, 1,
@@ -3556,9 +3578,9 @@ esac
# Activate recursive fetch limits
#
AC_ARG_ENABLE(fetchlimit,
[ --enable-fetchlimit enable recursive fetch limits [[default=no]]],
enable_fetchlimit="$enableval",
enable_fetchlimit="no")
AS_HELP_STRING([--enable-fetchlimit],
[enable recursive fetch limits [default=no]]),
enable_fetchlimit="$enableval", enable_fetchlimit="no")
case "$enable_fetchlimit" in
yes)
AC_DEFINE(ENABLE_FETCHLIMIT, 1,
@@ -3574,10 +3596,9 @@ esac
# Activate "filter-aaaa" or not?
#
AC_ARG_ENABLE(filter-aaaa,
[ --enable-filter-aaaa enable filtering of AAAA records over IPv4
[[default=no]]],
enable_filter="$enableval",
enable_filter="no")
AS_HELP_STRING([--enable-filter-aaaa],
[enable filtering of AAAA records [default=no]]),
enable_filter="$enableval", enable_filter="no")
case "$enable_filter" in
yes)
AC_DEFINE(ALLOW_FILTER_AAAA_ON_V4, 1,
@@ -3718,8 +3739,9 @@ AC_SUBST($1)
#
AC_MSG_CHECKING(for Docbook-XSL path)
AC_ARG_WITH(docbook-xsl,
[ --with-docbook-xsl=PATH Specify path for Docbook-XSL stylesheets],
docbook_path="$withval", docbook_path="auto")
AS_HELP_STRING([--with-docbook-xsl[=PATH]],
[specify path for Docbook-XSL stylesheets]),
docbook_path="$withval", docbook_path="auto")
case "$docbook_path" in
auto)
AC_MSG_RESULT(auto)
@@ -3756,8 +3778,9 @@ NOM_PATH_FILE(XSLT_DBLATEX_FASTBOOK, xsl/latex_book_fast.xsl, $dblatex_xsl_trees
# IDN support
#
AC_ARG_WITH(idn,
[ --with-idn[=MPREFIX] enable IDN support using idnkit [default PREFIX]],
use_idn="$withval", use_idn="no")
AS_HELP_STRING([--with-idn[=MPREFIX]],
[enable IDN support using idnkit [default PREFIX]]),
use_idn="$withval", use_idn="no")
case "$use_idn" in
yes)
if test X$prefix = XNONE ; then
@@ -3776,8 +3799,9 @@ esac
iconvinc=
iconvlib=
AC_ARG_WITH(libiconv,
[ --with-libiconv[=IPREFIX] GNU libiconv are in IPREFIX [default PREFIX]],
use_libiconv="$withval", use_libiconv="no")
AS_HELP_STRING([--with-libiconv[=IPREFIX]],
[GNU libiconv are in IPREFIX [default PREFIX]]),
use_libiconv="$withval", use_libiconv="no")
case "$use_libiconv" in
yes)
if test X$prefix = XNONE ; then
@@ -3795,8 +3819,9 @@ no)
esac
AC_ARG_WITH(iconv,
[ --with-iconv[=LIBSPEC] specify iconv library [default -liconv]],
iconvlib="$withval")
AS_HELP_STRING([--with-iconv[=LIBSPEC]],
[specify iconv library [default -liconv]]),
iconvlib="$withval")
case "$iconvlib" in
no)
iconvlib=
@@ -3807,8 +3832,8 @@ yes)
esac
AC_ARG_WITH(idnlib,
[ --with-idnlib=ARG specify libidnkit],
idnlib="$withval", idnlib="no")
AS_HELP_STRING([--with-idnlib=ARG], [specify libidnkit]),
idnlib="$withval", idnlib="no")
if test "yes" = "$idnlib"; then
AC_MSG_ERROR([You must specify ARG for --with-idnlib.])
fi
@@ -3829,8 +3854,8 @@ AC_SUBST(IDNLIBS)
# Check whether to build Automated Test Framework unit tests
#
AC_ARG_WITH(atf,
[ --with-atf=ARG Automated Test Framework support],
atf="$withval", atf="no")
AS_HELP_STRING([--with-atf], [support Automated Test Framework]),
atf="$withval", atf="no")
if test "yes" = "$atf"; then
atf=`pwd`/unit/atf
ATFBUILD=atf-src
@@ -3871,8 +3896,10 @@ AC_CHECK_FUNCS(setlocale)
# was --enable-querytrace specified?
#
AC_ARG_ENABLE(querytrace,
[ --enable-querytrace enable very verbose query trace logging [[default=no]]],
want_querytrace="$enableval", want_querytrace="no")
AS_HELP_STRING([--enable-querytrace],
[enable very verbose query trace logging
[default=no]]),
want_querytrace="$enableval", want_querytrace="no")
AC_MSG_CHECKING([whether to enable query trace logging])
case "$want_querytrace" in
@@ -4012,8 +4039,9 @@ SO_LD=""
SO_TARGETS=""
AC_ARG_WITH(dlopen,
[ --with-dlopen=ARG Support dynamically loadable DLZ drivers],
dlopen="$withval", dlopen="yes")
AS_HELP_STRING([--with-dlopen=ARG],
[support dynamically loadable DLZ drivers]),
dlopen="$withval", dlopen="yes")
case $host in
*-sunos*) dlopen="no"
@@ -4328,15 +4356,15 @@ AC_CONFIG_FILES([
contrib/zone-edit.sh
doc/Makefile
doc/arm/Makefile
doc/arm/noteversion.xml
doc/arm/pkgversion.xml
doc/arm/releaseinfo.xml
doc/arm/noteversion.xml
doc/arm/pkgversion.xml
doc/arm/releaseinfo.xml
doc/doxygen/Doxyfile
doc/doxygen/Makefile
doc/doxygen/doxygen-input-filter
doc/misc/Makefile
doc/tex/Makefile
doc/tex/armstyle.sty
doc/tex/Makefile
doc/tex/armstyle.sty
doc/xsl/Makefile
doc/xsl/isc-docbook-chunk.xsl
doc/xsl/isc-docbook-html.xsl
@@ -4429,24 +4457,26 @@ AC_OUTPUT
# Now that the Makefiles exist we can ensure that everything is rebuilt.
#
AC_ARG_WITH(make-clean,
[ --with-make-clean Run "make clean" at end of configure [[yes|no]].],
make_clean="$withval", make_clean="yes")
AS_HELP_STRING([--with-make-clean],
[run "make clean" at end of configure [yes|no]]),
make_clean="$withval", make_clean="yes")
case "$make_clean" in
yes)
if test "yes" != "$no_create"
then
if test "yes" = "$silent"
then
make clean > /dev/null
else
make clean
make clean > /dev/null
else
make clean
fi
fi
;;
esac
AC_ARG_ENABLE(full-report,
[ --enable-full-report report values of all configure options])
AS_HELP_STRING([--enable-full-report],
[report values of all configure options]))
report() {
echo "========================================================================"
@@ -4464,17 +4494,17 @@ report() {
test "yes" = "$enable_newstats" && \
echo " New statistics (--enable-newstats)"
test "yes" = "$enable_fixed" && \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "yes" = "$enable_filter" && \
echo " AAAA filtering (--enable-filter-aaaa)"
test "yes" = "$want_backtrace" && \
echo " Print backtrace on crash (--enable-backtrace)"
echo " Print backtrace on crash (--enable-backtrace)"
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" && \
echo " Use symbol table for backtrace, all binaries (--enable-symtable=all)"
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)"
# these lines are only printed if run with --enable-full-report
@@ -4495,17 +4525,17 @@ report() {
echo " Dynamically loadable zone (DLZ) drivers:"
test "no" = "$use_dlz_bdb" || \
echo " Berkeley DB (--with-dlz-bdb)"
echo " Berkeley DB (--with-dlz-bdb)"
test "no" = "$use_dlz_ldap" || \
echo " LDAP (--with-dlz-ldap)"
echo " LDAP (--with-dlz-ldap)"
test "no" = "$use_dlz_mysql" || \
echo " MySQL (--with-dlz-mysql)"
echo " MySQL (--with-dlz-mysql)"
test "no" = "$use_dlz_odbc" || \
echo " ODBC (--with-dlz-odbc)"
echo " ODBC (--with-dlz-odbc)"
test "no" = "$use_dlz_postgres" || \
echo " Postgres (--with-dlz-postgres)"
echo " Postgres (--with-dlz-postgres)"
test "no" = "$use_dlz_filesystem" || \
echo " Filesystem (--with-dlz-filesystem)"
echo " Filesystem (--with-dlz-filesystem)"
test "no" = "$use_dlz_stub" || \
echo " Stub (--with-dlz-stub)"
test "no no no no no no no" = "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" && echo " None"
@@ -4526,7 +4556,7 @@ report() {
test "yes" = "$enable_fixed" || \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "yes" = "$want_backtrace" || \
echo " Print backtrace on crash (--enable-backtrace)"
echo " Print backtrace on crash (--enable-backtrace)"
test "yes" = "$want_querytrace" || \
echo " Very verbose query trace logging (--enable-querytrace)"
test "no" = "$atf" && echo " Automated Testing Framework (--with-atf)"
@@ -4548,9 +4578,9 @@ report() {
echo " localstatedir: $localstatedir"
if test "X$ac_unrecognized_opts" != "X"; then
echo
echo "Unrecognized options:"
echo " $ac_unrecognized_opts"
echo
echo "Unrecognized options:"
echo " $ac_unrecognized_opts"
fi
if test "yes" != "$enable_full_report"; then
@@ -4561,7 +4591,7 @@ report() {
}
if test "yes" != "$silent"; then
report
report
fi
if test "X$USE_OPENSSL" = "X"; then
+21 -14
View File
@@ -55,8 +55,9 @@ AC_DEFUN(DLZ_ADD_DRIVER, [
AC_MSG_CHECKING(for Postgres DLZ driver)
AC_ARG_WITH(dlz_postgres,
[ --with-dlz-postgres[=PATH] Build with Postgres DLZ driver [yes|no|path].
(Required to use Postgres with DLZ)],
AS_HELP_STRING([--with-dlz-postgres[=PATH]],
[Build with Postgres DLZ driver [yes|no|path].
(Required to use Postgres with DLZ)]),
use_dlz_postgres="$withval", use_dlz_postgres="no")
if test "$use_dlz_postgres" != "no"
@@ -124,8 +125,9 @@ esac
AC_MSG_CHECKING(for MySQL DLZ driver)
AC_ARG_WITH(dlz_mysql,
[ --with-dlz-mysql[=PATH] Build with MySQL DLZ driver [yes|no|path].
(Required to use MySQL with DLZ)],
AS_HELP_STRING([--with-dlz-mysql[=PATH]],
[Build with MySQL DLZ driver [yes|no|path].
(Required to use MySQL with DLZ)]),
use_dlz_mysql="$withval", use_dlz_mysql="no")
mysql_include=""
@@ -212,8 +214,9 @@ esac
AC_MSG_CHECKING(for Berkeley DB DLZ driver...)
AC_ARG_WITH(dlz_bdb,
[ --with-dlz-bdb[=PATH] Build with Berkeley DB DLZ driver [yes|no|path].
(Required to use Berkeley DB with DLZ)],
AS_HELP_STRING([--with-dlz-bdb[=PATH]],
[Build with Berkeley DB DLZ driver [yes|no|path].
(Required to use Berkeley DB with DLZ)]),
use_dlz_bdb="$withval", use_dlz_bdb="no")
case "$use_dlz_bdb" in
@@ -336,8 +339,9 @@ esac
AC_MSG_CHECKING(for file system DLZ driver)
AC_ARG_WITH(dlz_filesystem,
[ --with-dlz-filesystem[=ARG] Build with filesystem DLZ driver [yes|no].
(Required to use file system driver with DLZ)],
AS_HELP_STRING([--with-dlz-filesystem[=ARG]],
[Build with filesystem DLZ driver [yes|no].
(Required to use file system driver with DLZ)]),
use_dlz_filesystem="$withval", use_dlz_filesystem="no")
case "$use_dlz_filesystem" in
@@ -358,8 +362,9 @@ esac
AC_MSG_CHECKING(for LDAP DLZ driver)
AC_ARG_WITH(dlz_ldap,
[ --with-dlz-ldap[=PATH] Build with LDAP DLZ driver [yes|no|path].
(Required to use LDAP with DLZ)],
AS_HELP_STRING([--with-dlz-ldap[=PATH]],
[Build with LDAP DLZ driver [yes|no|path].
(Required to use LDAP with DLZ)]),
use_dlz_ldap="$withval", use_dlz_ldap="no")
if test "$use_dlz_ldap" = "yes"
@@ -404,8 +409,9 @@ esac
AC_MSG_CHECKING(for ODBC DLZ driver)
AC_ARG_WITH(dlz_odbc,
[ --with-dlz-odbc[=PATH] Build with ODBC DLZ driver [yes|no|path].
(Required to use ODBC with DLZ)],
AS_HELP_STRING([--with-dlz-odbc[=PATH]],
[Build with ODBC DLZ driver [yes|no|path].
(Required to use ODBC with DLZ)]),
use_dlz_odbc="$withval", use_dlz_odbc="no")
if test "$use_dlz_odbc" = "yes"
@@ -461,8 +467,9 @@ esac
AC_MSG_CHECKING(for stub DLZ driver)
AC_ARG_WITH(dlz_stub,
[ --with-dlz-stub[=ARG] Build with stub DLZ driver [yes|no].
(Required to use stub driver with DLZ)],
AS_HELP_STRING([--with-dlz-stub[=ARG]],
[Build with stub DLZ driver [yes|no].
(Required to use stub driver with DLZ)]),
use_dlz_stub="$withval", use_dlz_stub="no")
case "$use_dlz_stub" in