From 718469e240675b161006ee4f2d5d52de9ad14f2f Mon Sep 17 00:00:00 2001 From: Pixel Date: Sun, 13 Jan 2002 15:42:03 +0000 Subject: Zlib test & patch. --- acconfig.h | 1 + configure.in | 19 ++++++++++++++++++- zconf.h-patch | 13 +++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 zconf.h-patch diff --git a/acconfig.h b/acconfig.h index d4dba2c..62df7e4 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,3 +1,4 @@ +#undef HAVE_WD_ZLIB #undef HAVE_LIBINTL_H /* Define to 1 if NLS is requested. */ diff --git a/configure.in b/configure.in index da4182e..ff5eaec 100644 --- a/configure.in +++ b/configure.in @@ -80,7 +80,24 @@ AC_CHECK_FUNCS(getcwd getwd putenv strdup memmove memset select poll) AC_CHECK_FUNCS(strerror strrchr strstr mempcpy nl_langinfo strcspn) AC_SEARCH_LIBS(socket,socket) AC_SEARCH_LIBS(gethostbyname,nsl) -AC_SEARCH_LIBS(deflate,z) +AC_SEARCH_LIBS(gzwrite,z) +if test x$ac_cv_search_deflate != xno ; then + AC_CACHE_CHECK([for well defined gzwrite in zlib.h], ac_cv_wd_gzwrite, + AC_TRY_COMPILE( + [#include ], + [const void * buf; gzwrite(NULL, buf, 0);], + [AC_DEFINE(HAVE_WD_ZLIB) + ac_cv_wd_gzwrite="yes"], + [ac_cv_wd_gzwrite="no"] + AC_ERROR([You have a broken zconf.h and compiler pair. You] + [should patch this using the zconf.h-patch file.]) + ) + ) +else + AC_ERROR([This library needs the zlib library. You can found] + [it at the url: http://www.zlib.org]) +fi + AC_FUNC_FORK AC_FUNC_MALLOC AC_FUNC_VPRINTF diff --git a/zconf.h-patch b/zconf.h-patch new file mode 100644 index 0000000..c0c872f --- /dev/null +++ b/zconf.h-patch @@ -0,0 +1,13 @@ +--- zconf.h Wed Jul 8 19:55:27 1998 ++++ zconf.h Thu Dec 6 00:55:46 2001 +@@ -228,8 +228,8 @@ + typedef uLong FAR uLongf; + + #ifdef STDC +- typedef void FAR *voidpf; +- typedef void *voidp; ++# define voidpf void FAR * ++# define voidp void * + #else + typedef Byte FAR *voidpf; + typedef Byte *voidp; -- cgit v1.2.3