2 files changed, 24 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 395508ecd..042dfb473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
  - (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect
    Kerberos location (and thus work with Fedora Core 1);
    from jason AT devrandom.org
+ - (dtucker) [configure.ac] Bug #788: Test for zlib.h presence and for
+   zlib >= 1.1.4.  Partly from jbasney at ncsa.uiuc.edu.  ok djm@
 
 20040122
  - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/
@@ -1716,4 +1718,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3182 2004/01/23 05:30:03 djm Exp $
+$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 @@
-# $Id: configure.ac,v 1.185 2004/01/22 01:05:35 dtucker Exp $
+# $Id: configure.ac,v 1.186 2004/01/23 06:13:33 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -588,6 +588,26 @@ AC_ARG_WITH(zlib,
 )
 
 AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib 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_MSG_CHECKING(for zlib 1.1.4 or greater)
+AC_TRY_RUN([
+#include <zlib.h>
+int main()
+{
+        int a, b, c, v;
+        if (sscanf(ZLIB_VERSION, "%d.%d.%d", &a, &b, &c) != 3)
+                exit(1);
+        v = a*1000000 + b*1000 + c;
+        if (v >= 1001004)
+                exit(0);
+        exit(2);
+}
+        ],
+        AC_MSG_RESULT(yes),
+        [ AC_MSG_RESULT(no)
+          AC_MSG_ERROR([*** zlib too old - check config.log ***]) ]
+)
+        
 
 dnl UnixWare 2.x
 AC_CHECK_FUNC(strcasecmp,