Allow for help messages for modules.

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/acinclude.m4 b/acinclude.m4
index 1f19e59a1bb33b5f72d8736c61204d08d248c222..b0427bf9f3e1768dafb0432e7016b9dbc58c230e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -287,7 +287,7 @@ dnl
 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

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 98b52407cb00dccd4bb7d3a792a310ef63923efc..c36dfa845b181cdc7676d8ca002b95bb0bd1c358 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -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