Start to add back the config.m4 and Makefile.in's that were separated out

during the repository move.

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

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 7d53a1c544b99af088d93a54308d62f1abccf97e..cc88477bb270bca046de24146cdef75ec2b57d30 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -7,32 +7,7 @@ AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
   APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
 ])
 
-APACHE_MODPATH_INIT(standard)
-
-dnl APACHE_MODULE(vhost_alias,blabla)
-       
-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(asis, as-is filetypes, , yes)
-APACHE_CHECK_STANDARD_MODULE(imap, internal imagemaps, , yes)
-APACHE_CHECK_STANDARD_MODULE(info, server information, , no)
-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(suexec, set uid and gid for spawned processes, , no)
-APACHE_CHECK_STANDARD_MODULE(alias, translation of requests, , yes)
-
-APACHE_CHECK_STANDARD_MODULE(rewrite, regex URL translation, , no, [
-  EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_DBM_REWRITEMAP"
-])
+APACHE_MODPATH_INIT(aaa)
 
 APACHE_CHECK_STANDARD_MODULE(access, host-based access control, , yes)
 APACHE_CHECK_STANDARD_MODULE(auth, user-based access control, , yes)
@@ -43,43 +18,10 @@ 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, 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, user-session tracking, , no, [
-  AC_CHECK_HEADERS(sys/times.h)
-  AC_CHECK_FUNCS(times)
-])
-
-APACHE_CHECK_STANDARD_MODULE(unique_id, per-request unique ids, , no)
-APACHE_CHECK_STANDARD_MODULE(setenvif, basing ENV vars on headers, , yes)
-APACHE_CHECK_STANDARD_MODULE(echo, ECHO server, , no)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 
-if test "$apache_cv_mpm" = "mpmt_pthread" -o "$apache_cv_mpm" = "dexter"; then
-# if we are using a threaded MPM, we will get better performance with
-# mod_cgid, so make it the default.
-    APACHE_CHECK_STANDARD_MODULE(cgid, CGI scripts, , yes)
-    APACHE_CHECK_STANDARD_MODULE(cgi, CGI scripts, , no)
-else
-# if we are using a non-threaded MPM, it makes little sense to use
-# mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the
-# default
-    APACHE_CHECK_STANDARD_MODULE(cgi, CGI scripts, , yes)
-    APACHE_CHECK_STANDARD_MODULE(cgid, CGI scripts, , no)
-fi
-
-if test "$sharedobjs" = "yes"; then
-    APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , yes)
-else
-    APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , no)
-fi
-AC_CACHE_SAVE
-
 APACHE_MODPATH_FINISH
     
 APACHE_SUBST(STANDARD_LIBS)

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

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
new file mode 100644 (file)
index 0000000..30160ba
--- /dev/null
+++ b/modules/cache/config.m4
@@ -0,0 +1,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, [
+  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
+])
+
+APACHE_MODPATH_INIT(cache)
+
+APACHE_CHECK_STANDARD_MODULE(file_cache, File cache, , no)
+
+LTFLAGS="$LTFLAGS -export-dynamic"
+APACHE_MODPATH_FINISH
+    
+APACHE_SUBST(STANDARD_LIBS)

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

diff --git a/modules/echo/config.m4 b/modules/echo/config.m4
new file mode 100644 (file)
index 0000000..822b0bd
--- /dev/null
+++ b/modules/echo/config.m4
@@ -0,0 +1,18 @@
+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)
+
+LTFLAGS="$LTFLAGS -export-dynamic"
+
+APACHE_MODPATH_FINISH
+    
+APACHE_SUBST(STANDARD_LIBS)

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

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
new file mode 100644 (file)
index 0000000..2b8589e
--- /dev/null
+++ b/modules/filters/config.m4
@@ -0,0 +1,18 @@
+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)
+
+LTFLAGS="$LTFLAGS -export-dynamic"
+
+APACHE_MODPATH_FINISH
+    
+APACHE_SUBST(STANDARD_LIBS)

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

diff --git a/modules/generators/config.m4 b/modules/generators/config.m4
new file mode 100644 (file)
index 0000000..f3eef3e
--- /dev/null
+++ b/modules/generators/config.m4
@@ -0,0 +1,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, [
+  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)
+
+LTFLAGS="$LTFLAGS -export-dynamic"
+
+APACHE_MODPATH_FINISH
+    
+APACHE_SUBST(STANDARD_LIBS)