From be04bd20400b39d225b79691df0e2254a96b8564 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Tue, 23 Apr 2019 20:11:39 -0400
Subject: New upstream version 1.1.6

---
 m4/ax_arg_enable_warnings.m4 | 1 +
 m4/ax_arg_openssl.m4         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'm4')

diff --git a/m4/ax_arg_enable_warnings.m4 b/m4/ax_arg_enable_warnings.m4
index 99b13cc..133cd5e 100644
--- a/m4/ax_arg_enable_warnings.m4
+++ b/m4/ax_arg_enable_warnings.m4
@@ -5,6 +5,7 @@ AC_DEFUN([AX_ARG_ENABLE_WARNINGS],[
     AX_APPEND_COMPILE_FLAGS([-Wall])
     AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast])
     AX_APPEND_COMPILE_FLAGS([-Wcast-align])
+    AX_APPEND_COMPILE_FLAGS([-Wcast-function-type])
     AX_APPEND_COMPILE_FLAGS([-Wcast-qual])
     AX_APPEND_COMPILE_FLAGS([-Wclobbered])
     AX_APPEND_COMPILE_FLAGS([-Wduplicated-cond])
diff --git a/m4/ax_arg_openssl.m4 b/m4/ax_arg_openssl.m4
index 949b7a5..972dfd0 100644
--- a/m4/ax_arg_openssl.m4
+++ b/m4/ax_arg_openssl.m4
@@ -61,12 +61,12 @@ else
 fi
 
 AS_IF([test "$cf_enable_openssl" != "no"],
- [AC_MSG_CHECKING(for LibreSSL or OpenSSL 1.0.1d and above)
+ [AC_MSG_CHECKING(for LibreSSL or OpenSSL 1.0.1f and above)
   AC_RUN_IFELSE([
     AC_LANG_PROGRAM([
     #include <openssl/opensslv.h>
     #include <stdlib.h>],
-    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x1000104fL)); ]])],
+    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x1000106fL)); ]])],
   [cf_openssl_version_ok=yes],
   [cf_openssl_version_ok=no],
   [cf_openssl_version_ok=no])
-- 
cgit v1.2.3