tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac] Check for headers before libraries for openssl an 

zlib, which should make the errors slightly more meaningful on platforms
   where there's separate "-devel" packages for those.
This commit is contained in:
Darren Tucker 2009-08-17 09:35:22 +10:00
parent caeb164984
commit 83d8f28336
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
20090817
- (dtucker) [configure.ac] Check for headers before libraries for openssl an
zlib, which should make the errors slightly more meaningful on platforms
where there's separate "-devel" packages for those.
20090729 20090729
- (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
function. Patch from Corinna Vinschen. function. Patch from Corinna Vinschen.

8
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.421 2009/07/12 11:56:29 dtucker Exp $ # $Id: configure.ac,v 1.422 2009/08/16 23:35:22 dtucker 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.421 $) AC_REVISION($Revision: 1.422 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -982,6 +982,7 @@ AC_ARG_WITH(zlib,
fi ] fi ]
) )
AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
AC_CHECK_LIB(z, deflate, , AC_CHECK_LIB(z, deflate, ,
[ [
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
@ -1002,7 +1003,6 @@ AC_CHECK_LIB(z, deflate, ,
) )
] ]
) )
AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
AC_ARG_WITH(zlib-version-check, AC_ARG_WITH(zlib-version-check,
[ --without-zlib-version-check Disable zlib version check], [ --without-zlib-version-check Disable zlib version check],
@ -1895,6 +1895,8 @@ AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL, 1,
LDFLAGS="-L/usr/local/ssl/lib ${saved_LDFLAGS}" LDFLAGS="-L/usr/local/ssl/lib ${saved_LDFLAGS}"
fi fi
CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}" CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
AC_CHECK_HEADER([openssl/opensslv.h], ,
AC_MSG_ERROR([*** OpenSSL headers missing - please install first or check config.log ***]))
AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL), AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
[ [
AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***]) AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***])