Bug 3471: add #define ENABLE_CMAC support in configure

bk: 5aaafec65NasGTEkC1YUB8XioEaAEw

diff --git a/ChangeLog b/ChangeLog
index dddcf3510284eb9b1ccdb0247a2e1276fcc9d433..dad61610eb38c0c609acf1b046d1b74f177fea4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 ---
 
 * [Bug 3471] Check for openssl/[ch]mac.h.  HStenn.
-  - add --enable-cmac support in configure.  HStenn.
+  - add #define ENABLE_CMAC support in configure.  HStenn.
 ---
 (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/configure.ac b/configure.ac
index 2caa6c0db0e21cce2faee746cf03b8939268228e..31d7123799882593b7c098c647582f6be2d25c46 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3014,23 +3014,16 @@ AC_MSG_RESULT([$ans])
 
 NTP_OPENSSL
 
-AC_MSG_CHECKING([if we want to include CMAC support])
-case "$ntp_openssl" in
+AC_MSG_CHECKING([if we want to enable CMAC support])
+case "$ac_cv_header_openssl_cmac_h" in
  yes)
-    AC_ARG_ENABLE(
-       [cmac],
-       AS_HELP_STRING(
-           [--enable-cmac],
-           [? include AES-128-CMAC support]
-           ),
-       [ntp_cmac=$enableval],
-       [ntp_cmac=yes]
-    )
+    AC_DEFINE([ENABLE_CMAC], [1], [Enable CMAC support?])
+    ans="yes"
     ;;
- *) [ntp_cmac=no]
+ *) ans="no"
     ;;
 esac
-AC_MSG_RESULT([$ntp_cmac])
+AC_MSG_RESULT([$ans])
 
 NTP_CRYPTO_RAND