* 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).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105445 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 89b564cdb13162164cb99eb8092b1071317fb9f5..a481e4037004a8ad0ffe7a7e5536e119cdeffdef 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -35,7 +35,6 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
   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 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
     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
 ])