RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [configure.ac] Delay checks for arc4random* until after libcrypto 

has been located; fixes builds agains libressl-portable
This commit is contained in:
Damien Miller 2014-07-15 10:41:38 +10:00
parent 1d0df3249c
commit 00f9cd2307
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
20140715
- (djm) [configure.ac] Delay checks for arc4random* until after libcrypto
has been located; fixes builds agains libressl-portable
20140711 20140711
- OpenBSD CVS Sync - OpenBSD CVS Sync
- benno@cvs.openbsd.org 2014/07/09 14:15:56 - benno@cvs.openbsd.org 2014/07/09 14:15:56

15
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.577 2014/07/03 01:54:19 djm Exp $ # $Id: configure.ac,v 1.578 2014/07/15 00:41:39 djm Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.577 $) AC_REVISION($Revision: 1.578 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -1575,10 +1575,6 @@ AC_CHECK_FUNCS([ \
Blowfish_expandstate \ Blowfish_expandstate \
Blowfish_expand0state \ Blowfish_expand0state \
Blowfish_stream2word \ Blowfish_stream2word \
arc4random \
arc4random_buf \
arc4random_stir \
arc4random_uniform \
asprintf \ asprintf \
b64_ntop \ b64_ntop \
__b64_ntop \ __b64_ntop \
@ -2640,6 +2636,13 @@ fi
AC_SUBST([TEST_SSH_ECC]) AC_SUBST([TEST_SSH_ECC])
AC_SUBST([COMMENT_OUT_ECC]) AC_SUBST([COMMENT_OUT_ECC])
AC_CHECK_FUNCS([ \
arc4random \
arc4random_buf \
arc4random_stir \
arc4random_uniform \
])
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
AC_CHECK_LIB([iaf], [ia_openinfo], [ AC_CHECK_LIB([iaf], [ia_openinfo], [
LIBS="$LIBS -liaf" LIBS="$LIBS -liaf"