httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/modules/mappers config9.m4
Date Wed, 03 Oct 2001 17:47:51 GMT
rbb         01/10/03 10:47:51

  Modified:    .        CHANGES STATUS acinclude.m4
               modules/http config2.m4
               modules/mappers config9.m4
  Log:
  Fix --enable-mods-shared processing.  If most is specified,
  then all modules that can be compiled as shared modules are.  This
  was done by adding a module config specifier, static, which denotes
  that a module can not be compiled as a DSO.
  
  Submitted by:   Aaron Bannert <aaron@clove.org>
  
  Revision  Changes    Path
  1.378     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.377
  retrieving revision 1.378
  diff -u -r1.377 -r1.378
  --- CHANGES	2001/10/02 21:54:28	1.377
  +++ CHANGES	2001/10/03 17:47:50	1.378
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.26-dev
   
  +  *) Fix --enable-mods-shared processing.  If most is specified,
  +     then all modules that can be compiled as shared modules are.
  +     [Aaron Bannert <aaron@clove.org>]
  +
     *) Update the mime.types file to map video/vnd.mpegurl to mxu
        and add commonly used audio/x-mpegurl for m3u extensions.        
        [Heiko Recktenwald <uzs106@uni-bonn.de>, Lars Eilebrecht]
  
  
  
  1.299     +4 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.298
  retrieving revision 1.299
  diff -u -r1.298 -r1.299
  --- STATUS	2001/10/02 21:21:55	1.298
  +++ STATUS	2001/10/03 17:47:50	1.299
  @@ -1,5 +1,5 @@
   APACHE 2.0 STATUS:						-*-text-*-
  -Last modified at [$Date: 2001/10/02 21:21:55 $]
  +Last modified at [$Date: 2001/10/03 17:47:50 $]
   
   Release:
   
  @@ -95,12 +95,9 @@
         to make it agree with the operation of the StartServers
         directive.
   
  -    * configure --enable-mods-shared=most option has issues.  Example: 
  -
  -      ./configure --enable-mods-shared=most
  -
  -        This builds mod_headers as a DSO (good) but builds mod_mime
  -        as a compiled-in module (bad).
  +    * Fix the configure script to add a LoadModule directive to
  +      the default httpd.conf for any module that was compiled
  +      as a DSO.
   
       * revamp the input filter semantics, per discussions since
         February (and especially at the hackathon last
  
  
  
  1.102     +12 -6     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- acinclude.m4	2001/09/30 07:57:14	1.101
  +++ acinclude.m4	2001/10/03 17:47:50	1.102
  @@ -196,10 +196,11 @@
   dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
   dnl
   dnl default is one of:
  -dnl   yes  -- enabled by default. user must explicitly disable.
  -dnl   no   -- disabled under default, most, all. user must explicitly enable.
  -dnl   most -- disabled by default. enabled explicitly or with most or all.
  -dnl   ""   -- disabled under default, most. enabled explicitly or with all.
  +dnl   yes    -- enabled by default. user must explicitly disable.
  +dnl   no     -- disabled under default, most, all. user must explicitly enable.
  +dnl   most   -- disabled by default. enabled explicitly or with most or all.
  +dnl   static -- enabled as static by default, must be explicitly changed.
  +dnl   ""     -- disabled under default, most. enabled explicitly or with all.
   dnl
   dnl basically: yes/no is a hard setting. "most" means follow the "most"
   dnl            setting. otherwise, fall under the "all" setting.
  @@ -218,11 +219,16 @@
     else
       _apmod_error_fatal="yes"
     fi
  -  if test "$enable_$1" = "most"; then
  +  if test "$enable_$1" = "static"; then
  +    enable_$1=yes
  +  elif test "$enable_$1" = "yes"; then
  +    enable_$1=$module_default
  +    _apmod_extra_msg=" ($module_selection)"
  +  elif test "$enable_$1" = "most"; then
       if test "$module_selection" = "most" -o "$module_selection" = "all"; then
         enable_$1=$module_default
         _apmod_extra_msg=" ($module_selection)"
  -    else
  +    elif test "$enable_$1" != "yes"; then
         enable_$1=no
       fi
     elif test "$enable_$1" = "maybe-all"; then
  
  
  
  1.2       +2 -1      httpd-2.0/modules/http/config2.m4
  
  Index: config2.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/config2.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config2.m4	2001/04/18 20:56:04	1.1
  +++ config2.m4	2001/10/03 17:47:51	1.2
  @@ -4,7 +4,8 @@
   
   http_objects="http_core.lo http_protocol.lo http_request.lo"
   
  -APACHE_MODULE(http, HTTP protocol handling, $http_objects, , yes)
  +dnl mod_http freaks out when built as a DSO
  +APACHE_MODULE(http, HTTP protocol handling, $http_objects, , static)
   APACHE_MODULE(mime, mapping of file-extension to MIME, , , yes)
   
   APACHE_MODPATH_FINISH
  
  
  
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- config9.m4	2001/10/03 17:31:13	1.4
  +++ config9.m4	2001/10/03 17:47:51	1.5
  @@ -18,7 +18,7 @@
   ])
   
   if test "$sharedobjs" = "yes"; then
  -    APACHE_MODULE(so, DSO capability, , , yes)
  +    APACHE_MODULE(so, DSO capability, , , static)
   else
       APACHE_MODULE(so, DSO capability, , , no)
   fi
  
  
  

Mime
View raw message