diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 18:23:38 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-11-05 18:23:38 +1100 |
commit | eab5f0df90cad495ee65abdb557538dbfb625d15 (patch) | |
tree | d93cf676ec18859bee5e6fe5a75b15da761d89a3 /configure.ac | |
parent | b69e033e6704000be33ed6dc47eb9ac28f10b14b (diff) |
- (dtucker) [Makefile configure.ac regress/Makefile regress/keytype.sh]
Import recent changes to regress/Makefile, pass a flag to enable ECC tests
from configure through to regress/Makefile and use it in the tests.
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 39b68c70a..97d4e6bdb 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.456 2010/11/05 01:03:05 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.457 2010/11/05 07:23:38 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 | ||
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.456 $) | 18 | AC_REVISION($Revision: 1.457 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -2209,11 +2209,14 @@ int main(void) { | |||
2209 | AC_MSG_RESULT(yes) | 2209 | AC_MSG_RESULT(yes) |
2210 | AC_DEFINE(OPENSSL_HAS_ECC, 1, | 2210 | AC_DEFINE(OPENSSL_HAS_ECC, 1, |
2211 | [libcrypto includes complete ECC support]) | 2211 | [libcrypto includes complete ECC support]) |
2212 | TEST_SSH_ECC=yes | ||
2212 | ], | 2213 | ], |
2213 | [ | 2214 | [ |
2214 | AC_MSG_RESULT(no) | 2215 | AC_MSG_RESULT(no) |
2216 | TEST_SSH_ECC=no | ||
2215 | ] | 2217 | ] |
2216 | ) | 2218 | ) |
2219 | AC_SUBST(TEST_SSH_ECC) | ||
2217 | 2220 | ||
2218 | saved_LIBS="$LIBS" | 2221 | saved_LIBS="$LIBS" |
2219 | AC_CHECK_LIB(iaf, ia_openinfo, [ | 2222 | AC_CHECK_LIB(iaf, ia_openinfo, [ |