summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2011-01-16 18:28:09 +1100
committerDarren Tucker <dtucker@zip.com.au>2011-01-16 18:28:09 +1100
commit50c61f88abdb356d45026dc1427ddb461b626e45 (patch)
tree87eab3a214fc0da27482b46dcce30bc7fe634774 /configure.ac
parent08f83883f518fa0e9765ed25ae6c19e279633ea9 (diff)
- (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based
on configurations that don't have it.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 3d4d11c92..1817dd909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.464 2011/01/13 06:35:46 tim Exp $ 1# $Id: configure.ac,v 1.465 2011/01/16 07:28:12 dtucker 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.464 $) 18AC_REVISION($Revision: 1.465 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21# local macros 21# local macros
@@ -2239,7 +2239,9 @@ if test "x$check_for_libcrypt_later" = "x1"; then
2239fi 2239fi
2240 2240
2241# Search for SHA256 support in libc and/or OpenSSL 2241# Search for SHA256 support in libc and/or OpenSSL
2242AC_CHECK_FUNCS(SHA256_Update EVP_sha256) 2242AC_CHECK_FUNCS(SHA256_Update EVP_sha256, [TEST_SSH_SHA256=yes],
2243 [TEST_SSH_SHA256=no])
2244AC_SUBST(TEST_SSH_SHA256)
2243 2245
2244# Check complete ECC support in OpenSSL 2246# Check complete ECC support in OpenSSL
2245AC_MSG_CHECKING([whether OpenSSL has complete ECC support]) 2247AC_MSG_CHECKING([whether OpenSSL has complete ECC support])