diff options
author | Tim Rice <tim@multitalents.net> | 2011-01-12 22:35:43 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2011-01-12 22:35:43 -0800 |
commit | 9b87a5ce3ca693c257c6097fb4c6906910b1900b (patch) | |
tree | f44f6a65a6661ef7be852b6e00ca0610f37a1030 /configure.ac | |
parent | cce927c25f93596a62b6d45c61a9d7fddf3d35c2 (diff) |
- (tim) [Makefile.in configure.ac opensshd.init.in] Add support for generating
ecdsa keys. ok djm.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 93dd22174..3d4d11c92 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.463 2011/01/12 05:00:39 djm Exp $ | 1 | # $Id: configure.ac,v 1.464 2011/01/13 06:35:46 tim 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 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.463 $) | 18 | AC_REVISION($Revision: 1.464 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | # local macros | 21 | # local macros |
@@ -2258,13 +2258,16 @@ int main(void) { | |||
2258 | AC_DEFINE(OPENSSL_HAS_ECC, 1, | 2258 | AC_DEFINE(OPENSSL_HAS_ECC, 1, |
2259 | [libcrypto includes complete ECC support]) | 2259 | [libcrypto includes complete ECC support]) |
2260 | TEST_SSH_ECC=yes | 2260 | TEST_SSH_ECC=yes |
2261 | COMMENT_OUT_ECC="" | ||
2261 | ], | 2262 | ], |
2262 | [ | 2263 | [ |
2263 | AC_MSG_RESULT(no) | 2264 | AC_MSG_RESULT(no) |
2264 | TEST_SSH_ECC=no | 2265 | TEST_SSH_ECC=no |
2266 | COMMENT_OUT_ECC="#no ecc#" | ||
2265 | ] | 2267 | ] |
2266 | ) | 2268 | ) |
2267 | AC_SUBST(TEST_SSH_ECC) | 2269 | AC_SUBST(TEST_SSH_ECC) |
2270 | AC_SUBST(COMMENT_OUT_ECC) | ||
2268 | 2271 | ||
2269 | saved_LIBS="$LIBS" | 2272 | saved_LIBS="$LIBS" |
2270 | AC_CHECK_LIB(iaf, ia_openinfo, [ | 2273 | AC_CHECK_LIB(iaf, ia_openinfo, [ |