summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac7
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b77506e5..b82468258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,8 @@
87 Zap extra whitespace. 87 Zap extra whitespace.
88 88
89 OK from djm@ and dtucker@ 89 OK from djm@ and dtucker@
90 - (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write
91 portability glue to support building without libcrypto
90 92
9120140430 9320140430
92 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already 94 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
diff --git a/configure.ac b/configure.ac
index 7c6ce08d8..2a30eec60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.571 2014/02/21 17:09:34 tim Exp $ 1# $Id: configure.ac,v 1.572 2014/05/15 04:43:38 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.571 $) 18AC_REVISION($Revision: 1.572 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2357,6 +2357,9 @@ AC_RUN_IFELSE(
2357 ] 2357 ]
2358) 2358)
2359 2359
2360# XXX make --without-openssl work
2361AC_DEFINE_UNQUOTED([WITH_OPENSSL], [1], [use libcrypto for cryptography])
2362
2360AC_ARG_WITH([openssl-header-check], 2363AC_ARG_WITH([openssl-header-check],
2361 [ --without-openssl-header-check Disable OpenSSL version consistency check], 2364 [ --without-openssl-header-check Disable OpenSSL version consistency check],
2362 [ if test "x$withval" = "xno" ; then 2365 [ if test "x$withval" = "xno" ; then