cvs commit: apache-2.0/src/modules/standard config.m4

[ji...@locus.apache.org]

jim         00/04/30 08:19:31

  Modified:    src      acinclude.m4
               src/modules/standard config.m4
  Log:
  Allow for help messages for modules.
  
  Revision  Changes    Path
  1.25      +1 -1      apache-2.0/src/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- acinclude.m4	2000/04/29 23:57:53	1.24
  +++ acinclude.m4	2000/04/30 15:19:29	1.25
  @@ -287,7 +287,7 @@
   dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
   AC_DEFUN(APACHE_MODULE,[
     AC_MSG_CHECKING(whether to enable mod_$1)
  -  AC_ARG_ENABLE(translit($1,_,-),[  --]ifelse($5,yes,disable,enable)[-]translit($1,_,-),,enable_$1=ifelse($5,,no,$5))
  +  AC_ARG_ENABLE(translit($1,_,-),[  --]ifelse($5,yes,disable,enable)[-]translit($1,_,-)    $2,,enable_$1=ifelse($5,,no,$5))
     AC_MSG_RESULT($enable_$1)
     if test "$enable_$1" != "no"; then
       case "$enable_$1" in
  
  
  
  1.14      +34 -35    apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- config.m4	2000/04/05 17:27:57	1.13
  +++ config.m4	2000/04/30 15:19:30	1.14
  @@ -1,59 +1,58 @@
   dnl modules enabled in this directory by default
   
   dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
  -dnl XXX - Need to add help text to --enable-module flags
   dnl XXX - Need to allow --enable-module to fail if optional config fails
   
   AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
  -  APACHE_MODULE($1,,,$2,$3,$4)
  +  APACHE_MODULE($1,$2,,$3,$4,$5)
   ])
   
   APACHE_MODPATH_INIT(standard)
   
  -APACHE_MODULE(vhost_alias,blabla)
  +dnl APACHE_MODULE(vhost_alias,blabla)
   	
  -dnl APACHE_CHECK_STANDARD_MODULE(vhost_alias, , no)
  -APACHE_CHECK_STANDARD_MODULE(env, , yes)
  -APACHE_CHECK_STANDARD_MODULE(log_config, config_log, yes)
  -APACHE_CHECK_STANDARD_MODULE(mime_magic, , no)
  -APACHE_CHECK_STANDARD_MODULE(mime, , yes)
  -APACHE_CHECK_STANDARD_MODULE(negotiation, , yes)
  -APACHE_CHECK_STANDARD_MODULE(status, , no)
  -APACHE_CHECK_STANDARD_MODULE(include, includes, yes)
  -APACHE_CHECK_STANDARD_MODULE(autoindex, , yes)
  -APACHE_CHECK_STANDARD_MODULE(dir, , yes)
  -APACHE_CHECK_STANDARD_MODULE(cgi, , yes)
  -APACHE_CHECK_STANDARD_MODULE(asis, , yes)
  -APACHE_CHECK_STANDARD_MODULE(imap, , yes)
  -APACHE_CHECK_STANDARD_MODULE(actions, action, yes)
  -APACHE_CHECK_STANDARD_MODULE(speling, , no)
  -APACHE_CHECK_STANDARD_MODULE(userdir, , yes)
  -APACHE_CHECK_STANDARD_MODULE(alias, , yes)
  -APACHE_CHECK_STANDARD_MODULE(rewrite, , no)
  -APACHE_CHECK_STANDARD_MODULE(access, , yes)
  -APACHE_CHECK_STANDARD_MODULE(auth, , yes)
  -APACHE_CHECK_STANDARD_MODULE(auth_anon, , no)
  -APACHE_CHECK_STANDARD_MODULE(auth_dbm, , no)
  +APACHE_CHECK_STANDARD_MODULE(vhost_alias, mass hosting module, , no)
  +APACHE_CHECK_STANDARD_MODULE(env, clearing/setting of ENV vars, , yes)
  +APACHE_CHECK_STANDARD_MODULE(log_config, logging configuration, config_log, yes)
  +APACHE_CHECK_STANDARD_MODULE(mime_magic, automagically determining MIME type, , no)
  +APACHE_CHECK_STANDARD_MODULE(mime, mapping of file-extension to MIME, , yes)
  +APACHE_CHECK_STANDARD_MODULE(negotiation, content negoatiation, , yes)
  +APACHE_CHECK_STANDARD_MODULE(status, process/thread monitoring, , no)
  +APACHE_CHECK_STANDARD_MODULE(include, Server Side Includes, includes, yes)
  +APACHE_CHECK_STANDARD_MODULE(autoindex, directory listing, , yes)
  +APACHE_CHECK_STANDARD_MODULE(dir, directory request handling, , yes)
  +APACHE_CHECK_STANDARD_MODULE(cgi, CGI scripts, , yes)
  +APACHE_CHECK_STANDARD_MODULE(asis, as-is filetypes, , yes)
  +APACHE_CHECK_STANDARD_MODULE(imap, internal imagemaps, , yes)
  +APACHE_CHECK_STANDARD_MODULE(actions, Action triggering on requests, action, yes)
  +APACHE_CHECK_STANDARD_MODULE(speling, correct common URL misspellings, , no)
  +APACHE_CHECK_STANDARD_MODULE(userdir, mapping of user requests, , yes)
  +APACHE_CHECK_STANDARD_MODULE(alias, translation of requests, , yes)
  +APACHE_CHECK_STANDARD_MODULE(rewrite, regex URL translation, , no)
  +APACHE_CHECK_STANDARD_MODULE(access, host-based access control, , yes)
  +APACHE_CHECK_STANDARD_MODULE(auth, user-based access control, , yes)
  +APACHE_CHECK_STANDARD_MODULE(auth_anon, anonymous user access, , no)
  +APACHE_CHECK_STANDARD_MODULE(auth_dbm, DBM-based access databases, , no)
   
  -APACHE_CHECK_STANDARD_MODULE(auth_db, , no, [
  +APACHE_CHECK_STANDARD_MODULE(auth_db, DB-based access databases, , no, [
     AC_CHECK_HEADERS(db.h)
     AC_CHECK_LIB(db,main)
   ]) 
   
  -APACHE_CHECK_STANDARD_MODULE(auth_digest, , no)
  -APACHE_CHECK_STANDARD_MODULE(cern_meta, , no)
  -APACHE_CHECK_STANDARD_MODULE(expires, , no)
  -APACHE_CHECK_STANDARD_MODULE(headers, , no)
  +APACHE_CHECK_STANDARD_MODULE(auth_digest, digests, , no)
  +APACHE_CHECK_STANDARD_MODULE(cern_meta, CERN-type meta files, , no)
  +APACHE_CHECK_STANDARD_MODULE(expires, Expires header control, , no)
  +APACHE_CHECK_STANDARD_MODULE(headers, HTTP header control, , no)
   
  -APACHE_CHECK_STANDARD_MODULE(usertrack, , no, [
  +APACHE_CHECK_STANDARD_MODULE(usertrack, user-session tracking, , no, [
     AC_CHECK_HEADERS(sys/times.h)
     AC_CHECK_FUNCS(times)
   ])
   
  -APACHE_CHECK_STANDARD_MODULE(unique_id, , no)
  -APACHE_CHECK_STANDARD_MODULE(so, , no)
  -APACHE_CHECK_STANDARD_MODULE(setenvif, , yes)
  -APACHE_CHECK_STANDARD_MODULE(echo, , yes)
  +APACHE_CHECK_STANDARD_MODULE(unique_id, per-request unique ids, , no)
  +APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , no)
  +APACHE_CHECK_STANDARD_MODULE(setenvif, basing ENV vars on headers, , yes)
  +APACHE_CHECK_STANDARD_MODULE(echo, ECHO server, , yes)
   
   APACHE_MODPATH_FINISH