Get the modules configuration stuff working correctly. This just deals

with STANDARD modules and Protocol, not MPMs.

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

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index cc88477bb270bca046de24146cdef75ec2b57d30..8b354ecc872c99cff5cdab5e973cfaac67a69fe7 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -3,22 +3,22 @@ dnl modules enabled in this directory by default
 dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
 dnl XXX - Need to allow --enable-module to fail if optional config fails
 
-AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
+AC_DEFUN(APACHE_CHECK_AAA_MODULE, [
   APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
 ])
 
 APACHE_MODPATH_INIT(aaa)
 
-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_AAA_MODULE(access, host-based access control, , yes)
+APACHE_CHECK_AAA_MODULE(auth, user-based access control, , yes)
+APACHE_CHECK_AAA_MODULE(auth_anon, anonymous user access, , no)
+APACHE_CHECK_AAA_MODULE(auth_dbm, DBM-based access databases, , no)
 
-APACHE_CHECK_STANDARD_MODULE(auth_db, DB-based access databases, , no, [
+APACHE_CHECK_AAA_MODULE(auth_db, DB-based access databases, , no, [
   AC_CHECK_HEADERS(db.h)
   AC_CHECK_LIB(db,main)
 ]) 
-APACHE_CHECK_STANDARD_MODULE(auth_digest, digests, , no)
+APACHE_CHECK_AAA_MODULE(auth_digest, digests, , no)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index 30160ba70bfef5f33eace111771659cec5669c21..3d53b4a891c5e0b9290cb8dcdb0be8fa80ba344c 100644 (file)
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -3,13 +3,13 @@ dnl modules enabled in this directory by default
 dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
 dnl XXX - Need to allow --enable-module to fail if optional config fails
 
-AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
+AC_DEFUN(APACHE_CHECK_CACHE_MODULE, [
   APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
 ])
 
 APACHE_MODPATH_INIT(cache)
 
-APACHE_CHECK_STANDARD_MODULE(file_cache, File cache, , no)
+APACHE_CHECK_CACHE_MODULE(file_cache, File cache, , no)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 APACHE_MODPATH_FINISH

diff --git a/modules/echo/config.m4 b/modules/echo/config.m4
index 822b0bdfb2c7bd93fa8027d242a50af7d9999ce1..4f6628b3ce2135a1b932949063258f3e1dfebd83 100644 (file)
--- a/modules/echo/config.m4
+++ b/modules/echo/config.m4
@@ -3,13 +3,9 @@ dnl modules enabled in this directory by default
 dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
 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],[$5])
-])
-
 APACHE_MODPATH_INIT(echo)
 
-APACHE_CHECK_STANDARD_MODULE(echo, ECHO server, , no)
+APACHE_MODULE(echo, ECHO server, , , no)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 2b8589e3e5e1b4a017c8a82bd8653c4e71d09474..cc697b07586e2db87ae322394485845a3ab195ce 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -3,13 +3,9 @@ dnl modules enabled in this directory by default
 dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
 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],[$5])
-])
-
 APACHE_MODPATH_INIT(filters)
 
-APACHE_CHECK_STANDARD_MODULE(include, Server Side Includes, includes, yes)
+APACHE_MODULE(include, Server Side Includes, , includes, yes)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 

diff --git a/modules/generators/config.m4 b/modules/generators/config.m4
index f3eef3ed0b9ca80b00b953dcba3975484ee7b3b0..b33fb31e1041fe74304c42abd404700c21120b0f 100644 (file)
--- a/modules/generators/config.m4
+++ b/modules/generators/config.m4
@@ -3,17 +3,17 @@ dnl modules enabled in this directory by default
 dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
 dnl XXX - Need to allow --enable-module to fail if optional config fails
 
-AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
+AC_DEFUN(APACHE_CHECK_GENERATOR_MODULE, [
   APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
 ])
 
 APACHE_MODPATH_INIT(generators)
 
-APACHE_CHECK_STANDARD_MODULE(status, process/thread monitoring, , no)
-APACHE_CHECK_STANDARD_MODULE(autoindex, directory listing, , yes)
-APACHE_CHECK_STANDARD_MODULE(asis, as-is filetypes, , yes)
-APACHE_CHECK_STANDARD_MODULE(info, server information, , no)
-APACHE_CHECK_STANDARD_MODULE(suexec, set uid and gid for spawned processes, , no)
+APACHE_CHECK_GENERATOR_MODULE(status, process/thread monitoring, , no)
+APACHE_CHECK_GENERATOR_MODULE(autoindex, directory listing, , yes)
+APACHE_CHECK_GENERATOR_MODULE(asis, as-is filetypes, , yes)
+APACHE_CHECK_GENERATOR_MODULE(info, server information, , no)
+APACHE_CHECK_GENERATOR_MODULE(suexec, set uid and gid for spawned processes, , no)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 

