From: Mukund Sivaraman <muks@isc.org>
Date: Tue, 19 Sep 2017 20:52:22 +0000 (+0530)
Subject: Show configure message for "checking whether to use OpenSSL hash functions..."
X-Git-Tag: v9.12.0b1~160
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0c03a0fb2d5a005b7e00e9e32f2ca8cc2692fa93;p=thirdparty%2Fbind9.git

Show configure message for "checking whether to use OpenSSL hash functions..."
---

diff --git a/configure b/configure
index b405dd0f634..7459f1bc784 100755
--- a/configure
+++ b/configure
@@ -1000,9 +1000,9 @@ with_ecdsa
 with_gost
 with_eddsa
 with_aes
-enable_openssl_hash
 with_cc_alg
 enable_openssl_version_check
+enable_openssl_hash
 enable_crypto_rand
 with_lmdb
 with_libxml2
@@ -1695,9 +1695,9 @@ Optional Features:
   --enable-devpoll        use /dev/poll when available [default=yes]
   --enable-threads        enable multithreading
   --enable-native-pkcs11  use native PKCS11 for all crypto [default=no]
-  --enable-openssl-hash   use OpenSSL for hash functions [default=yes]
   --enable-openssl-version-check
                           check OpenSSL version [default=yes]
+  --enable-openssl-hash   use OpenSSL for hash functions [default=yes]
   --enable-crypto-rand    use the crypto provider for random [default=yes]
   --enable-largefile	  64-bit file support
   --enable-backtrace      log stack backtrace on abort [default=yes]
@@ -15843,17 +15843,6 @@ else
 fi
 
 
-#
-# was --enable-openssl-hash specified?
-#
-# Check whether --enable-openssl-hash was given.
-if test "${enable_openssl_hash+set}" = set; then :
-  enableval=$enable_openssl_hash; want_openssl_hash="$enableval"
-else
-  want_openssl_hash="whenossl"
-fi
-
-
 #
 # Client Cookie algorithm choice
 #
@@ -16610,8 +16599,8 @@ fi
 # Choose Client Cookie algorithm
 #
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Algorithm for Client Cookie" >&5
-$as_echo_n "checking for the Algorithm for Client Cookie... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the algorithm for Client Cookie" >&5
+$as_echo_n "checking for the algorithm for Client Cookie... " >&6; }
 if test "auto" = "$with_cc_alg"
 then
 	if test "yes" = "$with_aes"
@@ -16649,6 +16638,19 @@ esac
 # Use OpenSSL for hash functions
 #
 
+#
+# was --enable-openssl-hash specified?
+#
+# Check whether --enable-openssl-hash was given.
+if test "${enable_openssl_hash+set}" = set; then :
+  enableval=$enable_openssl_hash; want_openssl_hash="$enableval"
+else
+  want_openssl_hash="whenossl"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use OpenSSL hash functions" >&5
+$as_echo_n "checking whether to use OpenSSL hash functions... " >&6; }
 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH"
 if test "whenossl" = "$want_openssl_hash"
 then
diff --git a/configure.in b/configure.in
index 6de99872c81..0aed224f4e2 100644
--- a/configure.in
+++ b/configure.in
@@ -1467,13 +1467,6 @@ AC_ARG_WITH(eddsa, [  --with-eddsa            Crypto EDDSA [yes|all|no].],
 AC_ARG_WITH(aes, [  --with-aes              Crypto AES],
 	    with_aes="$withval", with_aes="checkcc")
 
-#
-# was --enable-openssl-hash specified?
-#
-AC_ARG_ENABLE(openssl-hash,
-	[  --enable-openssl-hash   use OpenSSL for hash functions [[default=yes]]],
-	want_openssl_hash="$enableval", want_openssl_hash="whenossl")
-
 #
 # Client Cookie algorithm choice
 #
@@ -2049,7 +2042,7 @@ AC_SUBST(ISC_PLATFORM_WANTAES)
 # Choose Client Cookie algorithm
 #
 
-AC_MSG_CHECKING(for the Algorithm for Client Cookie)
+AC_MSG_CHECKING(for the algorithm for Client Cookie)
 if test "auto" = "$with_cc_alg"
 then
 	if test "yes" = "$with_aes"
@@ -2081,6 +2074,14 @@ esac
 # Use OpenSSL for hash functions
 #
 
+#
+# was --enable-openssl-hash specified?
+#
+AC_ARG_ENABLE(openssl-hash,
+	[  --enable-openssl-hash   use OpenSSL for hash functions [[default=yes]]],
+	want_openssl_hash="$enableval", want_openssl_hash="whenossl")
+
+AC_MSG_CHECKING(whether to use OpenSSL hash functions)
 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH"
 if test "whenossl" = "$want_openssl_hash"
 then