httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers config9.m4
Date Wed, 24 Oct 2001 17:20:44 GMT
aaron       01/10/24 10:20:44

  Modified:    .        CHANGES STATUS
               modules/mappers config9.m4
  Log:
  Two more mod_so configure-time fixes:
   - Treat --enable-so=yes as "static" (this includes --enable-so, etc).
   - An explicit --enable-so=shared issues an error.
  
  Put in a note about the last condition that I'm not as sure how to fix:
  If the user doesn't explicitly request mod_so, but instead gives a
  mass-enable parameter like --enable-modules=most or
  --enable-mods-shared=most then it is still possible to enable a bunch
  of modules while mod_so itself is not buildable (ie no APR_HAS_DSO or
  other build dependency failure).
  
  Revision  Changes    Path
  1.404     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.403
  retrieving revision 1.404
  diff -u -r1.403 -r1.404
  --- CHANGES	2001/10/24 15:33:16	1.403
  +++ CHANGES	2001/10/24 17:20:44	1.404
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.27-dev
   
  +  *) Various --enable-so options have been fixed: --enable-so is
  +     treated as "static"; explicit --enable-so=shared issues an error;
  +     and explicit --enable-so fails with error on systems without
  +     APR_HAS_DSO.  [Aaron Bannert]
  +
     *) Fix a segfault in the core input filter when the client socket
        gets disconnected unexpectedly.  [Cliff Woolley]
   
  
  
  
  1.317     +7 -1      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.316
  retrieving revision 1.317
  diff -u -r1.316 -r1.317
  --- STATUS	2001/10/22 12:46:29	1.316
  +++ STATUS	2001/10/24 17:20:44	1.317
  @@ -1,5 +1,5 @@
   APACHE 2.0 STATUS:						-*-text-*-
  -Last modified at [$Date: 2001/10/22 12:46:29 $]
  +Last modified at [$Date: 2001/10/24 17:20:44 $]
   
   Release:
   
  @@ -283,6 +283,12 @@
           randomization in APR itself.
           - Bring the Win9xConHook.dll from 1.3 into 2.0 (no sense till it
           actually works) and add in a splash of Win9x service code.
  +
  +    * When --enable-modules=most or --enable-mods-shared=most is passed
  +      to the configure script it is still possible to enable many of the
  +      modules while mod_so itself is not buildable (for whatever reason,
  +      like not having APR_HAS_DSO). We need to emit an error message
  +      and fail the configure script at this point.
   
   PRs that have been suspended forever waiting for someone to
   put them into 'the next release':
  
  
  
  1.9       +8 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- config9.m4	2001/10/23 23:13:27	1.8
  +++ config9.m4	2001/10/24 17:20:44	1.9
  @@ -17,6 +17,13 @@
     APR_ADDTO(CFLAGS,-DNO_DBM_REWRITEMAP)
   ])
   
  +dnl mod_so should only be built as a static DSO
  +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
  +
   ap_old_cppflags=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
   AC_TRY_COMPILE([#include <apr.h>], [
  @@ -24,7 +31,7 @@
   #error You need APR DSO support to use mod_so. 
   #endif
   ], ap_enable_so="static", [
  -if test "$enable_so" = "yes" -o "$enable_so" = "static" -o "$enable_so" = "shared"; then
  +if test "$enable_so" = "static"; then
       AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
   else
       ap_enable_so="no"
  
  
  

Mime
View raw message