httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0 CHANGES acinclude.m4 configure.in
Date Sat, 17 Feb 2001 23:58:31 GMT
gstein      01/02/17 15:58:31

  Modified:    .        CHANGES acinclude.m4 configure.in
  Log:
  implement ability to do --enable-modules and --enable-mods-shared for "all"
  and "most". still need to tweak various config.m4 files to sort them out.
  
  Revision  Changes    Path
  1.97      +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -u -r1.96 -r1.97
  --- CHANGES	2001/02/16 22:08:10	1.96
  +++ CHANGES	2001/02/17 23:58:30	1.97
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.12-dev
   
  +  *) implement --enable-modules and --enable-mods-shared for "all" and
  +     "most".  [Greg Stein]
  +
     *) Move the threaded MPM to use APR locks instead of pthread locks.
        [Ryan Bloom]
   
  
  
  
  1.66      +56 -19    httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -u -r1.65 -r1.66
  --- acinclude.m4	2001/02/17 11:21:53	1.65
  +++ acinclude.m4	2001/02/17 23:58:30	1.66
  @@ -260,14 +260,42 @@
       fi
     fi
   ])dnl
  +
   dnl
   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
  +dnl basically: yes/no is a hard setting. "most" means follow the "most"
  +dnl            setting. otherwise, fall under the "all" setting.
  +dnl            explicit yes/no always overrides.
  +dnl
   AC_DEFUN(APACHE_MODULE,[
     AC_MSG_CHECKING(whether to enable mod_$1)
     define([optname],[  --]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
  -  AC_ARG_ENABLE(translit($1,_,-),optname() substr([                         ],len(optname()))$2,,enable_$1=ifelse($5,,no,$5))
  +  AC_ARG_ENABLE(translit($1,_,-),optname() substr([                         ],len(optname()))$2,,enable_$1=ifelse($5,,maybe-all,$5))
     undefine([optname])dnl
  -  AC_MSG_RESULT($enable_$1)
  +  _apmod_extra_msg=""
  +  if test "$enable_$1" = "most"; then
  +    if "$module_selection" = "most"; then
  +      $enable_$1=$module_default
  +      _apmod_extra_msg=" (most)"
  +    else
  +      $enable_$1=no
  +    fi
  +  elif test "$enable_$1" = "maybe-all"; then
  +    if "$module_selection" = "all"; then
  +      $enable_$1=$module_default
  +      _apmod_extra_msg=" (all)"
  +    else
  +      $enable_$1=no
  +    fi
  +  fi
  +  AC_MSG_RESULT($enable_$1$_apmod_extra_msg)
     if test "$enable_$1" != "no"; then
       case "$enable_$1" in
       shared*)
  @@ -357,29 +385,38 @@
   
   AC_MSG_CHECKING(for chosen layout)
   AC_MSG_RESULT($layout_name)
  -])dnl
  -dnl
  -dnl APACHE_ENABLE_SHARED
  -dnl
  -AC_DEFUN(APACHE_ENABLE_SHARED,[
  -AC_ARG_ENABLE(mods-shared,
  -[  --enable-mods-shared=MODULE-LIST],[
  -  for i in $enableval; do
  -  	eval "enable_$i=shared"
  -  done
   ])
  -])dnl
  +
   dnl
   dnl APACHE_ENABLE_MODULES
   dnl
   AC_DEFUN(APACHE_ENABLE_MODULES,[
  -AC_ARG_ENABLE(modules,
  -[  --enable-modules=MODULE-LIST],[
  -  for i in $enableval; do
  -    eval "enable_$i=yes"
  -  done
  +  module_selection=default
  +  module_default=yes
  +
  +  AC_ARG_ENABLE(modules,
  +  [  --enable-modules=MODULE-LIST],[
  +    for i in $enableval; do
  +      if test "$i" = "all" -o "$i" = "most"; then
  +        module_selection=$i
  +      else
  +        eval "enable_$i=yes"
  +      fi
  +    done
  +  ])
  +  
  +  AC_ARG_ENABLE(mods-shared,
  +  [  --enable-mods-shared=MODULE-LIST],[
  +    for i in $enableval; do
  +      if test "$i" = "all" -o "$i" = "most"; then
  +        module_selection=$i
  +        module_default=shared
  +      else
  +    	eval "enable_$i=shared"
  +      fi
  +    done
  +  ])
   ])
  -])dnl
   
   AC_DEFUN(APACHE_REQUIRE_CXX,[
     if test -z "$apache_cxx_done"; then
  
  
  
  1.122     +0 -1      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -u -r1.121 -r1.122
  --- configure.in	2001/02/10 18:09:26	1.121
  +++ configure.in	2001/02/17 23:58:30	1.122
  @@ -119,7 +119,6 @@
   
   APACHE_ENABLE_LAYOUT
   APACHE_ENABLE_MODULES
  -APACHE_ENABLE_SHARED
   
   INCLUDES="-I\$(top_srcdir)/include -I\$(top_srcdir)/srclib/apr/include -I\$(top_srcdir)/srclib/apr-util/include"
   if test -n "$USE_VPATH"; then
  
  
  

Mime
View raw message