diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 22 |
2 files changed, 24 insertions, 2 deletions
@@ -4,6 +4,8 @@ | |||
4 | - (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect | 4 | - (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect |
5 | Kerberos location (and thus work with Fedora Core 1); | 5 | Kerberos location (and thus work with Fedora Core 1); |
6 | from jason AT devrandom.org | 6 | from jason AT devrandom.org |
7 | - (dtucker) [configure.ac] Bug #788: Test for zlib.h presence and for | ||
8 | zlib >= 1.1.4. Partly from jbasney at ncsa.uiuc.edu. ok djm@ | ||
7 | 9 | ||
8 | 20040122 | 10 | 20040122 |
9 | - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ | 11 | - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ |
@@ -1716,4 +1718,4 @@ | |||
1716 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1718 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1717 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1719 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1718 | 1720 | ||
1719 | $Id: ChangeLog,v 1.3182 2004/01/23 05:30:03 djm Exp $ | 1721 | $Id: ChangeLog,v 1.3183 2004/01/23 06:13:33 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 5b094ba6c..c98332ac2 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.185 2004/01/22 01:05:35 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.186 2004/01/23 06:13:33 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -588,6 +588,26 @@ AC_ARG_WITH(zlib, | |||
588 | ) | 588 | ) |
589 | 589 | ||
590 | AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***])) | 590 | AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***])) |
591 | AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***])) | ||
592 | AC_MSG_CHECKING(for zlib 1.1.4 or greater) | ||
593 | AC_TRY_RUN([ | ||
594 | #include <zlib.h> | ||
595 | int main() | ||
596 | { | ||
597 | int a, b, c, v; | ||
598 | if (sscanf(ZLIB_VERSION, "%d.%d.%d", &a, &b, &c) != 3) | ||
599 | exit(1); | ||
600 | v = a*1000000 + b*1000 + c; | ||
601 | if (v >= 1001004) | ||
602 | exit(0); | ||
603 | exit(2); | ||
604 | } | ||
605 | ], | ||
606 | AC_MSG_RESULT(yes), | ||
607 | [ AC_MSG_RESULT(no) | ||
608 | AC_MSG_ERROR([*** zlib too old - check config.log ***]) ] | ||
609 | ) | ||
610 | |||
591 | 611 | ||
592 | dnl UnixWare 2.x | 612 | dnl UnixWare 2.x |
593 | AC_CHECK_FUNC(strcasecmp, | 613 | AC_CHECK_FUNC(strcasecmp, |