You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/08/30 01:56:11 UTC

svn commit: r1518859 - /httpd/httpd/trunk/CMakeLists.txt

Author: trawick
Date: Thu Aug 29 23:56:11 2013
New Revision: 1518859

URL: http://svn.apache.org/r1518859
Log:
adjust default module enablement to kinda-sorta sync with
autoconf-based build (see commentary added as part of this
revision

sync-ing is limited by 

* not all modules with prereqs can be built yet
* no infrastructure yet to control related modules together (e.g.,
  enabling mod_proxy also enables a slew of others)


Modified:
    httpd/httpd/trunk/CMakeLists.txt

Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1518859&r1=1518858&r2=1518859&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Thu Aug 29 23:56:11 2013
@@ -48,18 +48,32 @@ SET(WITH_MODULES          ""            
 #   "a" - like "A", but ignore with a warning if any prereqs aren't available
 #   "i" - like "I", but ignore with a warning if any prereqs aren't available
 
+# Current heuristic for default enablement:
+#
+#   Module requires a prereq and           -> O
+#   finding/usingprereq isn't implemented
+#   yet
+#
+#   Module is included by default in       -> a if it has prereqs, A otherwise
+#   autoconf-based build 
+#
+#   Module is included in                  -> i if it has prereqs, I otherwise
+#   --enable-modules=most 
+#
+#   Otherwise                              -> O
+#
 SET(MODULE_LIST
   "modules/aaa/mod_access_compat.c+A+mod_access compatibility"
   "modules/aaa/mod_allowmethods.c+I+restrict allowed HTTP methods"
   "modules/aaa/mod_auth_basic.c+A+basic authentication"
   "modules/aaa/mod_auth_digest.c+I+RFC2617 Digest authentication"
   "modules/aaa/mod_auth_form.c+I+form authentication"
-  "modules/aaa/mod_authn_anon.c+A+anonymous user authentication control"
+  "modules/aaa/mod_authn_anon.c+I+anonymous user authentication control"
   "modules/aaa/mod_authn_core.c+A+core authentication module"
   "modules/aaa/mod_authn_dbd.c+I+SQL-based authentication control"
   "modules/aaa/mod_authn_dbm.c+I+DBM-based authentication control"
   "modules/aaa/mod_authn_file.c+A+file-based authentication control"
-  "modules/aaa/mod_authn_socache.c+A+Cached authentication control"
+  "modules/aaa/mod_authn_socache.c+I+Cached authentication control"
   "modules/aaa/mod_authnz_ldap.c+O+LDAP based authentication"
   "modules/aaa/mod_authz_core.c+A+core authorization provider vector module"
   "modules/aaa/mod_authz_dbd.c+I+SQL based authorization and Login/Session support"
@@ -67,16 +81,16 @@ SET(MODULE_LIST
   "modules/aaa/mod_authz_groupfile.c+A+'require group' authorization control"
   "modules/aaa/mod_authz_host.c+A+host-based authorization control"
   "modules/aaa/mod_authz_owner.c+I+'require file-owner' authorization control"
-  "modules/aaa/mod_authz_user.c+I+'require user' authorization control"
+  "modules/aaa/mod_authz_user.c+A+'require user' authorization control"
   "modules/arch/win32/mod_isapi.c+I+isapi extension support"
   "modules/cache/mod_cache.c+I+dynamic file caching.  At least one storage management module (e.g. mod_cache_disk) is also necessary."
   "modules/cache/mod_cache_disk.c+I+disk caching module"
-  "modules/cache/mod_cache_socache.c+A+shared object caching module"
-  "modules/cache/mod_file_cache.c+A+File cache"
+  "modules/cache/mod_cache_socache.c+I+shared object caching module"
+  "modules/cache/mod_file_cache.c+I+File cache"
   "modules/cache/mod_socache_dbm.c+I+dbm small object cache provider"
   "modules/cache/mod_socache_dc.c+O+distcache small object cache provider"
   "modules/cache/mod_socache_memcache.c+I+memcache small object cache provider"
-  "modules/cache/mod_socache_shmcb.c+A+ shmcb small object cache provider"
+  "modules/cache/mod_socache_shmcb.c+I+ shmcb small object cache provider"
   "modules/cluster/mod_heartbeat.c+I+Generates Heartbeats"
   "modules/cluster/mod_heartmonitor.c+I+Collects Heartbeats"
   "modules/core/mod_macro.c+I+Define and use macros in configuration files"
@@ -85,86 +99,86 @@ SET(MODULE_LIST
   "modules/dav/fs/mod_dav_fs.c+I+DAV provider for the filesystem."
   "modules/dav/lock/mod_dav_lock.c+I+DAV provider for generic locking"
   "modules/dav/main/mod_dav.c+I+WebDAV protocol handling."
-  "modules/debugging/mod_bucketeer.c+I+buckets manipulation filter.  Useful only for developers and testing purposes."
+  "modules/debugging/mod_bucketeer.c+O+buckets manipulation filter.  Useful only for developers and testing purposes."
   "modules/debugging/mod_dumpio.c+I+I/O dump filter"
-  "modules/echo/mod_echo.c+I+ECHO server"
-  "modules/examples/mod_case_filter.c+I+Example uppercase conversion filter"
-  "modules/examples/mod_case_filter_in.c+I+Example uppercase conversion input filter"
-  "modules/examples/mod_example_hooks.c+I+Example hook callback handler module"
-  "modules/examples/mod_example_ipc.c+I+Example of shared memory and mutex usage"
-  "modules/filters/mod_buffer.c+A+Filter Buffering"
+  "modules/echo/mod_echo.c+O+ECHO server"
+  "modules/examples/mod_case_filter.c+O+Example uppercase conversion filter"
+  "modules/examples/mod_case_filter_in.c+O+Example uppercase conversion input filter"
+  "modules/examples/mod_example_hooks.c+O+Example hook callback handler module"
+  "modules/examples/mod_example_ipc.c+O+Example of shared memory and mutex usage"
+  "modules/filters/mod_buffer.c+I+Filter Buffering"
   "modules/filters/mod_charset_lite.c+O+character set translation"
-  "modules/filters/mod_data.c+I+RFC2397 data encoder"
+  "modules/filters/mod_data.c+O+RFC2397 data encoder"
   "modules/filters/mod_deflate.c+i+Deflate transfer encoding support"
   "modules/filters/mod_ext_filter.c+I+external filter module"
   "modules/filters/mod_filter.c+A+Smart Filtering"
-  "modules/filters/mod_include.c+A+Server Side Includes"
+  "modules/filters/mod_include.c+I+Server Side Includes"
   "modules/filters/mod_proxy_html.c+i+Fix HTML Links in a Reverse Proxy"
   "modules/filters/mod_ratelimit.c+I+Output Bandwidth Limiting"
-  "modules/filters/mod_reflector.c+I+Reflect request through the output filter stack"
+  "modules/filters/mod_reflector.c+O+Reflect request through the output filter stack"
   "modules/filters/mod_reqtimeout.c+A+Limit time waiting for request from client"
   "modules/filters/mod_request.c+I+Request Body Filtering"
   "modules/filters/mod_sed.c+I+filter request and/or response bodies through sed"
   "modules/filters/mod_substitute.c+I+response content rewrite-like filtering"
   "modules/filters/mod_xml2enc.c+i+i18n support for markup filters"
-  "modules/generators/mod_asis.c+A+as-is filetypes"
+  "modules/generators/mod_asis.c+I+as-is filetypes"
   "modules/generators/mod_autoindex.c+A+directory listing"
-  "modules/generators/mod_cgi.c+A+CGI scripts"
-  "modules/generators/mod_info.c+A+server information"
-  "modules/generators/mod_status.c+A+process/thread monitoring"
+  "modules/generators/mod_cgi.c+I+CGI scripts"
+  "modules/generators/mod_info.c+I+server information"
+  "modules/generators/mod_status.c+I+process/thread monitoring"
   "modules/http/mod_mime.c+A+mapping of file-extension to MIME.  Disabling this module is normally not recommended."
   "modules/ldap/mod_ldap.c+O+LDAP caching and connection pooling services"
   "modules/loggers/mod_log_config.c+A+logging configuration.  You won't be able to log requests to the server without this module."
-  "modules/loggers/mod_log_debug.c+A+configurable debug logging"
+  "modules/loggers/mod_log_debug.c+I+configurable debug logging"
   "modules/loggers/mod_log_forensic.c+I+forensic logging"
   "modules/loggers/mod_logio.c+I+input and output logging"
   "modules/lua/mod_lua.c+O+Apache Lua Framework"
-  "modules/mappers/mod_actions.c+A+Action triggering on requests"
+  "modules/mappers/mod_actions.c+I+Action triggering on requests"
   "modules/mappers/mod_alias.c+A+mapping of requests to different filesystem parts"
   "modules/mappers/mod_dir.c+A+directory request handling"
   "modules/mappers/mod_imagemap.c+I+server-side imagemaps"
-  "modules/mappers/mod_negotiation.c+A+content negotiation"
-  "modules/mappers/mod_rewrite.c+A+rule based URL manipulation"
-  "modules/mappers/mod_speling.c+A+correct common URL misspellings"
-  "modules/mappers/mod_userdir.c+A+mapping of requests to user-specific directories"
+  "modules/mappers/mod_negotiation.c+I+content negotiation"
+  "modules/mappers/mod_rewrite.c+I+rule based URL manipulation"
+  "modules/mappers/mod_speling.c+I+correct common URL misspellings"
+  "modules/mappers/mod_userdir.c+I+mapping of requests to user-specific directories"
   "modules/mappers/mod_vhost_alias.c+I+mass virtual hosting module"
-  "modules/metadata/mod_cern_meta.c+I+CERN-type meta files"
+  "modules/metadata/mod_cern_meta.c+O+CERN-type meta files"
   "modules/metadata/mod_env.c+A+clearing/setting of ENV vars"
-  "modules/metadata/mod_expires.c+A+Expires header control"
+  "modules/metadata/mod_expires.c+I+Expires header control"
   "modules/metadata/mod_headers.c+A+HTTP header control"
-  "modules/metadata/mod_ident.c+I+RFC 1413 identity check"
-  "modules/metadata/mod_mime_magic.c+I+automagically determining MIME type"
-  "modules/metadata/mod_remoteip.c+A+translate header contents to an apparent client remote_ip"
+  "modules/metadata/mod_ident.c+O+RFC 1413 identity check"
+  "modules/metadata/mod_mime_magic.c+O+automagically determining MIME type"
+  "modules/metadata/mod_remoteip.c+I+translate header contents to an apparent client remote_ip"
   "modules/metadata/mod_setenvif.c+A+basing ENV vars on headers"
-  "modules/metadata/mod_unique_id.c+A+per-request unique ids"
-  "modules/metadata/mod_usertrack.c+A+user-session tracking"
+  "modules/metadata/mod_unique_id.c+I+per-request unique ids"
+  "modules/metadata/mod_usertrack.c+I+user-session tracking"
   "modules/metadata/mod_version.c+A+determining httpd version in config files"
-  "modules/proxy/balancers/mod_lbmethod_bybusyness.c+A+Apache proxy Load balancing by busyness"
-  "modules/proxy/balancers/mod_lbmethod_byrequests.c+A+Apache proxy Load balancing by request counting"
-  "modules/proxy/balancers/mod_lbmethod_bytraffic.c+A+Apache proxy Load balancing by traffic counting"
-  "modules/proxy/balancers/mod_lbmethod_heartbeat.c+A+Apache proxy Load balancing from Heartbeats"
+  "modules/proxy/balancers/mod_lbmethod_bybusyness.c+I+Apache proxy Load balancing by busyness"
+  "modules/proxy/balancers/mod_lbmethod_byrequests.c+I+Apache proxy Load balancing by request counting"
+  "modules/proxy/balancers/mod_lbmethod_bytraffic.c+I+Apache proxy Load balancing by traffic counting"
+  "modules/proxy/balancers/mod_lbmethod_heartbeat.c+I+Apache proxy Load balancing from Heartbeats"
   "modules/proxy/mod_proxy_ajp.c+I+Apache proxy AJP module.  Requires and is enabled by --enable-proxy."
-  "modules/proxy/mod_proxy_balancer.c+A+Apache proxy BALANCER module.  Requires and is enabled by --enable-proxy."
-  "modules/proxy/mod_proxy.c+A+Apache proxy module"
+  "modules/proxy/mod_proxy_balancer.c+I+Apache proxy BALANCER module.  Requires and is enabled by --enable-proxy."
+  "modules/proxy/mod_proxy.c+I+Apache proxy module"
   "modules/proxy/mod_proxy_connect.c+I+Apache proxy CONNECT module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_express.c+I+mass reverse-proxy module. Requires --enable-proxy."
   "modules/proxy/mod_proxy_fcgi.c+I+Apache proxy FastCGI module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_ftp.c+I+Apache proxy FTP module.  Requires and is enabled by --enable-proxy."
-  "modules/proxy/mod_proxy_http.c+A+Apache proxy HTTP module.  Requires and is enabled by --enable-proxy."
+  "modules/proxy/mod_proxy_http.c+I+Apache proxy HTTP module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_scgi.c+I+Apache proxy SCGI module.  Requires and is enabled by --enable-proxy."
   "modules/proxy/mod_proxy_wstunnel.c+I+Apache proxy Websocket Tunnel module.  Requires and is enabled by --enable-proxy."
   "modules/session/mod_session.c+I+session module"
   "modules/session/mod_session_cookie.c+I+session cookie module"
   "modules/session/mod_session_crypto.c+O+session crypto module"
   "modules/session/mod_session_dbd.c+I+session dbd module"
-  "modules/slotmem/mod_slotmem_plain.c+A+slotmem provider that uses plain memory"
-  "modules/slotmem/mod_slotmem_shm.c+A+slotmem provider that uses shared memory"
+  "modules/slotmem/mod_slotmem_plain.c+I+slotmem provider that uses plain memory"
+  "modules/slotmem/mod_slotmem_shm.c+I+slotmem provider that uses shared memory"
   "modules/ssl/mod_ssl.c+i+SSL/TLS support"
-  "modules/test/mod_dialup.c+I+rate limits static files to dialup modem speeds"
-  "modules/test/mod_optional_fn_export.c+I+example optional function exporter"
-  "modules/test/mod_optional_fn_import.c+I+example optional function importer"
-  "modules/test/mod_optional_hook_export.c+I+example optional hook exporter"
-  "modules/test/mod_optional_hook_import.c+I+example optional hook importer"
+  "modules/test/mod_dialup.c+O+rate limits static files to dialup modem speeds"
+  "modules/test/mod_optional_fn_export.c+O+example optional function exporter"
+  "modules/test/mod_optional_fn_import.c+O+example optional function importer"
+  "modules/test/mod_optional_hook_export.c+O+example optional hook exporter"
+  "modules/test/mod_optional_hook_import.c+O+example optional hook importer"
 )
 
 IF(NOT ${minorversion} STREQUAL "4")