You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/10/13 21:59:17 UTC
cvs commit: httpd-2.0/modules/filters config.m4
jorton 2004/10/13 12:59:17
Modified: modules/filters config.m4
Log:
* modules/filters/config.m4: Drop check for zutil.h. Add -lz to
MOD_DEFLATE_LDADD to correctly support shared mod_deflate against
static zlib (where possible).
Revision Changes Path
1.14 +3 -4 httpd-2.0/modules/filters/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/config.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -d -w -u -r1.13 -r1.14
--- config.m4 8 Jan 2004 20:47:29 -0000 1.13
+++ config.m4 13 Oct 2004 19:59:17 -0000 1.14
@@ -35,7 +35,6 @@
if test "$enable_deflate" != "no"; then
ap_save_includes=$INCLUDES
ap_save_ldflags=$LDFLAGS
- ap_save_libs=$LIBS
ap_save_cppflags=$CPPFLAGS
if test "$ap_zlib_base" != "/usr"; then
APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
@@ -50,12 +49,12 @@
AC_MSG_CHECKING([for zlib library])
AC_TRY_LINK([#include <zlib.h>], [int i = Z_OK;],
[AC_MSG_RESULT(found)
- AC_CHECK_HEADERS(zutil.h)],
+ APR_SETVAR(MOD_DEFLATE_LDADD, [-lz])],
[AC_MSG_RESULT(not found)
enable_deflate=no
INCLUDES=$ap_save_includes
- LDFLAGS=$ap_save_ldflags
- LIBS=$ap_save_libs])
+ LDFLAGS=$ap_save_ldflags])
+ APR_REMOVEFROM(LIBS, [-lz])
CPPFLAGS=$ap_save_cppflags
fi
])