You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@locus.apache.org on 2000/12/07 11:40:05 UTC
cvs commit: httpd-2.0/modules/proxy config.m4
gstein 00/12/07 02:40:03
Modified: modules/aaa config.m4
modules/cache config.m4
modules/echo config.m4
modules/filters config.m4
modules/generators config.m4
modules/loggers config.m4
modules/metadata config.m4
modules/proxy config.m4
Log:
*) remove STANDARD_LIBS line; it is unused/unneeded
*) simplify by removing the extra AC_DEFUN() in each file
Revision Changes Path
1.36 +8 -14 httpd-2.0/modules/aaa/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/config.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -u -r1.35 -r1.36
--- config.m4 2000/12/04 21:38:13 1.35
+++ config.m4 2000/12/07 10:39:49 1.36
@@ -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
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
-AC_DEFUN(APACHE_CHECK_AAA_MODULE, [
- APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
-])
-
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)
1.3 +3 -9 httpd-2.0/modules/cache/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/cache/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- config.m4 2000/12/04 21:38:19 1.2
+++ config.m4 2000/12/07 10:39:51 1.3
@@ -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
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
-AC_DEFUN(APACHE_CHECK_CACHE_MODULE, [
- APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
-])
-
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)
1.3 +1 -4 httpd-2.0/modules/echo/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/echo/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- config.m4 2000/12/04 21:38:25 1.2
+++ config.m4 2000/12/07 10:39:52 1.3
@@ -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 @@
LTFLAGS="$LTFLAGS -export-dynamic"
APACHE_MODPATH_FINISH
-
-APACHE_SUBST(STANDARD_LIBS)
1.3 +1 -4 httpd-2.0/modules/filters/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- config.m4 2000/12/04 21:38:32 1.2
+++ config.m4 2000/12/07 10:39:54 1.3
@@ -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 @@
LTFLAGS="$LTFLAGS -export-dynamic"
APACHE_MODPATH_FINISH
-
-APACHE_SUBST(STANDARD_LIBS)
1.4 +12 -18 httpd-2.0/modules/generators/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/config.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- config.m4 2000/12/06 18:41:05 1.3
+++ config.m4 2000/12/07 10:39:55 1.4
@@ -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
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
-AC_DEFUN(APACHE_CHECK_GENERATOR_MODULE, [
- APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
-])
-
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)
1.3 +3 -4 httpd-2.0/modules/loggers/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/loggers/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- config.m4 2000/12/04 22:33:41 1.2
+++ config.m4 2000/12/07 10:39:57 1.3
@@ -1,10 +1,9 @@
dnl modules enabled in this directory by default
-APACHE_MODPATH_INIT(loggers)
+
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
-dnl APACHE_MODULE(vhost_alias,blabla)
+APACHE_MODPATH_INIT(loggers)
APACHE_MODULE(log_config, logging configuration, , config_log, yes)
APACHE_MODPATH_FINISH
-
-APACHE_SUBST(STANDARD_LIBS)
1.2 +9 -16 httpd-2.0/modules/metadata/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- config.m4 2000/12/04 21:38:51 1.1
+++ config.m4 2000/12/07 10:39:59 1.2
@@ -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
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
-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_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)
1.4 +3 -8 httpd-2.0/modules/proxy/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/config.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- config.m4 2000/06/13 01:22:06 1.3
+++ config.m4 2000/12/07 10:40:01 1.4
@@ -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)