From: Evan Hunt Date: Wed, 4 Dec 2013 17:00:35 +0000 (-0800) Subject: reword/reorder configuration summary X-Git-Tag: v9.10.0a2~197^2~1 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7f2b3089f27a4ccfd7fc56c1943e686f96726611;p=thirdparty%2Fbind9.git reword/reorder configuration summary --- diff --git a/configure b/configure index 94b7006dec4..c0fdb749cbe 100755 --- a/configure +++ b/configure @@ -23412,21 +23412,20 @@ echo "------------------------------------------------------------------------" echo "Optional features enabled:" $use_threads && echo " Multiprocessing support (--enable-threads)" +test "$use_geoip" = "no" || echo " GeoIP access control (--with-geoip)" +test "$use_gssapi" = "no" || echo " GSS-API (--with-gssapi)" +test "$use_pkcs11" = "no" || echo " PKCS#11/Cryptoki support (--with-pkcs11)" test "$enable_fixed" = "yes" && \ - echo " Fixed RRset order (--enable-fixed-rrset)" -test "$atf" = "no" || echo " Automated Testing Framework (--with-atf)" + echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)" test "$enable_filter" = "yes" && \ echo " AAAA filtering (--enable-filter-aaaa)" -test "$use_geoip" = "no" || echo " GeoIP access control (--with-geoip)" -test "$use_gssapi" = "no" || echo " GSS-API (--with-gssapi)" test "$want_backtrace" = "yes" && \ echo " Print backtrace on crash (--enable-backtrace)" test "$want_symtable" = "minimal" && \ echo " Use symbol table for backtrace, named only (--enable-symtable)" test "$want_symtable" = "yes" -o "$want_symtable" = "all" && \ echo " Use symbol table for backtrace, all binaries (--enable-symtable=all)" -test "$use_pkcs11" = "no" || echo " PKCS#11/Cryptoki support (--with-pkcs11)" - +test "$atf" = "no" || echo " Automated Testing Framework (--with-atf)" # these lines are only printed if run with --enable-full-report if test "$enable_full_report" = "yes"; then @@ -23463,19 +23462,18 @@ echo echo "Features disabled or unavailable on this platform:" $use_threads || echo " Multiprocessing support (--enable-threads)" -test "$enable_fixed" = "yes" || \ - echo " Fixed RRset order (--enable-fixed-rrset)" -test "$atf" = "no" && echo " Automated Testing Framework (--with-atf)" -test "$enable_filter" = "yes" || \ - echo " AAAA filtering (--enable-filter-aaaa)" +test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \ + echo " IPv6 support (--enable-ipv6)" + test "$use_geoip" = "no" && echo " GeoIP access control (--with-geoip)" test "$use_gssapi" = "no" && echo " GSS-API (--with-gssapi)" +test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pkcs11)" +test "$enable_fixed" = "yes" || \ + echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)" test "$want_backtrace" = "yes" || \ echo " Print backtrace on crash (--enable-backtrace)" -test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pkcs11)" +test "$atf" = "no" && echo " Automated Testing Framework (--with-atf)" -test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \ - echo " IPv6 support (--enable-ipv6)" test "X$USE_OPENSSL" = "X" && \ echo " OpenSSL cryptography/DNSSEC (--with-openssl)" test "X$USE_OPENSSL" != "X" -a "$OPENSSL_GOST" != "yes" && \ diff --git a/configure.in b/configure.in index ab80032f8e8..dd4ba407ba7 100644 --- a/configure.in +++ b/configure.in @@ -3942,21 +3942,20 @@ echo "------------------------------------------------------------------------" echo "Optional features enabled:" $use_threads && echo " Multiprocessing support (--enable-threads)" +test "$use_geoip" = "no" || echo " GeoIP access control (--with-geoip)" +test "$use_gssapi" = "no" || echo " GSS-API (--with-gssapi)" +test "$use_pkcs11" = "no" || echo " PKCS#11/Cryptoki support (--with-pkcs11)" test "$enable_fixed" = "yes" && \ - echo " Fixed RRset order (--enable-fixed-rrset)" -test "$atf" = "no" || echo " Automated Testing Framework (--with-atf)" + echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)" test "$enable_filter" = "yes" && \ echo " AAAA filtering (--enable-filter-aaaa)" -test "$use_geoip" = "no" || echo " GeoIP access control (--with-geoip)" -test "$use_gssapi" = "no" || echo " GSS-API (--with-gssapi)" test "$want_backtrace" = "yes" && \ echo " Print backtrace on crash (--enable-backtrace)" test "$want_symtable" = "minimal" && \ echo " Use symbol table for backtrace, named only (--enable-symtable)" test "$want_symtable" = "yes" -o "$want_symtable" = "all" && \ echo " Use symbol table for backtrace, all binaries (--enable-symtable=all)" -test "$use_pkcs11" = "no" || echo " PKCS#11/Cryptoki support (--with-pkcs11)" - +test "$atf" = "no" || echo " Automated Testing Framework (--with-atf)" # these lines are only printed if run with --enable-full-report if test "$enable_full_report" = "yes"; then @@ -3993,19 +3992,18 @@ echo echo "Features disabled or unavailable on this platform:" $use_threads || echo " Multiprocessing support (--enable-threads)" -test "$enable_fixed" = "yes" || \ - echo " Fixed RRset order (--enable-fixed-rrset)" -test "$atf" = "no" && echo " Automated Testing Framework (--with-atf)" -test "$enable_filter" = "yes" || \ - echo " AAAA filtering (--enable-filter-aaaa)" +test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \ + echo " IPv6 support (--enable-ipv6)" + test "$use_geoip" = "no" && echo " GeoIP access control (--with-geoip)" test "$use_gssapi" = "no" && echo " GSS-API (--with-gssapi)" +test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pkcs11)" +test "$enable_fixed" = "yes" || \ + echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)" test "$want_backtrace" = "yes" || \ echo " Print backtrace on crash (--enable-backtrace)" -test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pkcs11)" +test "$atf" = "no" && echo " Automated Testing Framework (--with-atf)" -test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \ - echo " IPv6 support (--enable-ipv6)" test "X$USE_OPENSSL" = "X" && \ echo " OpenSSL cryptography/DNSSEC (--with-openssl)" test "X$USE_OPENSSL" != "X" -a "$OPENSSL_GOST" != "yes" && \