From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 22 Jun 2018 11:47:45 +0000 (+0200)
Subject: Cleanup the configure feature report
X-Git-Tag: v9.13.3~99^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45abf438f8a248b56a4daf75e6988b244ebc4e60;p=thirdparty%2Fbind9.git

Cleanup the configure feature report
---

diff --git a/configure b/configure
index f1a09f522b8..eede5abed1f 100755
--- a/configure
+++ b/configure
@@ -807,7 +807,6 @@ PKCS11_TOOLS
 OPENSSL_LDFLAGS
 OPENSSL_LIBS
 OPENSSL_INCLUDES
-PKG_CONFIG
 INSTALL_LIBRARY
 ISC_THREAD_DIR
 THREADOPTSRCS
@@ -16283,7 +16282,6 @@ esac
 PKCS11_TOOLS=
 #
 # was --enable-native-pkcs11 specified?
-#  (note it implies both --without-openssl and --with-pkcs11)
 #
 # Check whether --enable-native-pkcs11 was given.
 if test "${enable_native_pkcs11+set}" = set; then :
@@ -22043,6 +22041,7 @@ esac
 
 
 
+
 #
 # Check whether to build with cmocka unit testing framework
 #
@@ -26184,8 +26183,6 @@ report() {
     if test "yes" = "$enable_full_report"; then
 	test "no" = "$enable_ipv6" -o "no" = "$found_ipv6" || \
 	    echo "    IPv6 support (--enable-ipv6)"
-	test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \
-		echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
 	test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
 	test "X$XMLSTATS" = "X" || echo "    XML statistics (--with-libxml2)"
 	test "X$JSONSTATS" = "X" || echo "    JSON statistics (--with-libjson)"
@@ -26194,13 +26191,6 @@ report() {
 	test "no" = "$with_libidn2" || echo "    IDN support (--with-libidn2)"
     fi
 
-    if test "no" != "$use_pkcs11"; then
-	echo "    Native PKCS#11/Cryptoki support (--enable-native-pkcs11)"
-    fi
-    test "yes" = "$OPENSSL_ECDSA" -o "$PKCS11_ECDSA" && \
-	echo "    ECDSA algorithm support (--with-ecdsa)"
-    test "yes" = "$OPENSSL_ED25519" -o "$PKCS11_ED25519" && \
-	echo "    EDDSA algorithm support (--with-eddsa)"
     test "yes" = "$enable_dnsrps" && \
 	echo "    DNS Response Policy Service interface (--enable-dnsrps)"
     test "yes" = "$enable_fixed" && \
@@ -26217,7 +26207,11 @@ report() {
     test "no" = "$atf" || echo "    Automated Testing Framework (--with-atf)"
 
     test "no" = "$want_autoval" || echo "    DNSSEC validation active by default (--enable-auto-validation)"
-    echo "    Cryptographic library for DNSSEC: $CRYPTOLIB"
+
+    test "$CRYPTO" = "pkcs11" && (
+	echo "    Using PKCS#11 for Public-Key Cryptography (--with-native-pkcs11)"
+	echo "    PKCS#11 module (--with-pkcs11): $with_pkcs11"
+    )
 
     echo "    Dynamically loadable zone (DLZ) drivers:"
     test "no" = "$use_dlz_bdb" || \
@@ -26257,18 +26251,9 @@ report() {
 
     test "no" = "$want_autoval" && echo "    DNSSEC validation requires configuration (--disable-auto-validation)"
 
-    if test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11"
-    then
-	echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
-    elif test "no" = "$use_pkcs11"; then
-	echo "    PKCS#11/Cryptoki support (--with-pkcs11)"
-    fi
-    test "yes" = "$want_native_pkcs11" ||
-	echo "    Native PKCS#11/Cryptoki support (--enable-native-pkcs11)"
-    test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ECDSA" -o "yes" = "$PKCS11_ECDSA" || \
-	echo "    ECDSA algorithm support (--with-ecdsa)"
-    test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \
-	echo "    EDDSA algorithm support (--with-eddsa)"
+    test "$CRYPTO" = "pkcs11" || (
+	echo "    Using PKCS#11 for Public-Key Cryptography (--without-native-pkcs11)"
+    )
 
     test "yes" = "$want_backtrace" || \
 	echo "    Print backtrace on crash (--enable-backtrace)"
diff --git a/configure.in b/configure.in
index 839e817c733..71e36e49dcd 100644
--- a/configure.in
+++ b/configure.in
@@ -1245,7 +1245,6 @@ AS_CASE([$with_cc_alg],
 PKCS11_TOOLS=
 #
 # was --enable-native-pkcs11 specified?
-#  (note it implies both --without-openssl and --with-pkcs11)
 #
 AC_ARG_ENABLE(native-pkcs11,
 	      AS_HELP_STRING([--enable-native-pkcs11],
@@ -4637,8 +4636,6 @@ report() {
     if test "yes" = "$enable_full_report"; then
 	test "no" = "$enable_ipv6" -o "no" = "$found_ipv6" || \
 	    echo "    IPv6 support (--enable-ipv6)"
-	test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \
-		echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
 	test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
 	test "X$XMLSTATS" = "X" || echo "    XML statistics (--with-libxml2)"
 	test "X$JSONSTATS" = "X" || echo "    JSON statistics (--with-libjson)"
@@ -4647,13 +4644,6 @@ report() {
 	test "no" = "$with_libidn2" || echo "    IDN support (--with-libidn2)"
     fi
 
-    if test "no" != "$use_pkcs11"; then
-	echo "    Native PKCS#11/Cryptoki support (--enable-native-pkcs11)"
-    fi
-    test "yes" = "$OPENSSL_ECDSA" -o "$PKCS11_ECDSA" && \
-	echo "    ECDSA algorithm support (--with-ecdsa)"
-    test "yes" = "$OPENSSL_ED25519" -o "$PKCS11_ED25519" && \
-	echo "    EDDSA algorithm support (--with-eddsa)"
     test "yes" = "$enable_dnsrps" && \
 	echo "    DNS Response Policy Service interface (--enable-dnsrps)"
     test "yes" = "$enable_fixed" && \
@@ -4670,7 +4660,11 @@ report() {
     test "no" = "$atf" || echo "    Automated Testing Framework (--with-atf)"
 
     test "no" = "$want_autoval" || echo "    DNSSEC validation active by default (--enable-auto-validation)"
-    echo "    Cryptographic library for DNSSEC: $CRYPTOLIB"
+
+    test "$CRYPTO" = "pkcs11" && (
+	echo "    Using PKCS#11 for Public-Key Cryptography (--with-native-pkcs11)"
+	echo "    PKCS#11 module (--with-pkcs11): $with_pkcs11"
+    )
 
     echo "    Dynamically loadable zone (DLZ) drivers:"
     test "no" = "$use_dlz_bdb" || \
@@ -4710,18 +4704,9 @@ report() {
 
     test "no" = "$want_autoval" && echo "    DNSSEC validation requires configuration (--disable-auto-validation)"
 
-    if test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11"
-    then
-	echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
-    elif test "no" = "$use_pkcs11"; then
-	echo "    PKCS#11/Cryptoki support (--with-pkcs11)"
-    fi
-    test "yes" = "$want_native_pkcs11" ||
-	echo "    Native PKCS#11/Cryptoki support (--enable-native-pkcs11)"
-    test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ECDSA" -o "yes" = "$PKCS11_ECDSA" || \
-	echo "    ECDSA algorithm support (--with-ecdsa)"
-    test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \
-	echo "    EDDSA algorithm support (--with-eddsa)"
+    test "$CRYPTO" = "pkcs11" || (
+	echo "    Using PKCS#11 for Public-Key Cryptography (--without-native-pkcs11)"
+    )
 
     test "yes" = "$want_backtrace" || \
 	echo "    Print backtrace on crash (--enable-backtrace)"