summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bdf50aab..d69e08ff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
4 - (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC 4 - (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC
5 - (djm) [openbsd-compat/bsd-snprintf.c] Fix compilation failure (prototype/ 5 - (djm) [openbsd-compat/bsd-snprintf.c] Fix compilation failure (prototype/
6 definition mismatch) and warning for broken/missing snprintf case. 6 definition mismatch) and warning for broken/missing snprintf case.
7 - (djm) [configure.ac] double braces to appease autoconf
7 8
820140821 920140821
9 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too. 10 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.
diff --git a/configure.ac b/configure.ac
index 479d4c71d..d93cc6b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.580 2014/08/22 07:36:20 djm Exp $ 1# $Id: configure.ac,v 1.581 2014/08/22 08:06:21 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.580 $) 18AC_REVISION($Revision: 1.581 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2288,7 +2288,7 @@ AC_RUN_IFELSE(
2288 ssl_library_ver=`cat conftest.ssllibver` 2288 ssl_library_ver=`cat conftest.ssllibver`
2289 # Check version is supported. 2289 # Check version is supported.
2290 case "$ssl_library_ver" in 2290 case "$ssl_library_ver" in
2291 0090[0-7]*|009080[0-5]*) 2291 0090[[0-7]]*|009080[[0-5]]*)
2292 AC_MSG_ERROR([OpenSSL >= 0.9.8f required]) 2292 AC_MSG_ERROR([OpenSSL >= 0.9.8f required])
2293 ;; 2293 ;;
2294 *) ;; 2294 *) ;;