Move the default status of module inclusion/exclusion into the

STANDARD_MODULE macro, to make it a little more maintainable.

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

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 4e769badf34aade4b3a66d2299b5e8ea61d74668..b250f5a7404ef1541ff0f72b387b371b5f4e03d3 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -1,6 +1,4 @@
 dnl modules enabled in this directory by default
-default_env=yes
-default_log_config=yes
 
 STANDARD_LIBS=""
 AC_DEFUN(STANDARD_MODULE,[
@@ -8,12 +6,13 @@ AC_DEFUN(STANDARD_MODULE,[
   STANDARD_LIBS="$STANDARD_LIBS libapachemod_$1.la"
 ])
 
+dnl AC_DEFUN(modulename, modulestructname, defaultonoroff)
 dnl XXX - Need to add help text to --enable-module flags
 dnl XXX - Need to add support for per-module config
 AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
     AC_MSG_CHECKING([whether to enable mod_$1])
     AC_ARG_ENABLE(patsubst([$1], _, -), [  --enable-]patsubst([$1], _, -), [],
-        [enable_$1=$default_$1])
+        [enable_$1=]ifelse([$3], , no, [$3]))
     if test "$enable_[$1]" != "no" ; then
         MODLIST="$MODLIST ifelse([$2], , [$1], [$2])"
         STANDARD_MODULE([$1])
@@ -21,8 +20,8 @@ AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
     AC_MSG_RESULT([$enable_$1])
 ])
 
-APACHE_CHECK_STANDARD_MODULE(env)
-APACHE_CHECK_STANDARD_MODULE(log_config, config_log)
+APACHE_CHECK_STANDARD_MODULE(env, , no)
+APACHE_CHECK_STANDARD_MODULE(log_config, config_log, yes)
 
 dnl ## mod_usertrack.c
 AC_CHECK_HEADERS(sys/times.h)