ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '972-auto-validation-summary-v9_14' into 'v9_14'

Browse Source 
configure summary failed to report --disable-auto-validation correctly

See merge request isc-projects/bind9!1798
This commit is contained in:
Evan Hunt
2019-04-11 13:05:00 -04:00
parent 57c8cb42db 7b99a235a8
commit c675e366f2
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@@ -841,6 +841,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -998,6 +999,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1250,6 +1252,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1387,7 +1398,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1540,6 +1551,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -23912,7 +23924,7 @@ report() {
echo " Very verbose query trace logging (--enable-querytrace)"
test "no" = "$with_cmocka" || echo " CMocka Unit Testing Framework (--with-cmocka)"
test "no" = "$want_autoval" || echo " DNSSEC validation active by default (--enable-auto-validation)"
test "auto" = "$validation_default" && echo " DNSSEC validation active by default (--enable-auto-validation)"
test "$CRYPTO" = "pkcs11" && (
echo " Using PKCS#11 for Public-Key Cryptography (--with-native-pkcs11)"
@@ -23953,10 +23965,10 @@ report() {
test "yes" = "$enable_fixed" || \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "no" = "$want_autoval" && echo " DNSSEC validation requires configuration (--disable-auto-validation)"
test "yes" = "$validation_default" && echo " DNSSEC validation requires configuration (--enablee-auto-validation)"
test "$CRYPTO" = "pkcs11" || (
echo " Using PKCS#11 for Public-Key Cryptography (--without-native-pkcs11)"
echo " Using PKCS#11 for Public-Key Cryptography (--with-native-pkcs11)"
)
test "yes" = "$enable_backtrace" || \

6
configure.ac
View File

@@ -3121,7 +3121,7 @@ report() {
echo " Very verbose query trace logging (--enable-querytrace)"
test "no" = "$with_cmocka" || echo " CMocka Unit Testing Framework (--with-cmocka)"
test "no" = "$want_autoval" || echo " DNSSEC validation active by default (--enable-auto-validation)"
test "auto" = "$validation_default" && echo " DNSSEC validation active by default (--enable-auto-validation)"
test "$CRYPTO" = "pkcs11" && (
echo " Using PKCS#11 for Public-Key Cryptography (--with-native-pkcs11)"
@@ -3162,10 +3162,10 @@ report() {
test "yes" = "$enable_fixed" || \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "no" = "$want_autoval" && echo " DNSSEC validation requires configuration (--disable-auto-validation)"
test "yes" = "$validation_default" && echo " DNSSEC validation requires configuration (--enablee-auto-validation)"
test "$CRYPTO" = "pkcs11" || (
echo " Using PKCS#11 for Public-Key Cryptography (--without-native-pkcs11)"
echo " Using PKCS#11 for Public-Key Cryptography (--with-native-pkcs11)"
)
test "yes" = "$enable_backtrace" || \