Commit f477bcc9 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91262 13f79535-47bb-0310-9956-ffa450edef68
parent 90823544

CHANGES

+4 −0
Original line number Diff line number Diff line 
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]

STATUS

+4 −7
Original line number Diff line number Diff line 
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 @@ RELEASE SHOWSTOPPERS: 
      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

acinclude.m4

+12 −6
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ 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   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"
@@ -218,11 +219,16 @@ AC_DEFUN(APACHE_MODULE,[ 
  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

modules/http/config2.m4

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ APACHE_MODPATH_INIT(http) 


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

modules/mappers/config9.m4

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ APACHE_MODULE(rewrite, regex URL translation, , , most, [ 
])



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