diff --git a/modules/loggers/Makefile.in b/modules/loggers/Makefile.in
new file mode 100644 (file)
index 0000000..167b343
--- /dev/null
+++ b/modules/loggers/Makefile.in
@@ -0,0 +1,3 @@
+
+include $(top_srcdir)/build/special.mk
+

diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4
new file mode 100644 (file)
index 0000000..b205d4d
--- /dev/null
+++ b/modules/loggers/config.m4
@@ -0,0 +1,10 @@
+dnl modules enabled in this directory by default
+APACHE_MODPATH_INIT(standard)
+
+dnl APACHE_MODULE(vhost_alias,blabla)
+       
+APACHE_MODULE(log_config, logging configuration, , config_log, yes)
+
+APACHE_MODPATH_FINISH
+    
+APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/mappers/Makefile.in b/modules/mappers/Makefile.in
new file mode 100644 (file)
index 0000000..167b343
--- /dev/null
+++ b/modules/mappers/Makefile.in
@@ -0,0 +1,3 @@
+
+include $(top_srcdir)/build/special.mk
+

diff --git a/modules/mappers/config.m4 b/modules/mappers/config.m4
new file mode 100644 (file)
index 0000000..256bb02
--- /dev/null
+++ b/modules/mappers/config.m4
@@ -0,0 +1,27 @@
+dnl modules enabled in this directory by default
+
+dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
+dnl XXX - Need to allow --enable-module to fail if optional config fails
+
+AC_DEFUN(APACHE_CHECK_MAPPERS_MODULE, [
+  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
+])
+
+APACHE_MODPATH_INIT(mappers)
+
+APACHE_CHECK_MAPPERS_MODULE(vhost_alias, mass hosting module, , no)
+APACHE_CHECK_MAPPERS_MODULE(negotiation, content negoatiation, , yes)
+APACHE_CHECK_MAPPERS_MODULE(dir, directory request handling, , yes)
+APACHE_CHECK_MAPPERS_MODULE(imap, internal imagemaps, , yes)
+APACHE_CHECK_MAPPERS_MODULE(actions, Action triggering on requests, action, yes)
+APACHE_CHECK_MAPPERS_MODULE(speling, correct common URL misspellings, , no)
+APACHE_CHECK_MAPPERS_MODULE(userdir, mapping of user requests, , yes)
+APACHE_CHECK_MAPPERS_MODULE(alias, translation of requests, , yes)
+
+APACHE_CHECK_MAPPERS_MODULE(rewrite, regex URL translation, , no, [
+  EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_DBM_REWRITEMAP"
+])
+
+APACHE_MODPATH_FINISH
+    
+APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/metadata/Makefile.in b/modules/metadata/Makefile.in
new file mode 100644 (file)
index 0000000..167b343
--- /dev/null
+++ b/modules/metadata/Makefile.in
@@ -0,0 +1,3 @@
+
+include $(top_srcdir)/build/special.mk
+

diff --git a/modules/metadata/config.m4 b/modules/metadata/config.m4
new file mode 100644 (file)
index 0000000..4e33d75
--- /dev/null
+++ b/modules/metadata/config.m4
@@ -0,0 +1,30 @@
+dnl modules enabled in this directory by default
+
+dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
+dnl XXX - Need to allow --enable-module to fail if optional config fails
+
+AC_DEFUN(APACHE_CHECK_METADATA_MODULE, [
+  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
+])
+
+APACHE_MODPATH_INIT(metadata)
+
+APACHE_CHECK_METADATA_MODULE(env, clearing/setting of ENV vars, , yes)
+APACHE_CHECK_METADATA_MODULE(mime_magic, automagically determining MIME type, , no)
+APACHE_CHECK_METADATA_MODULE(cern_meta, CERN-type meta files, , no)
+APACHE_CHECK_METADATA_MODULE(expires, Expires header control, , no)
+APACHE_CHECK_METADATA_MODULE(headers, HTTP header control, , no)
+
+APACHE_CHECK_METADATA_MODULE(usertrack, user-session tracking, , no, [
+  AC_CHECK_HEADERS(sys/times.h)
+  AC_CHECK_FUNCS(times)
+])
+
+APACHE_CHECK_METADATA_MODULE(unique_id, per-request unique ids, , no)
+APACHE_CHECK_METADATA_MODULE(setenvif, basing ENV vars on headers, , yes)
+
+LTFLAGS="$LTFLAGS -export-dynamic"
+
+APACHE_MODPATH_FINISH
+    
+APACHE_SUBST(STANDARD_LIBS)