You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by rj...@apache.org on 2011/07/04 18:20:33 UTC

svn commit: r1142726 - /httpd/httpd/trunk/modules/filters/config.m4

Author: rjung
Date: Mon Jul  4 16:20:33 2011
New Revision: 1142726

URL: http://svn.apache.org/viewvc?rev=1142726&view=rev
Log:
Reset LDFLAGS after zlib testing for mod_deflate.

Library flags are kept in MOD_DEFLATE_LDADD, not
globally in LDFLAGS.

Modified:
    httpd/httpd/trunk/modules/filters/config.m4

Modified: httpd/httpd/trunk/modules/filters/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/config.m4?rev=1142726&r1=1142725&r2=1142726&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/config.m4 (original)
+++ httpd/httpd/trunk/modules/filters/config.m4 Mon Jul  4 16:20:33 2011
@@ -75,10 +75,10 @@ APACHE_MODULE(deflate, Deflate transfer 
      APR_SETVAR(MOD_DEFLATE_LDADD, [$ap_zlib_ldflags -lz])],
     [AC_MSG_RESULT(not found)
      enable_deflate=no
-     INCLUDES=$ap_save_includes
-     LDFLAGS=$ap_save_ldflags])
-    APR_REMOVEFROM(LIBS, [-lz])
+     INCLUDES=$ap_save_includes])
+    LDFLAGS=$ap_save_ldflags
     CPPFLAGS=$ap_save_cppflags
+    APR_REMOVEFROM(LIBS, [-lz])
   fi
 ])