httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental config.m4
Date Fri, 14 Dec 2001 02:48:23 GMT
trawick     01/12/13 18:48:23

  Modified:    modules/experimental config.m4
  Log:
  include directories should be added to INCLUDES, not CPPFLAGS
  (like it was origintally)...  since AC_TRY_LINK() references
  CPPFLAGS but not INCLUDES, we'll add the zlib include directory
  to CPPFLAGS *temporarily*
  
  Revision  Changes    Path
  1.18      +5 -1      httpd-2.0/modules/experimental/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/config.m4,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- config.m4	2001/12/09 03:32:02	1.17
  +++ config.m4	2001/12/14 02:48:23	1.18
  @@ -52,8 +52,11 @@
       ap_save_includes=$INCLUDE
       ap_save_ldflags=$LDFLAGS
       ap_save_libs=$LIBS
  +    ap_save_cppflags=$CPPFLAGS
       if test "$ap_zlib_base" != "/usr"; then
  -      APR_ADDTO(CPPFLAGS, [-I${ap_zlib_base}/include])
  +      APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
  +      dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work
  +      CPPFLAGS="$CPPFLAGS -I${ap_zlib_base}/include"
         APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib])
         if test "x$ap_platform_runtime_link_flag" != "x"; then
            APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_Base}/lib])
  @@ -69,6 +72,7 @@
        INCLUDES=$ap_save_includes
        LDFLAGS=$ap_save_ldflags
        LIBS=$ap_save_libs])
  +    CPPFLAGS=$ap_save_cppflags
     fi
   ])
   
  
  
  

Mime
View raw message