summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-15 11:51:08 +1000
committerDamien Miller <djm@mindrot.org>2014-07-15 11:51:08 +1000
commit965add60105130bea29776762e7b937a91aef870 (patch)
treea21b575c8ca1218bbecdc47bb1b2d5b023230092
parent5618210618256bbf5f4f71b2887ff186fd451736 (diff)
- (djm) [configure.ac] Delay checks for arc4random* until after libcryptoV_6_6
has been located; fixes builds agains libressl-portable
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac15
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 60f181a6..25961708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20140715
+ - (djm) [configure.ac] Delay checks for arc4random* until after libcrypto
+ has been located; fixes builds agains libressl-portable
+
20140420
- (djm) [bufaux.c compat.c compat.h sshconnect2.c sshd.c version.h]
OpenSSH 6.5 and 6.6 sometimes encode a value used in the curve25519
diff --git a/configure.ac b/configure.ac
index 7c6ce08d..1bf20059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.571 2014/02/21 17:09:34 tim Exp $
+# $Id: configure.ac,v 1.571.2.1 2014/07/15 01:51:09 djm Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.571 $)
+AC_REVISION($Revision: 1.571.2.1 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@@ -1631,10 +1631,6 @@ AC_CHECK_FUNCS([ \
Blowfish_expandstate \
Blowfish_expand0state \
Blowfish_stream2word \
- arc4random \
- arc4random_buf \
- arc4random_stir \
- arc4random_uniform \
asprintf \
b64_ntop \
__b64_ntop \
@@ -2685,6 +2681,13 @@ fi
AC_SUBST([TEST_SSH_ECC])
AC_SUBST([COMMENT_OUT_ECC])
+AC_CHECK_FUNCS([ \
+ arc4random \
+ arc4random_buf \
+ arc4random_stir \
+ arc4random_uniform \
+])
+
saved_LIBS="$LIBS"
AC_CHECK_LIB([iaf], [ia_openinfo], [
LIBS="$LIBS -liaf"