*) remove STANDARD_LIBS line; it is unused/unneeded

*) simplify by removing the extra AC_DEFUN() in each file

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

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 8b354ecc872c99cff5cdab5e973cfaac67a69fe7..53257931d8ed5e77dda317056b984478b68533e6 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -1,27 +1,21 @@
 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_AAA_MODULE, [
-  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
-])
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 APACHE_MODPATH_INIT(aaa)
 
-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_MODULE(access, host-based access control, , , yes)
+APACHE_MODULE(auth, user-based access control, , , yes)
+APACHE_MODULE(auth_anon, anonymous user access, , , no)
+APACHE_MODULE(auth_dbm, DBM-based access databases, , , no)
 
-APACHE_CHECK_AAA_MODULE(auth_db, DB-based access databases, , no, [
+APACHE_MODULE(auth_db, DB-based access databases, , , no, [
   AC_CHECK_HEADERS(db.h)
   AC_CHECK_LIB(db,main)
 ]) 
-APACHE_CHECK_AAA_MODULE(auth_digest, digests, , no)
+
+APACHE_MODULE(auth_digest, digests, , , no)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 
 APACHE_MODPATH_FINISH
-    
-APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index 3d53b4a891c5e0b9290cb8dcdb0be8fa80ba344c..6cdcc9b80b3db812c7eff0016c3a1753b1484906 100644 (file)
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -1,17 +1,11 @@
 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_CACHE_MODULE, [
-  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
-])
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 APACHE_MODPATH_INIT(cache)
 
-APACHE_CHECK_CACHE_MODULE(file_cache, File cache, , no)
+APACHE_MODULE(file_cache, File cache, , , no)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
+
 APACHE_MODPATH_FINISH
-    
-APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/echo/config.m4 b/modules/echo/config.m4
index 4f6628b3ce2135a1b932949063258f3e1dfebd83..821b0939fb88a74e2691bca26c884a4ff8585f1d 100644 (file)
--- a/modules/echo/config.m4
+++ b/modules/echo/config.m4
@@ -1,7 +1,6 @@
 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
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 APACHE_MODPATH_INIT(echo)
 
@@ -10,5 +9,3 @@ APACHE_MODULE(echo, ECHO server, , , no)
 LTFLAGS="$LTFLAGS -export-dynamic"
 
 APACHE_MODPATH_FINISH
-    
-APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index cc697b07586e2db87ae322394485845a3ab195ce..946d61ceb2e50bb571ae242fbf1e2b2d49e5caee 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -1,7 +1,6 @@
 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
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 APACHE_MODPATH_INIT(filters)
 
@@ -10,5 +9,3 @@ APACHE_MODULE(include, Server Side Includes, , includes, yes)
 LTFLAGS="$LTFLAGS -export-dynamic"
 
 APACHE_MODPATH_FINISH
-    
-APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/generators/config.m4 b/modules/generators/config.m4
index 7efa323929981a88c5ccacde02f41238e6994e5a..2a1ed8ff27879f29f50cdefe18dbc769cc4c9d04 100644 (file)
--- a/modules/generators/config.m4
+++ b/modules/generators/config.m4
@@ -1,34 +1,28 @@
 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_GENERATOR_MODULE, [
-  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
-])
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 APACHE_MODPATH_INIT(generators)
 
-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)
+APACHE_MODULE(status, process/thread monitoring, , , no)
+APACHE_MODULE(autoindex, directory listing, , , yes)
+APACHE_MODULE(asis, as-is filetypes, , , yes)
+APACHE_MODULE(info, server information, , , no)
+APACHE_MODULE(suexec, set uid and gid for spawned processes, , , 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_GENERATOR_MODULE(cgid, CGI scripts, , yes)
-    APACHE_CHECK_GENERATOR_MODULE(cgi, CGI scripts, , no)
+    APACHE_MODULE(cgid, CGI scripts, , , yes)
+    APACHE_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_GENERATOR_MODULE(cgi, CGI scripts, , yes)
-    APACHE_CHECK_GENERATOR_MODULE(cgid, CGI scripts, , no)
+# mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the
+# default
+    APACHE_MODULE(cgi, CGI scripts, , , yes)
+    APACHE_MODULE(cgid, CGI scripts, , , no)
 fi
 
 APACHE_MODPATH_FINISH
-    
-APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4
index 915f620e8760557008ecbe801f6fe11dd66228cb..e1628c66f07ce36e782816e986e11d54ffebbb0e 100644 (file)
--- a/modules/loggers/config.m4
+++ b/modules/loggers/config.m4
@@ -1,10 +1,9 @@
 dnl modules enabled in this directory by default
-APACHE_MODPATH_INIT(loggers)
 
-dnl APACHE_MODULE(vhost_alias,blabla)
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
+
+APACHE_MODPATH_INIT(loggers)
        
 APACHE_MODULE(log_config, logging configuration, , config_log, yes)
 
 APACHE_MODPATH_FINISH
-    
-APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/metadata/config.m4 b/modules/metadata/config.m4
index 4e33d75e2e0b8ffd1ef0ae8c2585ea1091a61a5a..27053b5de8c6fdff29f29702c32ee46919f028fb 100644 (file)
--- a/modules/metadata/config.m4
+++ b/modules/metadata/config.m4
@@ -1,30 +1,23 @@
 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])
-])
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
 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_MODULE(env, clearing/setting of ENV vars, , , yes)
+APACHE_MODULE(mime_magic, automagically determining MIME type, , , no)
+APACHE_MODULE(cern_meta, CERN-type meta files, , , no)
+APACHE_MODULE(expires, Expires header control, , , no)
+APACHE_MODULE(headers, HTTP header control, , , no)
 
-APACHE_CHECK_METADATA_MODULE(usertrack, user-session tracking, , no, [
+APACHE_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)
+APACHE_MODULE(unique_id, per-request unique ids, , , no)
+APACHE_MODULE(setenvif, basing ENV vars on headers, , , yes)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 
 APACHE_MODPATH_FINISH
-    
-APACHE_SUBST(STANDARD_LIBS)

diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index 5b5dc45733b7529fc9753cc7ab5154fba173f99a..63c6d797fe7e017d173c6d14f7ae17f97bb10b51 100644 (file)
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -1,17 +1,12 @@
 dnl modules enabled in this directory by default
 
-dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
+
 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_PROXY_MODULE, [
-  APACHE_MODULE($1,,,$2,$3,$4)
-])
-
 APACHE_MODPATH_INIT(proxy)
 
-APACHE_CHECK_PROXY_MODULE(proxy, , no)
+APACHE_MODULE(proxy, proxy handling, , , no)
 
 APACHE_MODPATH_FINISH
-
-APACHE_SUBST(STANDARD_LIBS)