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/mappers config9.m4
Date Tue, 13 May 2003 16:53:08 GMT
trawick     2003/05/13 09:53:07

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/mappers Tag: APACHE_2_0_BRANCH config9.m4
  Log:
  merge this from 2.1-dev:
  
    Fix a problem that caused httpd to be linked with incorrect flags
    on some platforms when mod_so was enabled by default, breaking
    DSOs on AIX.
  
  PR:                 19012
  Reviewed by:	    nd, stoddard
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.91 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.90
  retrieving revision 1.988.2.91
  diff -u -r1.988.2.90 -r1.988.2.91
  --- CHANGES	13 May 2003 16:29:59 -0000	1.988.2.90
  +++ CHANGES	13 May 2003 16:53:04 -0000	1.988.2.91
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.46
   
  +  *) Fix a problem that caused httpd to be linked with incorrect flags
  +     on some platforms when mod_so was enabled by default, breaking 
  +     DSOs on AIX.  PR 19012  [Jeff Trawick]
  +
     *) By default, use the same CC and CPP with which APR was built.
        The user can override with CC and CPP environment variables.
        [Jeff Trawick]
  
  
  
  1.751.2.257 +1 -10     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.256
  retrieving revision 1.751.2.257
  diff -u -r1.751.2.256 -r1.751.2.257
  --- STATUS	13 May 2003 16:35:33 -0000	1.751.2.256
  +++ STATUS	13 May 2003 16:53:05 -0000	1.751.2.257
  @@ -203,15 +203,6 @@
         (the docs should explain the thing better. Currently it's not
          really understandable for users. If nobody else does, nd tries to.)
   
  -    * Fix a problem that caused httpd to be linked with incorrect flags
  -      on some platforms when mod_so was enabled by default, breaking 
  -      DSOs on AIX.  PR 19012
  -      This was new breakage with 2.0.45 that has bit at least a 
  -      handful of vocal people, but there is an easy work-around 
  -      (explicitly add --enable-so).
  -      modules/mappers/config9.m4 r1.16
  -      +1: trawick, nd, stoddard
  -
       * Hook mod_rewrite's type checker before mod_mime's one. That way the
         RewriteRule [T=...] Flag should work as expected now. PR 19626.
         modules/mappers/mod_rewrite.c r1.150
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.4  +22 -13    httpd-2.0/modules/mappers/config9.m4
  
  Index: config9.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/config9.m4,v
  retrieving revision 1.12.2.3
  retrieving revision 1.12.2.4
  diff -u -r1.12.2.3 -r1.12.2.4
  --- config9.m4	11 Mar 2003 16:42:07 -0000	1.12.2.3
  +++ config9.m4	13 May 2003 16:53:07 -0000	1.12.2.4
  @@ -15,25 +15,34 @@
   
   APACHE_MODULE(rewrite, regex URL translation, , , most)
   
  -dnl mod_so should only be built as a static module
  -if test "$enable_so" = "yes"; then
  -    enable_so="static"
  -elif test "$enable_so" = "shared"; then
  -    AC_MSG_ERROR([mod_so can not be built as a shared DSO])
  -fi
   
   APR_CHECK_APR_DEFINE(APR_HAS_DSO)
  -if test $ac_cv_define_APR_HAS_DSO = "no"; then
  -    if test "$enable_so" = "static"; then
  -        AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
  -    elif test "$sharedobjs" = "yes"; then
  +
  +case "x$enable_so" in
  +    "xyes")
  +        if test $ac_cv_define_APR_HAS_DSO = "no"; then
  +            AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
  +        fi
  +        ;;
  +    "xshared")
  +        AC_MSG_ERROR([mod_so can not be built as a shared DSO])
  +        ;;
  +    "xno")
  +        ;;
  +    "x")
  +        enable_so=$ac_cv_define_APR_HAS_DSO
  +        ;;
  +esac
  +
  +if test "$sharedobjs" = "yes"; then
  +    if test $ac_cv_define_APR_HAS_DSO = "no"; then
           AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so
cannot be built])
  -    else
  -        ap_enable_so="no"
  +    elif test $enable_so = "no"; then
  +        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so
was disabled])
       fi
   fi
   
  -APACHE_MODULE(so, DSO capability, , , $ap_enable_so)
  +APACHE_MODULE(so, DSO capability, , , $enable_so)
   
   dnl ### why save the cache?
   AC_CACHE_SAVE
  
  
  

Mime
View raw message