aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2019-04-23 20:11:39 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2019-04-23 20:11:39 -0400
commitbe04bd20400b39d225b79691df0e2254a96b8564 (patch)
treef95875c73b1c11f30e0b6916a503eeb2e0e0d0d0 /m4
parent5140318f8f758141b4e350871db1fe869eb858dc (diff)
New upstream version 1.1.6upstream/1.1.6
Diffstat (limited to 'm4')
-rw-r--r--m4/ax_arg_enable_warnings.m41
-rw-r--r--m4/ax_arg_openssl.m44
2 files changed, 3 insertions, 2 deletions
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])