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] Add --without-zlib-version-check. Feedback from 

tim@, ok several
This commit is contained in:
Darren Tucker 2004-01-30 14:20:59 +11:00
parent 46662bfc21
commit dcc736b7de
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -9,7 +9,8 @@
adress -> address, and a few more; all from Jonathon Gray; adress -> address, and a few more; all from Jonathon Gray;
- djm@cvs.openbsd.org 2004/01/13 09:49:06 - djm@cvs.openbsd.org 2004/01/13 09:49:06
[sftp-batch.sh] [sftp-batch.sh]
don't delete thyself when running without obj/ ; ok markus@ - (dtucker) [configure.ac] Add --without-zlib-version-check. Feedback from
tim@, ok several
20040128 20040128
- (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@ - (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@
@ -1779,4 +1780,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3202 2004/01/30 02:02:55 dtucker Exp $ $Id: ChangeLog,v 1.3203 2004/01/30 03:20:59 dtucker Exp $

24
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.189 2004/01/27 03:03:39 tim Exp $ # $Id: configure.ac,v 1.190 2004/01/30 03:20:59 dtucker Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -580,6 +580,15 @@ AC_CHECK_LIB(z, deflate, ,
] ]
) )
AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***])) AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
AC_ARG_WITH(zlib-version-check,
[ --without-zlib-version-check Disable zlib version check],
[ if test "x$withval" = "xno" ; then
zlib_check_nonfatal=1
fi
]
)
AC_MSG_CHECKING(for zlib 1.1.4 or greater) AC_MSG_CHECKING(for zlib 1.1.4 or greater)
AC_TRY_RUN([ AC_TRY_RUN([
#include <zlib.h> #include <zlib.h>
@ -596,9 +605,18 @@ int main()
], ],
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes),
[ AC_MSG_RESULT(no) [ AC_MSG_RESULT(no)
AC_MSG_ERROR([*** zlib too old - check config.log ***]) ] if test -z "$zlib_check_nonfatal" ; then
AC_MSG_ERROR([*** zlib too old - check config.log ***
Your reported zlib version has known security problems. It's possible your
vendor has fixed these problems without changing the version number. If you
are sure this is the case, you can disable the check by running
"./configure --without-zlib-version-check".
If you are in doubt, upgrade zlib to version 1.1.4 or greater.])
else
AC_MSG_WARN([zlib version may have security problems])
fi
]
) )
dnl UnixWare 2.x dnl UnixWare 2.x
AC_CHECK_FUNC(strcasecmp, AC_CHECK_FUNC(strcasecmp,