diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 24 |
2 files changed, 24 insertions, 5 deletions
@@ -9,7 +9,8 @@ | |||
9 | adress -> address, and a few more; all from Jonathon Gray; | 9 | adress -> address, and a few more; all from Jonathon Gray; |
10 | - djm@cvs.openbsd.org 2004/01/13 09:49:06 | 10 | - djm@cvs.openbsd.org 2004/01/13 09:49:06 |
11 | [sftp-batch.sh] | 11 | [sftp-batch.sh] |
12 | don't delete thyself when running without obj/ ; ok markus@ | 12 | - (dtucker) [configure.ac] Add --without-zlib-version-check. Feedback from |
13 | tim@, ok several | ||
13 | 14 | ||
14 | 20040128 | 15 | 20040128 |
15 | - (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@ | 16 | - (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@ |
@@ -1779,4 +1780,4 @@ | |||
1779 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1780 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1780 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1781 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1781 | 1782 | ||
1782 | $Id: ChangeLog,v 1.3202 2004/01/30 02:02:55 dtucker Exp $ | 1783 | $Id: ChangeLog,v 1.3203 2004/01/30 03:20:59 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 3b04182d5..c037ee7c8 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.189 2004/01/27 03:03:39 tim Exp $ | 1 | # $Id: configure.ac,v 1.190 2004/01/30 03:20:59 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -580,6 +580,15 @@ AC_CHECK_LIB(z, deflate, , | |||
580 | ] | 580 | ] |
581 | ) | 581 | ) |
582 | AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***])) | 582 | AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***])) |
583 | |||
584 | AC_ARG_WITH(zlib-version-check, | ||
585 | [ --without-zlib-version-check Disable zlib version check], | ||
586 | [ if test "x$withval" = "xno" ; then | ||
587 | zlib_check_nonfatal=1 | ||
588 | fi | ||
589 | ] | ||
590 | ) | ||
591 | |||
583 | AC_MSG_CHECKING(for zlib 1.1.4 or greater) | 592 | AC_MSG_CHECKING(for zlib 1.1.4 or greater) |
584 | AC_TRY_RUN([ | 593 | AC_TRY_RUN([ |
585 | #include <zlib.h> | 594 | #include <zlib.h> |
@@ -596,9 +605,18 @@ int main() | |||
596 | ], | 605 | ], |
597 | AC_MSG_RESULT(yes), | 606 | AC_MSG_RESULT(yes), |
598 | [ AC_MSG_RESULT(no) | 607 | [ AC_MSG_RESULT(no) |
599 | AC_MSG_ERROR([*** zlib too old - check config.log ***]) ] | 608 | if test -z "$zlib_check_nonfatal" ; then |
609 | AC_MSG_ERROR([*** zlib too old - check config.log *** | ||
610 | Your reported zlib version has known security problems. It's possible your | ||
611 | vendor has fixed these problems without changing the version number. If you | ||
612 | are sure this is the case, you can disable the check by running | ||
613 | "./configure --without-zlib-version-check". | ||
614 | If you are in doubt, upgrade zlib to version 1.1.4 or greater.]) | ||
615 | else | ||
616 | AC_MSG_WARN([zlib version may have security problems]) | ||
617 | fi | ||
618 | ] | ||
600 | ) | 619 | ) |
601 | |||
602 | 620 | ||
603 | dnl UnixWare 2.x | 621 | dnl UnixWare 2.x |
604 | AC_CHECK_FUNC(strcasecmp, | 622 | AC_CHECK_FUNC(strcasecmp, |