From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 27 Apr 2015 08:41:41 +0000 (+0000)
Subject: [Bug 2776] Clean up EVP_MD_do_all_sorted() test
X-Git-Tag: NTP_4_3_21~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51dcb70f13ce3b5c837ddfff1d980b0b6b456ddb;p=thirdparty%2Fntp.git

[Bug 2776] Clean up EVP_MD_do_all_sorted() test

bk: 553df64539XQ2x91O3kG2mLqS4Q0gQ
---

diff --git a/sntp/m4/ntp_openssl.m4 b/sntp/m4/ntp_openssl.m4
index f2f41ff1a..0e38aba73 100644
--- a/sntp/m4/ntp_openssl.m4
+++ b/sntp/m4/ntp_openssl.m4
@@ -360,6 +360,9 @@ case "$ntp_openssl:$GCC" in
     CFLAGS_NTP="$CFLAGS_NTP -Wstrict-prototypes"
 esac
 
+# Because we don't want -Werror for the EVP_MD_do_all_sorted check
+CFLAGS="$NTPO_SAVED_CFLAGS"
+
 case "$ntp_openssl" in
  yes)
     LIBS="$NTPO_SAVED_LIBS $LDADD_NTP"
@@ -367,7 +370,6 @@ case "$ntp_openssl" in
     ;;
 esac
 
-CFLAGS="$NTPO_SAVED_CFLAGS"
 CPPFLAGS="$NTPO_SAVED_CPPFLAGS"
 LIBS="$NTPO_SAVED_LIBS"
 AS_UNSET([NTPO_SAVED_CFLAGS])