From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 24 Apr 2015 09:25:09 +0000 (+0000)
Subject: [Bug 2776] Improve ntpq's 'help keytype'
X-Git-Tag: NTP_4_3_18~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a60538d71b80f2943116b65096eb05064a0245bc;p=thirdparty%2Fntp.git

[Bug 2776] Improve ntpq's 'help keytype'

bk: 553a0bf55biZN9Drv01BTc22mQ9D4Q
---

diff --git a/sntp/m4/ntp_openssl.m4 b/sntp/m4/ntp_openssl.m4
index 2f3afa010..f2f41ff1a 100644
--- a/sntp/m4/ntp_openssl.m4
+++ b/sntp/m4/ntp_openssl.m4
@@ -225,7 +225,6 @@ AC_MSG_RESULT([$ntp_openssl])
 
 case "$ntp_openssl" in
  yes)
-    AC_CHECK_FUNCS([EVP_MD_do_all_sorted])
     AC_DEFINE([OPENSSL], [], [Use OpenSSL?])
     case "$VER_SUFFIX" in
      *o*) ;;
@@ -361,6 +360,13 @@ case "$ntp_openssl:$GCC" in
     CFLAGS_NTP="$CFLAGS_NTP -Wstrict-prototypes"
 esac
 
+case "$ntp_openssl" in
+ yes)
+    LIBS="$NTPO_SAVED_LIBS $LDADD_NTP"
+    AC_CHECK_FUNCS([EVP_MD_do_all_sorted])
+    ;;
+esac
+
 CFLAGS="$NTPO_SAVED_CFLAGS"
 CPPFLAGS="$NTPO_SAVED_CPPFLAGS"
 LIBS="$NTPO_SAVED_LIBS"