Imported Upstream version 2.4.23upstream

1 files changed, 3998 insertions, 2205 deletions

diff --git a/configure b/configure
index 41817df3..72734a51 100755
--- a/configure
+++ b/configure
@@ -724,6 +724,7 @@ MOD_LBMETHOD_HEARTBEAT_LDADD
 MOD_LBMETHOD_BYBUSYNESS_LDADD
 MOD_LBMETHOD_BYTRAFFIC_LDADD
 MOD_LBMETHOD_BYREQUESTS_LDADD
+MOD_PROXY_HTTP2_LDADD
 MOD_HTTP2_LDADD
 APACHECTL_ULIMIT
 NONPORTABLE_SUPPORT
@@ -751,6 +752,7 @@ MOD_SESSION_DBD_LDADD
 MOD_SESSION_CRYPTO_LDADD
 MOD_SESSION_COOKIE_LDADD
 MOD_SESSION_LDADD
+MOD_PROXY_HCHECK_LDADD
 MOD_PROXY_EXPRESS_LDADD
 MOD_PROXY_BALANCER_LDADD
 MOD_PROXY_AJP_LDADD
@@ -1066,6 +1068,7 @@ enable_proxy_wstunnel
 enable_proxy_ajp
 enable_proxy_balancer
 enable_proxy_express
+enable_proxy_hcheck
 enable_session
 enable_session_cookie
 enable_session_crypto
@@ -1094,6 +1097,7 @@ enable_static_fcgistarter
 enable_http2
 with_nghttp2
 enable_nghttp2_staticlib_deps
+enable_proxy_http2
 enable_lbmethod_byrequests
 enable_lbmethod_bytraffic
 enable_lbmethod_bybusyness
@@ -1873,25 +1877,23 @@ Optional Features:
   --enable-remoteip       translate header contents to an apparent client
                           remote_ip
   --enable-proxy          Apache proxy module
-  --enable-proxy-connect  Apache proxy CONNECT module. Requires and is enabled
-                          by --enable-proxy.
-  --enable-proxy-ftp      Apache proxy FTP module. Requires and is enabled by
+  --enable-proxy-connect  Apache proxy CONNECT module. Requires
                           --enable-proxy.
-  --enable-proxy-http     Apache proxy HTTP module. Requires and is enabled by
-                          --enable-proxy.
-  --enable-proxy-fcgi     Apache proxy FastCGI module. Requires and is enabled
-                          by --enable-proxy.
-  --enable-proxy-scgi     Apache proxy SCGI module. Requires and is enabled by
+  --enable-proxy-ftp      Apache proxy FTP module. Requires --enable-proxy.
+  --enable-proxy-http     Apache proxy HTTP module. Requires --enable-proxy.
+  --enable-proxy-fcgi     Apache proxy FastCGI module. Requires
                           --enable-proxy.
+  --enable-proxy-scgi     Apache proxy SCGI module. Requires --enable-proxy.
   --enable-proxy-fdpass   Apache proxy to Unix Daemon Socket module. Requires
                           --enable-proxy.
-  --enable-proxy-wstunnel Apache proxy Websocket Tunnel module. Requires and
-                          is enabled by --enable-proxy.
-  --enable-proxy-ajp      Apache proxy AJP module. Requires and is enabled by
+  --enable-proxy-wstunnel Apache proxy Websocket Tunnel module. Requires
+                          --enable-proxy.
+  --enable-proxy-ajp      Apache proxy AJP module. Requires --enable-proxy.
+  --enable-proxy-balancer Apache proxy BALANCER module. Requires
                           --enable-proxy.
-  --enable-proxy-balancer Apache proxy BALANCER module. Requires and is
-                          enabled by --enable-proxy.
   --enable-proxy-express  mass reverse-proxy module. Requires --enable-proxy.
+  --enable-proxy-hcheck   reverse-proxy health-check module. Requires
+                          --enable-proxy and --enable-watchdog.
   --enable-session        session module
   --enable-session-cookie session cookie module
   --enable-session-crypto session crypto module
@@ -1943,6 +1945,10 @@ Optional Features:
                           static libraries (as indicated by "pkg-config
                           --static"). Must be specified in addition to
                           --enable-http2.
+  --enable-proxy-http2    HTTP/2 proxy module. This module requires a
+                          libnghttp2 installation. See --with-nghttp2 on how
+                          to manage non-standard locations. Also requires
+                          --enable-proxy.
   --enable-lbmethod-byrequests
                           Apache proxy Load balancing by request counting
   --enable-lbmethod-bytraffic
@@ -8783,34 +8789,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authn_file" in
+      case "$enable_authn_file" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authn_file" = "static"; then
-    enable_authn_file=static
+  if test "$enable_authn_file" = "static" -o "$enable_authn_file" = "shared"; then
+    :
   elif test "$enable_authn_file" = "yes"; then
     enable_authn_file=$module_default
+  elif test "$enable_authn_file" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authn_file=$module_default
+    else
+      enable_authn_file=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authn_file" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authn_file=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authn_file=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authn_file" = "maybe-all"; then
+  elif test "$enable_authn_file" = "all" -o "$enable_authn_file" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authn_file=$module_default
@@ -8818,10 +8827,15 @@ fi
     else
       enable_authn_file=no
     fi
-  elif test "$enable_authn_file" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authn_file" != "no" ; then
+  elif test "$enable_authn_file" = "reallyall" -o "$enable_authn_file" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authn_file" != "no" ; then
       enable_authn_file=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authn_file=no
+    fi
+  else
+    enable_authn_file=no
   fi
   if test "$enable_authn_file" != "no"; then
             :
@@ -8837,7 +8851,6 @@ $as_echo "$enable_authn_file$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authn_file=`echo $enable_authn_file|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_file"
@@ -8917,34 +8930,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authn_dbm" in
+      case "$enable_authn_dbm" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authn_dbm" = "static"; then
-    enable_authn_dbm=static
+  if test "$enable_authn_dbm" = "static" -o "$enable_authn_dbm" = "shared"; then
+    :
   elif test "$enable_authn_dbm" = "yes"; then
     enable_authn_dbm=$module_default
+  elif test "$enable_authn_dbm" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authn_dbm=$module_default
+    else
+      enable_authn_dbm=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authn_dbm" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authn_dbm=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authn_dbm=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authn_dbm" = "maybe-all"; then
+  elif test "$enable_authn_dbm" = "all" -o "$enable_authn_dbm" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authn_dbm=$module_default
@@ -8952,10 +8968,15 @@ fi
     else
       enable_authn_dbm=no
     fi
-  elif test "$enable_authn_dbm" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authn_dbm" != "no" ; then
+  elif test "$enable_authn_dbm" = "reallyall" -o "$enable_authn_dbm" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authn_dbm" != "no" ; then
       enable_authn_dbm=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authn_dbm=no
+    fi
+  else
+    enable_authn_dbm=no
   fi
   if test "$enable_authn_dbm" != "no"; then
             :
@@ -8971,7 +8992,6 @@ $as_echo "$enable_authn_dbm$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authn_dbm=`echo $enable_authn_dbm|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_dbm"
@@ -9051,34 +9071,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authn_anon" in
+      case "$enable_authn_anon" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authn_anon" = "static"; then
-    enable_authn_anon=static
+  if test "$enable_authn_anon" = "static" -o "$enable_authn_anon" = "shared"; then
+    :
   elif test "$enable_authn_anon" = "yes"; then
     enable_authn_anon=$module_default
+  elif test "$enable_authn_anon" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authn_anon=$module_default
+    else
+      enable_authn_anon=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authn_anon" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authn_anon=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authn_anon=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authn_anon" = "maybe-all"; then
+  elif test "$enable_authn_anon" = "all" -o "$enable_authn_anon" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authn_anon=$module_default
@@ -9086,10 +9109,15 @@ fi
     else
       enable_authn_anon=no
     fi
-  elif test "$enable_authn_anon" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authn_anon" != "no" ; then
+  elif test "$enable_authn_anon" = "reallyall" -o "$enable_authn_anon" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authn_anon" != "no" ; then
       enable_authn_anon=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authn_anon=no
+    fi
+  else
+    enable_authn_anon=no
   fi
   if test "$enable_authn_anon" != "no"; then
             :
@@ -9105,7 +9133,6 @@ $as_echo "$enable_authn_anon$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authn_anon=`echo $enable_authn_anon|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_anon"
@@ -9185,34 +9212,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authn_dbd" in
+      case "$enable_authn_dbd" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authn_dbd" = "static"; then
-    enable_authn_dbd=static
+  if test "$enable_authn_dbd" = "static" -o "$enable_authn_dbd" = "shared"; then
+    :
   elif test "$enable_authn_dbd" = "yes"; then
     enable_authn_dbd=$module_default
+  elif test "$enable_authn_dbd" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authn_dbd=$module_default
+    else
+      enable_authn_dbd=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authn_dbd" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authn_dbd=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authn_dbd=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authn_dbd" = "maybe-all"; then
+  elif test "$enable_authn_dbd" = "all" -o "$enable_authn_dbd" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authn_dbd=$module_default
@@ -9220,10 +9250,15 @@ fi
     else
       enable_authn_dbd=no
     fi
-  elif test "$enable_authn_dbd" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authn_dbd" != "no" ; then
+  elif test "$enable_authn_dbd" = "reallyall" -o "$enable_authn_dbd" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authn_dbd" != "no" ; then
       enable_authn_dbd=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authn_dbd=no
+    fi
+  else
+    enable_authn_dbd=no
   fi
   if test "$enable_authn_dbd" != "no"; then
             :
@@ -9239,7 +9274,6 @@ $as_echo "$enable_authn_dbd$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authn_dbd=`echo $enable_authn_dbd|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_dbd"
@@ -9319,34 +9353,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authn_socache" in
+      case "$enable_authn_socache" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authn_socache" = "static"; then
-    enable_authn_socache=static
+  if test "$enable_authn_socache" = "static" -o "$enable_authn_socache" = "shared"; then
+    :
   elif test "$enable_authn_socache" = "yes"; then
     enable_authn_socache=$module_default
+  elif test "$enable_authn_socache" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authn_socache=$module_default
+    else
+      enable_authn_socache=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authn_socache" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authn_socache=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authn_socache=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authn_socache" = "maybe-all"; then
+  elif test "$enable_authn_socache" = "all" -o "$enable_authn_socache" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authn_socache=$module_default
@@ -9354,10 +9391,15 @@ fi
     else
       enable_authn_socache=no
     fi
-  elif test "$enable_authn_socache" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authn_socache" != "no" ; then
+  elif test "$enable_authn_socache" = "reallyall" -o "$enable_authn_socache" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authn_socache" != "no" ; then
       enable_authn_socache=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authn_socache=no
+    fi
+  else
+    enable_authn_socache=no
   fi
   if test "$enable_authn_socache" != "no"; then
             :
@@ -9373,7 +9415,6 @@ $as_echo "$enable_authn_socache$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authn_socache=`echo $enable_authn_socache|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_socache"
@@ -9454,34 +9495,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authn_core" in
+      case "$enable_authn_core" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authn_core" = "static"; then
-    enable_authn_core=static
+  if test "$enable_authn_core" = "static" -o "$enable_authn_core" = "shared"; then
+    :
   elif test "$enable_authn_core" = "yes"; then
     enable_authn_core=$module_default
+  elif test "$enable_authn_core" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authn_core=$module_default
+    else
+      enable_authn_core=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authn_core" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authn_core=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authn_core=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authn_core" = "maybe-all"; then
+  elif test "$enable_authn_core" = "all" -o "$enable_authn_core" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authn_core=$module_default
@@ -9489,10 +9533,15 @@ fi
     else
       enable_authn_core=no
     fi
-  elif test "$enable_authn_core" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authn_core" != "no" ; then
+  elif test "$enable_authn_core" = "reallyall" -o "$enable_authn_core" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authn_core" != "no" ; then
       enable_authn_core=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authn_core=no
+    fi
+  else
+    enable_authn_core=no
   fi
   if test "$enable_authn_core" != "no"; then
             :
@@ -9508,7 +9557,6 @@ $as_echo "$enable_authn_core$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authn_core=`echo $enable_authn_core|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_core"
@@ -9589,34 +9637,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authz_host" in
+      case "$enable_authz_host" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authz_host" = "static"; then
-    enable_authz_host=static
+  if test "$enable_authz_host" = "static" -o "$enable_authz_host" = "shared"; then
+    :
   elif test "$enable_authz_host" = "yes"; then
     enable_authz_host=$module_default
+  elif test "$enable_authz_host" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authz_host=$module_default
+    else
+      enable_authz_host=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authz_host" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authz_host=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authz_host=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authz_host" = "maybe-all"; then
+  elif test "$enable_authz_host" = "all" -o "$enable_authz_host" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authz_host=$module_default
@@ -9624,10 +9675,15 @@ fi
     else
       enable_authz_host=no
     fi
-  elif test "$enable_authz_host" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authz_host" != "no" ; then
+  elif test "$enable_authz_host" = "reallyall" -o "$enable_authz_host" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authz_host" != "no" ; then
       enable_authz_host=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authz_host=no
+    fi
+  else
+    enable_authz_host=no
   fi
   if test "$enable_authz_host" != "no"; then
             :
@@ -9643,7 +9699,6 @@ $as_echo "$enable_authz_host$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authz_host=`echo $enable_authz_host|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_host"
@@ -9723,34 +9778,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authz_groupfile" in
+      case "$enable_authz_groupfile" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authz_groupfile" = "static"; then
-    enable_authz_groupfile=static
+  if test "$enable_authz_groupfile" = "static" -o "$enable_authz_groupfile" = "shared"; then
+    :
   elif test "$enable_authz_groupfile" = "yes"; then
     enable_authz_groupfile=$module_default
+  elif test "$enable_authz_groupfile" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authz_groupfile=$module_default
+    else
+      enable_authz_groupfile=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authz_groupfile" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authz_groupfile=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authz_groupfile=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authz_groupfile" = "maybe-all"; then
+  elif test "$enable_authz_groupfile" = "all" -o "$enable_authz_groupfile" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authz_groupfile=$module_default
@@ -9758,10 +9816,15 @@ fi
     else
       enable_authz_groupfile=no
     fi
-  elif test "$enable_authz_groupfile" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authz_groupfile" != "no" ; then
+  elif test "$enable_authz_groupfile" = "reallyall" -o "$enable_authz_groupfile" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authz_groupfile" != "no" ; then
       enable_authz_groupfile=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authz_groupfile=no
+    fi
+  else
+    enable_authz_groupfile=no
   fi
   if test "$enable_authz_groupfile" != "no"; then
             :
@@ -9777,7 +9840,6 @@ $as_echo "$enable_authz_groupfile$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authz_groupfile=`echo $enable_authz_groupfile|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_groupfile"
@@ -9857,34 +9919,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authz_user" in
+      case "$enable_authz_user" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authz_user" = "static"; then
-    enable_authz_user=static
+  if test "$enable_authz_user" = "static" -o "$enable_authz_user" = "shared"; then
+    :
   elif test "$enable_authz_user" = "yes"; then
     enable_authz_user=$module_default
+  elif test "$enable_authz_user" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authz_user=$module_default
+    else
+      enable_authz_user=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authz_user" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authz_user=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authz_user=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authz_user" = "maybe-all"; then
+  elif test "$enable_authz_user" = "all" -o "$enable_authz_user" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authz_user=$module_default
@@ -9892,10 +9957,15 @@ fi
     else
       enable_authz_user=no
     fi
-  elif test "$enable_authz_user" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authz_user" != "no" ; then
+  elif test "$enable_authz_user" = "reallyall" -o "$enable_authz_user" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authz_user" != "no" ; then
       enable_authz_user=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authz_user=no
+    fi
+  else
+    enable_authz_user=no
   fi
   if test "$enable_authz_user" != "no"; then
             :
@@ -9911,7 +9981,6 @@ $as_echo "$enable_authz_user$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authz_user=`echo $enable_authz_user|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_user"
@@ -9991,34 +10060,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authz_dbm" in
+      case "$enable_authz_dbm" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authz_dbm" = "static"; then
-    enable_authz_dbm=static
+  if test "$enable_authz_dbm" = "static" -o "$enable_authz_dbm" = "shared"; then
+    :
   elif test "$enable_authz_dbm" = "yes"; then
     enable_authz_dbm=$module_default
+  elif test "$enable_authz_dbm" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authz_dbm=$module_default
+    else
+      enable_authz_dbm=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authz_dbm" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authz_dbm=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authz_dbm=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authz_dbm" = "maybe-all"; then
+  elif test "$enable_authz_dbm" = "all" -o "$enable_authz_dbm" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authz_dbm=$module_default
@@ -10026,10 +10098,15 @@ fi
     else
       enable_authz_dbm=no
     fi
-  elif test "$enable_authz_dbm" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authz_dbm" != "no" ; then
+  elif test "$enable_authz_dbm" = "reallyall" -o "$enable_authz_dbm" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authz_dbm" != "no" ; then
       enable_authz_dbm=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authz_dbm=no
+    fi
+  else
+    enable_authz_dbm=no
   fi
   if test "$enable_authz_dbm" != "no"; then
             :
@@ -10045,7 +10122,6 @@ $as_echo "$enable_authz_dbm$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authz_dbm=`echo $enable_authz_dbm|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_dbm"
@@ -10125,34 +10201,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authz_owner" in
+      case "$enable_authz_owner" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authz_owner" = "static"; then
-    enable_authz_owner=static
+  if test "$enable_authz_owner" = "static" -o "$enable_authz_owner" = "shared"; then
+    :
   elif test "$enable_authz_owner" = "yes"; then
     enable_authz_owner=$module_default
+  elif test "$enable_authz_owner" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authz_owner=$module_default
+    else
+      enable_authz_owner=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authz_owner" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authz_owner=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authz_owner=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authz_owner" = "maybe-all"; then
+  elif test "$enable_authz_owner" = "all" -o "$enable_authz_owner" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authz_owner=$module_default
@@ -10160,10 +10239,15 @@ fi
     else
       enable_authz_owner=no
     fi
-  elif test "$enable_authz_owner" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authz_owner" != "no" ; then
+  elif test "$enable_authz_owner" = "reallyall" -o "$enable_authz_owner" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authz_owner" != "no" ; then
       enable_authz_owner=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authz_owner=no
+    fi
+  else
+    enable_authz_owner=no
   fi
   if test "$enable_authz_owner" != "no"; then
             :
@@ -10179,7 +10263,6 @@ $as_echo "$enable_authz_owner$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authz_owner=`echo $enable_authz_owner|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_owner"
@@ -10259,34 +10342,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authz_dbd" in
+      case "$enable_authz_dbd" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authz_dbd" = "static"; then
-    enable_authz_dbd=static
+  if test "$enable_authz_dbd" = "static" -o "$enable_authz_dbd" = "shared"; then
+    :
   elif test "$enable_authz_dbd" = "yes"; then
     enable_authz_dbd=$module_default
+  elif test "$enable_authz_dbd" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authz_dbd=$module_default
+    else
+      enable_authz_dbd=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authz_dbd" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authz_dbd=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authz_dbd=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authz_dbd" = "maybe-all"; then
+  elif test "$enable_authz_dbd" = "all" -o "$enable_authz_dbd" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authz_dbd=$module_default
@@ -10294,10 +10380,15 @@ fi
     else
       enable_authz_dbd=no
     fi
-  elif test "$enable_authz_dbd" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authz_dbd" != "no" ; then
+  elif test "$enable_authz_dbd" = "reallyall" -o "$enable_authz_dbd" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authz_dbd" != "no" ; then
       enable_authz_dbd=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authz_dbd=no
+    fi
+  else
+    enable_authz_dbd=no
   fi
   if test "$enable_authz_dbd" != "no"; then
             :
@@ -10313,7 +10404,6 @@ $as_echo "$enable_authz_dbd$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authz_dbd=`echo $enable_authz_dbd|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_dbd"
@@ -10394,34 +10484,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authz_core" in
+      case "$enable_authz_core" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authz_core" = "static"; then
-    enable_authz_core=static
+  if test "$enable_authz_core" = "static" -o "$enable_authz_core" = "shared"; then
+    :
   elif test "$enable_authz_core" = "yes"; then
     enable_authz_core=$module_default
+  elif test "$enable_authz_core" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authz_core=$module_default
+    else
+      enable_authz_core=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authz_core" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authz_core=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authz_core=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authz_core" = "maybe-all"; then
+  elif test "$enable_authz_core" = "all" -o "$enable_authz_core" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authz_core=$module_default
@@ -10429,10 +10522,15 @@ fi
     else
       enable_authz_core=no
     fi
-  elif test "$enable_authz_core" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authz_core" != "no" ; then
+  elif test "$enable_authz_core" = "reallyall" -o "$enable_authz_core" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authz_core" != "no" ; then
       enable_authz_core=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authz_core=no
+    fi
+  else
+    enable_authz_core=no
   fi
   if test "$enable_authz_core" != "no"; then
             :
@@ -10448,7 +10546,6 @@ $as_echo "$enable_authz_core$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authz_core=`echo $enable_authz_core|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_core"
@@ -10529,34 +10626,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authnz_ldap" in
+      case "$enable_authnz_ldap" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authnz_ldap" = "static"; then
-    enable_authnz_ldap=static
+  if test "$enable_authnz_ldap" = "static" -o "$enable_authnz_ldap" = "shared"; then
+    :
   elif test "$enable_authnz_ldap" = "yes"; then
     enable_authnz_ldap=$module_default
+  elif test "$enable_authnz_ldap" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authnz_ldap=$module_default
+    else
+      enable_authnz_ldap=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authnz_ldap" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authnz_ldap=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authnz_ldap=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authnz_ldap" = "maybe-all"; then
+  elif test "$enable_authnz_ldap" = "all" -o "$enable_authnz_ldap" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authnz_ldap=$module_default
@@ -10564,10 +10664,15 @@ fi
     else
       enable_authnz_ldap=no
     fi
-  elif test "$enable_authnz_ldap" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authnz_ldap" != "no" ; then
+  elif test "$enable_authnz_ldap" = "reallyall" -o "$enable_authnz_ldap" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authnz_ldap" != "no" ; then
       enable_authnz_ldap=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authnz_ldap=no
+    fi
+  else
+    enable_authnz_ldap=no
   fi
   if test "$enable_authnz_ldap" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -10662,7 +10767,6 @@ $as_echo "$enable_authnz_ldap$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authnz_ldap=`echo $enable_authnz_ldap|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authnz_ldap"
@@ -10743,34 +10847,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_authnz_fcgi" in
+      case "$enable_authnz_fcgi" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_authnz_fcgi" = "static"; then
-    enable_authnz_fcgi=static
+  if test "$enable_authnz_fcgi" = "static" -o "$enable_authnz_fcgi" = "shared"; then
+    :
   elif test "$enable_authnz_fcgi" = "yes"; then
     enable_authnz_fcgi=$module_default
+  elif test "$enable_authnz_fcgi" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_authnz_fcgi=$module_default
+    else
+      enable_authnz_fcgi=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_authnz_fcgi" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_authnz_fcgi=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_authnz_fcgi=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_authnz_fcgi" = "maybe-all"; then
+  elif test "$enable_authnz_fcgi" = "all" -o "$enable_authnz_fcgi" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_authnz_fcgi=$module_default
@@ -10778,10 +10885,15 @@ fi
     else
       enable_authnz_fcgi=no
     fi
-  elif test "$enable_authnz_fcgi" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_authnz_fcgi" != "no" ; then
+  elif test "$enable_authnz_fcgi" = "reallyall" -o "$enable_authnz_fcgi" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_authnz_fcgi" != "no" ; then
       enable_authnz_fcgi=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_authnz_fcgi=no
+    fi
+  else
+    enable_authnz_fcgi=no
   fi
   if test "$enable_authnz_fcgi" != "no"; then
             :
@@ -10797,7 +10909,6 @@ $as_echo "$enable_authnz_fcgi$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_authnz_fcgi=`echo $enable_authnz_fcgi|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authnz_fcgi"
@@ -10878,34 +10989,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_access_compat" in
+      case "$enable_access_compat" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_access_compat" = "static"; then
-    enable_access_compat=static
+  if test "$enable_access_compat" = "static" -o "$enable_access_compat" = "shared"; then
+    :
   elif test "$enable_access_compat" = "yes"; then
     enable_access_compat=$module_default
+  elif test "$enable_access_compat" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_access_compat=$module_default
+    else
+      enable_access_compat=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_access_compat" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_access_compat=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_access_compat=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_access_compat" = "maybe-all"; then
+  elif test "$enable_access_compat" = "all" -o "$enable_access_compat" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_access_compat=$module_default
@@ -10913,10 +11027,15 @@ fi
     else
       enable_access_compat=no
     fi
-  elif test "$enable_access_compat" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_access_compat" != "no" ; then
+  elif test "$enable_access_compat" = "reallyall" -o "$enable_access_compat" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_access_compat" != "no" ; then
       enable_access_compat=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_access_compat=no
+    fi
+  else
+    enable_access_compat=no
   fi
   if test "$enable_access_compat" != "no"; then
             :
@@ -10932,7 +11051,6 @@ $as_echo "$enable_access_compat$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_access_compat=`echo $enable_access_compat|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES access_compat"
@@ -11014,34 +11132,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_auth_basic" in
+      case "$enable_auth_basic" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_auth_basic" = "static"; then
-    enable_auth_basic=static
+  if test "$enable_auth_basic" = "static" -o "$enable_auth_basic" = "shared"; then
+    :
   elif test "$enable_auth_basic" = "yes"; then
     enable_auth_basic=$module_default
+  elif test "$enable_auth_basic" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_auth_basic=$module_default
+    else
+      enable_auth_basic=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_auth_basic" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_auth_basic=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_auth_basic=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_auth_basic" = "maybe-all"; then
+  elif test "$enable_auth_basic" = "all" -o "$enable_auth_basic" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_auth_basic=$module_default
@@ -11049,10 +11170,15 @@ fi
     else
       enable_auth_basic=no
     fi
-  elif test "$enable_auth_basic" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_auth_basic" != "no" ; then
+  elif test "$enable_auth_basic" = "reallyall" -o "$enable_auth_basic" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_auth_basic" != "no" ; then
       enable_auth_basic=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_auth_basic=no
+    fi
+  else
+    enable_auth_basic=no
   fi
   if test "$enable_auth_basic" != "no"; then
             :
@@ -11068,7 +11194,6 @@ $as_echo "$enable_auth_basic$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_auth_basic=`echo $enable_auth_basic|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES auth_basic"
@@ -11148,34 +11273,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_auth_form" in
+      case "$enable_auth_form" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_auth_form" = "static"; then
-    enable_auth_form=static
+  if test "$enable_auth_form" = "static" -o "$enable_auth_form" = "shared"; then
+    :
   elif test "$enable_auth_form" = "yes"; then
     enable_auth_form=$module_default
+  elif test "$enable_auth_form" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_auth_form=$module_default
+    else
+      enable_auth_form=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_auth_form" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_auth_form=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_auth_form=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_auth_form" = "maybe-all"; then
+  elif test "$enable_auth_form" = "all" -o "$enable_auth_form" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_auth_form=$module_default
@@ -11183,10 +11311,15 @@ fi
     else
       enable_auth_form=no
     fi
-  elif test "$enable_auth_form" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_auth_form" != "no" ; then
+  elif test "$enable_auth_form" = "reallyall" -o "$enable_auth_form" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_auth_form" != "no" ; then
       enable_auth_form=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_auth_form=no
+    fi
+  else
+    enable_auth_form=no
   fi
   if test "$enable_auth_form" != "no"; then
             :
@@ -11202,7 +11335,6 @@ $as_echo "$enable_auth_form$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_auth_form=`echo $enable_auth_form|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES auth_form"
@@ -11282,34 +11414,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_auth_digest" in
+      case "$enable_auth_digest" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_auth_digest" = "static"; then
-    enable_auth_digest=static
+  if test "$enable_auth_digest" = "static" -o "$enable_auth_digest" = "shared"; then
+    :
   elif test "$enable_auth_digest" = "yes"; then
     enable_auth_digest=$module_default
+  elif test "$enable_auth_digest" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_auth_digest=$module_default
+    else
+      enable_auth_digest=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_auth_digest" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_auth_digest=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_auth_digest=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_auth_digest" = "maybe-all"; then
+  elif test "$enable_auth_digest" = "all" -o "$enable_auth_digest" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_auth_digest=$module_default
@@ -11317,10 +11452,15 @@ fi
     else
       enable_auth_digest=no
     fi
-  elif test "$enable_auth_digest" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_auth_digest" != "no" ; then
+  elif test "$enable_auth_digest" = "reallyall" -o "$enable_auth_digest" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_auth_digest" != "no" ; then
       enable_auth_digest=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_auth_digest=no
+    fi
+  else
+    enable_auth_digest=no
   fi
   if test "$enable_auth_digest" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -11377,7 +11517,6 @@ $as_echo "$enable_auth_digest$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_auth_digest=`echo $enable_auth_digest|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES auth_digest"
@@ -11458,34 +11597,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_allowmethods" in
+      case "$enable_allowmethods" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_allowmethods" = "static"; then
-    enable_allowmethods=static
+  if test "$enable_allowmethods" = "static" -o "$enable_allowmethods" = "shared"; then
+    :
   elif test "$enable_allowmethods" = "yes"; then
     enable_allowmethods=$module_default
+  elif test "$enable_allowmethods" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_allowmethods=$module_default
+    else
+      enable_allowmethods=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_allowmethods" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_allowmethods=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_allowmethods=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_allowmethods" = "maybe-all"; then
+  elif test "$enable_allowmethods" = "all" -o "$enable_allowmethods" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_allowmethods=$module_default
@@ -11493,10 +11635,15 @@ fi
     else
       enable_allowmethods=no
     fi
-  elif test "$enable_allowmethods" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_allowmethods" != "no" ; then
+  elif test "$enable_allowmethods" = "reallyall" -o "$enable_allowmethods" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_allowmethods" != "no" ; then
       enable_allowmethods=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_allowmethods=no
+    fi
+  else
+    enable_allowmethods=no
   fi
   if test "$enable_allowmethods" != "no"; then
             :
@@ -11512,7 +11659,6 @@ $as_echo "$enable_allowmethods$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_allowmethods=`echo $enable_allowmethods|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES allowmethods"
@@ -11648,34 +11794,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_isapi" in
+      case "$enable_isapi" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_isapi" = "static"; then
-    enable_isapi=static
+  if test "$enable_isapi" = "static" -o "$enable_isapi" = "shared"; then
+    :
   elif test "$enable_isapi" = "yes"; then
     enable_isapi=$module_default
+  elif test "$enable_isapi" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_isapi=$module_default
+    else
+      enable_isapi=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_isapi" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_isapi=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_isapi=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_isapi" = "maybe-all"; then
+  elif test "$enable_isapi" = "all" -o "$enable_isapi" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_isapi=$module_default
@@ -11683,10 +11832,15 @@ fi
     else
       enable_isapi=no
     fi
-  elif test "$enable_isapi" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_isapi" != "no" ; then
+  elif test "$enable_isapi" = "reallyall" -o "$enable_isapi" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_isapi" != "no" ; then
       enable_isapi=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_isapi=no
+    fi
+  else
+    enable_isapi=no
   fi
   if test "$enable_isapi" != "no"; then
             :
@@ -11702,7 +11856,6 @@ $as_echo "$enable_isapi$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_isapi=`echo $enable_isapi|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES isapi"
@@ -11816,34 +11969,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_file_cache" in
+      case "$enable_file_cache" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_file_cache" = "static"; then
-    enable_file_cache=static
+  if test "$enable_file_cache" = "static" -o "$enable_file_cache" = "shared"; then
+    :
   elif test "$enable_file_cache" = "yes"; then
     enable_file_cache=$module_default
+  elif test "$enable_file_cache" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_file_cache=$module_default
+    else
+      enable_file_cache=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_file_cache" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_file_cache=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_file_cache=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_file_cache" = "maybe-all"; then
+  elif test "$enable_file_cache" = "all" -o "$enable_file_cache" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_file_cache=$module_default
@@ -11851,10 +12007,15 @@ fi
     else
       enable_file_cache=no
     fi
-  elif test "$enable_file_cache" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_file_cache" != "no" ; then
+  elif test "$enable_file_cache" = "reallyall" -o "$enable_file_cache" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_file_cache" != "no" ; then
       enable_file_cache=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_file_cache=no
+    fi
+  else
+    enable_file_cache=no
   fi
   if test "$enable_file_cache" != "no"; then
             :
@@ -11870,7 +12031,6 @@ $as_echo "$enable_file_cache$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_file_cache=`echo $enable_file_cache|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES file_cache"
@@ -11964,34 +12124,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cache" in
+      case "$enable_cache" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cache" = "static"; then
-    enable_cache=static
+  if test "$enable_cache" = "static" -o "$enable_cache" = "shared"; then
+    :
   elif test "$enable_cache" = "yes"; then
     enable_cache=$module_default
+  elif test "$enable_cache" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cache=$module_default
+    else
+      enable_cache=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cache" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cache=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cache=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cache" = "maybe-all"; then
+  elif test "$enable_cache" = "all" -o "$enable_cache" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cache=$module_default
@@ -11999,10 +12162,15 @@ fi
     else
       enable_cache=no
     fi
-  elif test "$enable_cache" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cache" != "no" ; then
+  elif test "$enable_cache" = "reallyall" -o "$enable_cache" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cache" != "no" ; then
       enable_cache=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cache=no
+    fi
+  else
+    enable_cache=no
   fi
   if test "$enable_cache" != "no"; then
             :
@@ -12018,7 +12186,6 @@ $as_echo "$enable_cache$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cache=`echo $enable_cache|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cache"
@@ -12098,34 +12265,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cache_disk" in
+      case "$enable_cache_disk" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cache_disk" = "static"; then
-    enable_cache_disk=static
+  if test "$enable_cache_disk" = "static" -o "$enable_cache_disk" = "shared"; then
+    :
   elif test "$enable_cache_disk" = "yes"; then
     enable_cache_disk=$module_default
+  elif test "$enable_cache_disk" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cache_disk=$module_default
+    else
+      enable_cache_disk=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cache_disk" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cache_disk=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cache_disk=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cache_disk" = "maybe-all"; then
+  elif test "$enable_cache_disk" = "all" -o "$enable_cache_disk" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cache_disk=$module_default
@@ -12133,10 +12303,15 @@ fi
     else
       enable_cache_disk=no
     fi
-  elif test "$enable_cache_disk" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cache_disk" != "no" ; then
+  elif test "$enable_cache_disk" = "reallyall" -o "$enable_cache_disk" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cache_disk" != "no" ; then
       enable_cache_disk=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cache_disk=no
+    fi
+  else
+    enable_cache_disk=no
   fi
   if test "$enable_cache_disk" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -12146,9 +12321,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_cache is disabled but required for mod_cache_disk\"" >&5
 $as_echo "$as_me: WARNING: \"mod_cache is disabled but required for mod_cache_disk\"" >&2;}
                             elif test "$enable_cache_disk" = "static" && test "$enable_cache" != "static" ; then
-                              enable_cache_disk=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_cache_disk statically if mod_cache is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_cache_disk statically if mod_cache is built shared\"" >&2;}
+                              enable_cache_disk=$enable_cache
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_cache_disk shared because mod_cache is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_cache_disk shared because mod_cache is built shared\"" >&2;}
                             else
             :
             fi
@@ -12173,7 +12348,6 @@ $as_echo "$enable_cache_disk$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cache_disk=`echo $enable_cache_disk|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cache_disk"
@@ -12253,34 +12427,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cache_socache" in
+      case "$enable_cache_socache" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cache_socache" = "static"; then
-    enable_cache_socache=static
+  if test "$enable_cache_socache" = "static" -o "$enable_cache_socache" = "shared"; then
+    :
   elif test "$enable_cache_socache" = "yes"; then
     enable_cache_socache=$module_default
+  elif test "$enable_cache_socache" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cache_socache=$module_default
+    else
+      enable_cache_socache=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cache_socache" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cache_socache=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cache_socache=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cache_socache" = "maybe-all"; then
+  elif test "$enable_cache_socache" = "all" -o "$enable_cache_socache" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cache_socache=$module_default
@@ -12288,10 +12465,15 @@ fi
     else
       enable_cache_socache=no
     fi
-  elif test "$enable_cache_socache" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cache_socache" != "no" ; then
+  elif test "$enable_cache_socache" = "reallyall" -o "$enable_cache_socache" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cache_socache" != "no" ; then
       enable_cache_socache=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cache_socache=no
+    fi
+  else
+    enable_cache_socache=no
   fi
   if test "$enable_cache_socache" != "no"; then
             :
@@ -12307,7 +12489,6 @@ $as_echo "$enable_cache_socache$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cache_socache=`echo $enable_cache_socache|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cache_socache"
@@ -12390,34 +12571,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_socache_shmcb" in
+      case "$enable_socache_shmcb" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_socache_shmcb" = "static"; then
-    enable_socache_shmcb=static
+  if test "$enable_socache_shmcb" = "static" -o "$enable_socache_shmcb" = "shared"; then
+    :
   elif test "$enable_socache_shmcb" = "yes"; then
     enable_socache_shmcb=$module_default
+  elif test "$enable_socache_shmcb" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_socache_shmcb=$module_default
+    else
+      enable_socache_shmcb=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_socache_shmcb" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_socache_shmcb=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_socache_shmcb=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_socache_shmcb" = "maybe-all"; then
+  elif test "$enable_socache_shmcb" = "all" -o "$enable_socache_shmcb" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_socache_shmcb=$module_default
@@ -12425,10 +12609,15 @@ fi
     else
       enable_socache_shmcb=no
     fi
-  elif test "$enable_socache_shmcb" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_socache_shmcb" != "no" ; then
+  elif test "$enable_socache_shmcb" = "reallyall" -o "$enable_socache_shmcb" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_socache_shmcb" != "no" ; then
       enable_socache_shmcb=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_socache_shmcb=no
+    fi
+  else
+    enable_socache_shmcb=no
   fi
   if test "$enable_socache_shmcb" != "no"; then
             :
@@ -12444,7 +12633,6 @@ $as_echo "$enable_socache_shmcb$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_socache_shmcb=`echo $enable_socache_shmcb|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES socache_shmcb"
@@ -12524,34 +12712,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_socache_dbm" in
+      case "$enable_socache_dbm" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_socache_dbm" = "static"; then
-    enable_socache_dbm=static
+  if test "$enable_socache_dbm" = "static" -o "$enable_socache_dbm" = "shared"; then
+    :
   elif test "$enable_socache_dbm" = "yes"; then
     enable_socache_dbm=$module_default
+  elif test "$enable_socache_dbm" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_socache_dbm=$module_default
+    else
+      enable_socache_dbm=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_socache_dbm" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_socache_dbm=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_socache_dbm=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_socache_dbm" = "maybe-all"; then
+  elif test "$enable_socache_dbm" = "all" -o "$enable_socache_dbm" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_socache_dbm=$module_default
@@ -12559,10 +12750,15 @@ fi
     else
       enable_socache_dbm=no
     fi
-  elif test "$enable_socache_dbm" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_socache_dbm" != "no" ; then
+  elif test "$enable_socache_dbm" = "reallyall" -o "$enable_socache_dbm" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_socache_dbm" != "no" ; then
       enable_socache_dbm=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_socache_dbm=no
+    fi
+  else
+    enable_socache_dbm=no
   fi
   if test "$enable_socache_dbm" != "no"; then
             :
@@ -12578,7 +12774,6 @@ $as_echo "$enable_socache_dbm$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_socache_dbm=`echo $enable_socache_dbm|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES socache_dbm"
@@ -12658,34 +12853,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_socache_memcache" in
+      case "$enable_socache_memcache" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_socache_memcache" = "static"; then
-    enable_socache_memcache=static
+  if test "$enable_socache_memcache" = "static" -o "$enable_socache_memcache" = "shared"; then
+    :
   elif test "$enable_socache_memcache" = "yes"; then
     enable_socache_memcache=$module_default
+  elif test "$enable_socache_memcache" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_socache_memcache=$module_default
+    else
+      enable_socache_memcache=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_socache_memcache" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_socache_memcache=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_socache_memcache=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_socache_memcache" = "maybe-all"; then
+  elif test "$enable_socache_memcache" = "all" -o "$enable_socache_memcache" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_socache_memcache=$module_default
@@ -12693,10 +12891,15 @@ fi
     else
       enable_socache_memcache=no
     fi
-  elif test "$enable_socache_memcache" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_socache_memcache" != "no" ; then
+  elif test "$enable_socache_memcache" = "reallyall" -o "$enable_socache_memcache" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_socache_memcache" != "no" ; then
       enable_socache_memcache=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_socache_memcache=no
+    fi
+  else
+    enable_socache_memcache=no
   fi
   if test "$enable_socache_memcache" != "no"; then
             :
@@ -12712,7 +12915,6 @@ $as_echo "$enable_socache_memcache$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_socache_memcache=`echo $enable_socache_memcache|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES socache_memcache"
@@ -12792,34 +12994,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_socache_dc" in
+      case "$enable_socache_dc" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_socache_dc" = "static"; then
-    enable_socache_dc=static
+  if test "$enable_socache_dc" = "static" -o "$enable_socache_dc" = "shared"; then
+    :
   elif test "$enable_socache_dc" = "yes"; then
     enable_socache_dc=$module_default
+  elif test "$enable_socache_dc" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_socache_dc=$module_default
+    else
+      enable_socache_dc=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_socache_dc" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_socache_dc=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_socache_dc=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_socache_dc" = "maybe-all"; then
+  elif test "$enable_socache_dc" = "all" -o "$enable_socache_dc" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_socache_dc=$module_default
@@ -12827,10 +13032,15 @@ fi
     else
       enable_socache_dc=no
     fi
-  elif test "$enable_socache_dc" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_socache_dc" != "no" ; then
+  elif test "$enable_socache_dc" = "reallyall" -o "$enable_socache_dc" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_socache_dc" != "no" ; then
       enable_socache_dc=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_socache_dc=no
+    fi
+  else
+    enable_socache_dc=no
   fi
   if test "$enable_socache_dc" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -13159,7 +13369,6 @@ $as_echo "$enable_socache_dc$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_socache_dc=`echo $enable_socache_dc|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES socache_dc"
@@ -13377,34 +13586,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_so" in
+      case "$enable_so" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_so" = "static"; then
-    enable_so=static
+  if test "$enable_so" = "static" -o "$enable_so" = "shared"; then
+    :
   elif test "$enable_so" = "yes"; then
     enable_so=$module_default
+  elif test "$enable_so" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_so=$module_default
+    else
+      enable_so=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_so" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_so=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_so=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_so" = "maybe-all"; then
+  elif test "$enable_so" = "all" -o "$enable_so" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_so=$module_default
@@ -13412,10 +13624,15 @@ fi
     else
       enable_so=no
     fi
-  elif test "$enable_so" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_so" != "no" ; then
+  elif test "$enable_so" = "reallyall" -o "$enable_so" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_so" != "no" ; then
       enable_so=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_so=no
+    fi
+  else
+    enable_so=no
   fi
   if test "$enable_so" != "no"; then
             :
@@ -13431,7 +13648,6 @@ $as_echo "$enable_so$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_so=`echo $enable_so|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES so"
@@ -13508,38 +13724,41 @@ $as_echo_n "checking whether to enable mod_watchdog... " >&6; }
 if test "${enable_watchdog+set}" = set; then :
   enableval=$enable_watchdog; force_watchdog=$enableval
 else
-  enable_watchdog=maybe-all
+  enable_watchdog=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_watchdog" in
+      case "$enable_watchdog" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_watchdog" = "static"; then
-    enable_watchdog=static
+  if test "$enable_watchdog" = "static" -o "$enable_watchdog" = "shared"; then
+    :
   elif test "$enable_watchdog" = "yes"; then
     enable_watchdog=$module_default
+  elif test "$enable_watchdog" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_watchdog=$module_default
+    else
+      enable_watchdog=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_watchdog" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_watchdog=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_watchdog=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_watchdog" = "maybe-all"; then
+  elif test "$enable_watchdog" = "all" -o "$enable_watchdog" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_watchdog=$module_default
@@ -13547,10 +13766,15 @@ fi
     else
       enable_watchdog=no
     fi
-  elif test "$enable_watchdog" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_watchdog" != "no" ; then
+  elif test "$enable_watchdog" = "reallyall" -o "$enable_watchdog" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_watchdog" != "no" ; then
       enable_watchdog=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_watchdog=no
+    fi
+  else
+    enable_watchdog=no
   fi
   if test "$enable_watchdog" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -13607,11 +13831,10 @@ $as_echo "$enable_watchdog$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_watchdog=`echo $enable_watchdog|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES watchdog"
-      if test "" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},watchdog"
       fi
       ;;
@@ -13688,34 +13911,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_macro" in
+      case "$enable_macro" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_macro" = "static"; then
-    enable_macro=static
+  if test "$enable_macro" = "static" -o "$enable_macro" = "shared"; then
+    :
   elif test "$enable_macro" = "yes"; then
     enable_macro=$module_default
+  elif test "$enable_macro" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_macro=$module_default
+    else
+      enable_macro=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_macro" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_macro=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_macro=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_macro" = "maybe-all"; then
+  elif test "$enable_macro" = "all" -o "$enable_macro" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_macro=$module_default
@@ -13723,10 +13949,15 @@ fi
     else
       enable_macro=no
     fi
-  elif test "$enable_macro" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_macro" != "no" ; then
+  elif test "$enable_macro" = "reallyall" -o "$enable_macro" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_macro" != "no" ; then
       enable_macro=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_macro=no
+    fi
+  else
+    enable_macro=no
   fi
   if test "$enable_macro" != "no"; then
             :
@@ -13742,7 +13973,6 @@ $as_echo "$enable_macro$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_macro=`echo $enable_macro|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES macro"
@@ -13877,34 +14107,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_dbd" in
+      case "$enable_dbd" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_dbd" = "static"; then
-    enable_dbd=static
+  if test "$enable_dbd" = "static" -o "$enable_dbd" = "shared"; then
+    :
   elif test "$enable_dbd" = "yes"; then
     enable_dbd=$module_default
+  elif test "$enable_dbd" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_dbd=$module_default
+    else
+      enable_dbd=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_dbd" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_dbd=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_dbd=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_dbd" = "maybe-all"; then
+  elif test "$enable_dbd" = "all" -o "$enable_dbd" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_dbd=$module_default
@@ -13912,10 +14145,15 @@ fi
     else
       enable_dbd=no
     fi
-  elif test "$enable_dbd" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_dbd" != "no" ; then
+  elif test "$enable_dbd" = "reallyall" -o "$enable_dbd" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_dbd" != "no" ; then
       enable_dbd=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_dbd=no
+    fi
+  else
+    enable_dbd=no
   fi
   if test "$enable_dbd" != "no"; then
             :
@@ -13931,7 +14169,6 @@ $as_echo "$enable_dbd$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_dbd=`echo $enable_dbd|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dbd"
@@ -14066,34 +14303,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_bucketeer" in
+      case "$enable_bucketeer" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_bucketeer" = "static"; then
-    enable_bucketeer=static
+  if test "$enable_bucketeer" = "static" -o "$enable_bucketeer" = "shared"; then
+    :
   elif test "$enable_bucketeer" = "yes"; then
     enable_bucketeer=$module_default
+  elif test "$enable_bucketeer" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_bucketeer=$module_default
+    else
+      enable_bucketeer=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_bucketeer" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_bucketeer=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_bucketeer=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_bucketeer" = "maybe-all"; then
+  elif test "$enable_bucketeer" = "all" -o "$enable_bucketeer" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_bucketeer=$module_default
@@ -14101,10 +14341,15 @@ fi
     else
       enable_bucketeer=no
     fi
-  elif test "$enable_bucketeer" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_bucketeer" != "no" ; then
+  elif test "$enable_bucketeer" = "reallyall" -o "$enable_bucketeer" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_bucketeer" != "no" ; then
       enable_bucketeer=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_bucketeer=no
+    fi
+  else
+    enable_bucketeer=no
   fi
   if test "$enable_bucketeer" != "no"; then
             :
@@ -14120,7 +14365,6 @@ $as_echo "$enable_bucketeer$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_bucketeer=`echo $enable_bucketeer|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES bucketeer"
@@ -14200,34 +14444,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_dumpio" in
+      case "$enable_dumpio" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_dumpio" = "static"; then
-    enable_dumpio=static
+  if test "$enable_dumpio" = "static" -o "$enable_dumpio" = "shared"; then
+    :
   elif test "$enable_dumpio" = "yes"; then
     enable_dumpio=$module_default
+  elif test "$enable_dumpio" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_dumpio=$module_default
+    else
+      enable_dumpio=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_dumpio" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_dumpio=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_dumpio=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_dumpio" = "maybe-all"; then
+  elif test "$enable_dumpio" = "all" -o "$enable_dumpio" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_dumpio=$module_default
@@ -14235,10 +14482,15 @@ fi
     else
       enable_dumpio=no
     fi
-  elif test "$enable_dumpio" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_dumpio" != "no" ; then
+  elif test "$enable_dumpio" = "reallyall" -o "$enable_dumpio" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_dumpio" != "no" ; then
       enable_dumpio=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_dumpio=no
+    fi
+  else
+    enable_dumpio=no
   fi
   if test "$enable_dumpio" != "no"; then
             :
@@ -14254,7 +14506,6 @@ $as_echo "$enable_dumpio$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_dumpio=`echo $enable_dumpio|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dumpio"
@@ -14368,34 +14619,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_echo" in
+      case "$enable_echo" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_echo" = "static"; then
-    enable_echo=static
+  if test "$enable_echo" = "static" -o "$enable_echo" = "shared"; then
+    :
   elif test "$enable_echo" = "yes"; then
     enable_echo=$module_default
+  elif test "$enable_echo" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_echo=$module_default
+    else
+      enable_echo=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_echo" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_echo=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_echo=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_echo" = "maybe-all"; then
+  elif test "$enable_echo" = "all" -o "$enable_echo" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_echo=$module_default
@@ -14403,10 +14657,15 @@ fi
     else
       enable_echo=no
     fi
-  elif test "$enable_echo" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_echo" != "no" ; then
+  elif test "$enable_echo" = "reallyall" -o "$enable_echo" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_echo" != "no" ; then
       enable_echo=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_echo=no
+    fi
+  else
+    enable_echo=no
   fi
   if test "$enable_echo" != "no"; then
             :
@@ -14422,7 +14681,6 @@ $as_echo "$enable_echo$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_echo=`echo $enable_echo|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES echo"
@@ -14535,34 +14793,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_example_hooks" in
+      case "$enable_example_hooks" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_example_hooks" = "static"; then
-    enable_example_hooks=static
+  if test "$enable_example_hooks" = "static" -o "$enable_example_hooks" = "shared"; then
+    :
   elif test "$enable_example_hooks" = "yes"; then
     enable_example_hooks=$module_default
+  elif test "$enable_example_hooks" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_example_hooks=$module_default
+    else
+      enable_example_hooks=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_example_hooks" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_example_hooks=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_example_hooks=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_example_hooks" = "maybe-all"; then
+  elif test "$enable_example_hooks" = "all" -o "$enable_example_hooks" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_example_hooks=$module_default
@@ -14570,10 +14831,15 @@ fi
     else
       enable_example_hooks=no
     fi
-  elif test "$enable_example_hooks" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_example_hooks" != "no" ; then
+  elif test "$enable_example_hooks" = "reallyall" -o "$enable_example_hooks" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_example_hooks" != "no" ; then
       enable_example_hooks=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_example_hooks=no
+    fi
+  else
+    enable_example_hooks=no
   fi
   if test "$enable_example_hooks" != "no"; then
             :
@@ -14589,7 +14855,6 @@ $as_echo "$enable_example_hooks$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_example_hooks=`echo $enable_example_hooks|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES example_hooks"
@@ -14669,34 +14934,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_case_filter" in
+      case "$enable_case_filter" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_case_filter" = "static"; then
-    enable_case_filter=static
+  if test "$enable_case_filter" = "static" -o "$enable_case_filter" = "shared"; then
+    :
   elif test "$enable_case_filter" = "yes"; then
     enable_case_filter=$module_default
+  elif test "$enable_case_filter" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_case_filter=$module_default
+    else
+      enable_case_filter=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_case_filter" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_case_filter=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_case_filter=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_case_filter" = "maybe-all"; then
+  elif test "$enable_case_filter" = "all" -o "$enable_case_filter" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_case_filter=$module_default
@@ -14704,10 +14972,15 @@ fi
     else
       enable_case_filter=no
     fi
-  elif test "$enable_case_filter" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_case_filter" != "no" ; then
+  elif test "$enable_case_filter" = "reallyall" -o "$enable_case_filter" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_case_filter" != "no" ; then
       enable_case_filter=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_case_filter=no
+    fi
+  else
+    enable_case_filter=no
   fi
   if test "$enable_case_filter" != "no"; then
             :
@@ -14723,7 +14996,6 @@ $as_echo "$enable_case_filter$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_case_filter=`echo $enable_case_filter|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES case_filter"
@@ -14803,34 +15075,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_case_filter_in" in
+      case "$enable_case_filter_in" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_case_filter_in" = "static"; then
-    enable_case_filter_in=static
+  if test "$enable_case_filter_in" = "static" -o "$enable_case_filter_in" = "shared"; then
+    :
   elif test "$enable_case_filter_in" = "yes"; then
     enable_case_filter_in=$module_default
+  elif test "$enable_case_filter_in" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_case_filter_in=$module_default
+    else
+      enable_case_filter_in=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_case_filter_in" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_case_filter_in=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_case_filter_in=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_case_filter_in" = "maybe-all"; then
+  elif test "$enable_case_filter_in" = "all" -o "$enable_case_filter_in" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_case_filter_in=$module_default
@@ -14838,10 +15113,15 @@ fi
     else
       enable_case_filter_in=no
     fi
-  elif test "$enable_case_filter_in" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_case_filter_in" != "no" ; then
+  elif test "$enable_case_filter_in" = "reallyall" -o "$enable_case_filter_in" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_case_filter_in" != "no" ; then
       enable_case_filter_in=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_case_filter_in=no
+    fi
+  else
+    enable_case_filter_in=no
   fi
   if test "$enable_case_filter_in" != "no"; then
             :
@@ -14857,7 +15137,6 @@ $as_echo "$enable_case_filter_in$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_case_filter_in=`echo $enable_case_filter_in|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES case_filter_in"
@@ -14937,34 +15216,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_example_ipc" in
+      case "$enable_example_ipc" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_example_ipc" = "static"; then
-    enable_example_ipc=static
+  if test "$enable_example_ipc" = "static" -o "$enable_example_ipc" = "shared"; then
+    :
   elif test "$enable_example_ipc" = "yes"; then
     enable_example_ipc=$module_default
+  elif test "$enable_example_ipc" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_example_ipc=$module_default
+    else
+      enable_example_ipc=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_example_ipc" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_example_ipc=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_example_ipc=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_example_ipc" = "maybe-all"; then
+  elif test "$enable_example_ipc" = "all" -o "$enable_example_ipc" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_example_ipc=$module_default
@@ -14972,10 +15254,15 @@ fi
     else
       enable_example_ipc=no
     fi
-  elif test "$enable_example_ipc" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_example_ipc" != "no" ; then
+  elif test "$enable_example_ipc" = "reallyall" -o "$enable_example_ipc" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_example_ipc" != "no" ; then
       enable_example_ipc=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_example_ipc=no
+    fi
+  else
+    enable_example_ipc=no
   fi
   if test "$enable_example_ipc" != "no"; then
             :
@@ -14991,7 +15278,6 @@ $as_echo "$enable_example_ipc$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_example_ipc=`echo $enable_example_ipc|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES example_ipc"
@@ -15137,34 +15423,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_buffer" in
+      case "$enable_buffer" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_buffer" = "static"; then
-    enable_buffer=static
+  if test "$enable_buffer" = "static" -o "$enable_buffer" = "shared"; then
+    :
   elif test "$enable_buffer" = "yes"; then
     enable_buffer=$module_default
+  elif test "$enable_buffer" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_buffer=$module_default
+    else
+      enable_buffer=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_buffer" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_buffer=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_buffer=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_buffer" = "maybe-all"; then
+  elif test "$enable_buffer" = "all" -o "$enable_buffer" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_buffer=$module_default
@@ -15172,10 +15461,15 @@ fi
     else
       enable_buffer=no
     fi
-  elif test "$enable_buffer" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_buffer" != "no" ; then
+  elif test "$enable_buffer" = "reallyall" -o "$enable_buffer" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_buffer" != "no" ; then
       enable_buffer=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_buffer=no
+    fi
+  else
+    enable_buffer=no
   fi
   if test "$enable_buffer" != "no"; then
             :
@@ -15191,7 +15485,6 @@ $as_echo "$enable_buffer$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_buffer=`echo $enable_buffer|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES buffer"
@@ -15271,34 +15564,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_data" in
+      case "$enable_data" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_data" = "static"; then
-    enable_data=static
+  if test "$enable_data" = "static" -o "$enable_data" = "shared"; then
+    :
   elif test "$enable_data" = "yes"; then
     enable_data=$module_default
+  elif test "$enable_data" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_data=$module_default
+    else
+      enable_data=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_data" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_data=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_data=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_data" = "maybe-all"; then
+  elif test "$enable_data" = "all" -o "$enable_data" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_data=$module_default
@@ -15306,10 +15602,15 @@ fi
     else
       enable_data=no
     fi
-  elif test "$enable_data" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_data" != "no" ; then
+  elif test "$enable_data" = "reallyall" -o "$enable_data" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_data" != "no" ; then
       enable_data=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_data=no
+    fi
+  else
+    enable_data=no
   fi
   if test "$enable_data" != "no"; then
             :
@@ -15325,7 +15626,6 @@ $as_echo "$enable_data$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_data=`echo $enable_data|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES data"
@@ -15405,34 +15705,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_ratelimit" in
+      case "$enable_ratelimit" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_ratelimit" = "static"; then
-    enable_ratelimit=static
+  if test "$enable_ratelimit" = "static" -o "$enable_ratelimit" = "shared"; then
+    :
   elif test "$enable_ratelimit" = "yes"; then
     enable_ratelimit=$module_default
+  elif test "$enable_ratelimit" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_ratelimit=$module_default
+    else
+      enable_ratelimit=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_ratelimit" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_ratelimit=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_ratelimit=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_ratelimit" = "maybe-all"; then
+  elif test "$enable_ratelimit" = "all" -o "$enable_ratelimit" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_ratelimit=$module_default
@@ -15440,10 +15743,15 @@ fi
     else
       enable_ratelimit=no
     fi
-  elif test "$enable_ratelimit" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_ratelimit" != "no" ; then
+  elif test "$enable_ratelimit" = "reallyall" -o "$enable_ratelimit" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_ratelimit" != "no" ; then
       enable_ratelimit=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_ratelimit=no
+    fi
+  else
+    enable_ratelimit=no
   fi
   if test "$enable_ratelimit" != "no"; then
             :
@@ -15459,7 +15767,6 @@ $as_echo "$enable_ratelimit$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_ratelimit=`echo $enable_ratelimit|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ratelimit"
@@ -15539,34 +15846,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_reqtimeout" in
+      case "$enable_reqtimeout" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_reqtimeout" = "static"; then
-    enable_reqtimeout=static
+  if test "$enable_reqtimeout" = "static" -o "$enable_reqtimeout" = "shared"; then
+    :
   elif test "$enable_reqtimeout" = "yes"; then
     enable_reqtimeout=$module_default
+  elif test "$enable_reqtimeout" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_reqtimeout=$module_default
+    else
+      enable_reqtimeout=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_reqtimeout" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_reqtimeout=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_reqtimeout=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_reqtimeout" = "maybe-all"; then
+  elif test "$enable_reqtimeout" = "all" -o "$enable_reqtimeout" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_reqtimeout=$module_default
@@ -15574,10 +15884,15 @@ fi
     else
       enable_reqtimeout=no
     fi
-  elif test "$enable_reqtimeout" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_reqtimeout" != "no" ; then
+  elif test "$enable_reqtimeout" = "reallyall" -o "$enable_reqtimeout" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_reqtimeout" != "no" ; then
       enable_reqtimeout=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_reqtimeout=no
+    fi
+  else
+    enable_reqtimeout=no
   fi
   if test "$enable_reqtimeout" != "no"; then
             :
@@ -15593,7 +15908,6 @@ $as_echo "$enable_reqtimeout$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_reqtimeout=`echo $enable_reqtimeout|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES reqtimeout"
@@ -15673,34 +15987,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_ext_filter" in
+      case "$enable_ext_filter" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_ext_filter" = "static"; then
-    enable_ext_filter=static
+  if test "$enable_ext_filter" = "static" -o "$enable_ext_filter" = "shared"; then
+    :
   elif test "$enable_ext_filter" = "yes"; then
     enable_ext_filter=$module_default
+  elif test "$enable_ext_filter" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_ext_filter=$module_default
+    else
+      enable_ext_filter=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_ext_filter" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_ext_filter=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_ext_filter=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_ext_filter" = "maybe-all"; then
+  elif test "$enable_ext_filter" = "all" -o "$enable_ext_filter" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_ext_filter=$module_default
@@ -15708,10 +16025,15 @@ fi
     else
       enable_ext_filter=no
     fi
-  elif test "$enable_ext_filter" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_ext_filter" != "no" ; then
+  elif test "$enable_ext_filter" = "reallyall" -o "$enable_ext_filter" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_ext_filter" != "no" ; then
       enable_ext_filter=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_ext_filter=no
+    fi
+  else
+    enable_ext_filter=no
   fi
   if test "$enable_ext_filter" != "no"; then
             :
@@ -15727,7 +16049,6 @@ $as_echo "$enable_ext_filter$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_ext_filter=`echo $enable_ext_filter|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ext_filter"
@@ -15807,34 +16128,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_request" in
+      case "$enable_request" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_request" = "static"; then
-    enable_request=static
+  if test "$enable_request" = "static" -o "$enable_request" = "shared"; then
+    :
   elif test "$enable_request" = "yes"; then
     enable_request=$module_default
+  elif test "$enable_request" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_request=$module_default
+    else
+      enable_request=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_request" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_request=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_request=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_request" = "maybe-all"; then
+  elif test "$enable_request" = "all" -o "$enable_request" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_request=$module_default
@@ -15842,10 +16166,15 @@ fi
     else
       enable_request=no
     fi
-  elif test "$enable_request" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_request" != "no" ; then
+  elif test "$enable_request" = "reallyall" -o "$enable_request" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_request" != "no" ; then
       enable_request=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_request=no
+    fi
+  else
+    enable_request=no
   fi
   if test "$enable_request" != "no"; then
             :
@@ -15861,7 +16190,6 @@ $as_echo "$enable_request$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_request=`echo $enable_request|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES request"
@@ -15941,34 +16269,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_include" in
+      case "$enable_include" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_include" = "static"; then
-    enable_include=static
+  if test "$enable_include" = "static" -o "$enable_include" = "shared"; then
+    :
   elif test "$enable_include" = "yes"; then
     enable_include=$module_default
+  elif test "$enable_include" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_include=$module_default
+    else
+      enable_include=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_include" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_include=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_include=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_include" = "maybe-all"; then
+  elif test "$enable_include" = "all" -o "$enable_include" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_include=$module_default
@@ -15976,10 +16307,15 @@ fi
     else
       enable_include=no
     fi
-  elif test "$enable_include" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_include" != "no" ; then
+  elif test "$enable_include" = "reallyall" -o "$enable_include" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_include" != "no" ; then
       enable_include=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_include=no
+    fi
+  else
+    enable_include=no
   fi
   if test "$enable_include" != "no"; then
             :
@@ -15995,7 +16331,6 @@ $as_echo "$enable_include$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_include=`echo $enable_include|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES include"
@@ -16075,34 +16410,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_filter" in
+      case "$enable_filter" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_filter" = "static"; then
-    enable_filter=static
+  if test "$enable_filter" = "static" -o "$enable_filter" = "shared"; then
+    :
   elif test "$enable_filter" = "yes"; then
     enable_filter=$module_default
+  elif test "$enable_filter" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_filter=$module_default
+    else
+      enable_filter=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_filter" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_filter=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_filter=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_filter" = "maybe-all"; then
+  elif test "$enable_filter" = "all" -o "$enable_filter" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_filter=$module_default
@@ -16110,10 +16448,15 @@ fi
     else
       enable_filter=no
     fi
-  elif test "$enable_filter" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_filter" != "no" ; then
+  elif test "$enable_filter" = "reallyall" -o "$enable_filter" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_filter" != "no" ; then
       enable_filter=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_filter=no
+    fi
+  else
+    enable_filter=no
   fi
   if test "$enable_filter" != "no"; then
             :
@@ -16129,7 +16472,6 @@ $as_echo "$enable_filter$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_filter=`echo $enable_filter|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES filter"
@@ -16209,34 +16551,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_reflector" in
+      case "$enable_reflector" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_reflector" = "static"; then
-    enable_reflector=static
+  if test "$enable_reflector" = "static" -o "$enable_reflector" = "shared"; then
+    :
   elif test "$enable_reflector" = "yes"; then
     enable_reflector=$module_default
+  elif test "$enable_reflector" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_reflector=$module_default
+    else
+      enable_reflector=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_reflector" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_reflector=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_reflector=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_reflector" = "maybe-all"; then
+  elif test "$enable_reflector" = "all" -o "$enable_reflector" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_reflector=$module_default
@@ -16244,10 +16589,15 @@ fi
     else
       enable_reflector=no
     fi
-  elif test "$enable_reflector" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_reflector" != "no" ; then
+  elif test "$enable_reflector" = "reallyall" -o "$enable_reflector" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_reflector" != "no" ; then
       enable_reflector=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_reflector=no
+    fi
+  else
+    enable_reflector=no
   fi
   if test "$enable_reflector" != "no"; then
             :
@@ -16263,7 +16613,6 @@ $as_echo "$enable_reflector$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_reflector=`echo $enable_reflector|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES reflector"
@@ -16343,34 +16692,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_substitute" in
+      case "$enable_substitute" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_substitute" = "static"; then
-    enable_substitute=static
+  if test "$enable_substitute" = "static" -o "$enable_substitute" = "shared"; then
+    :
   elif test "$enable_substitute" = "yes"; then
     enable_substitute=$module_default
+  elif test "$enable_substitute" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_substitute=$module_default
+    else
+      enable_substitute=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_substitute" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_substitute=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_substitute=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_substitute" = "maybe-all"; then
+  elif test "$enable_substitute" = "all" -o "$enable_substitute" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_substitute=$module_default
@@ -16378,10 +16730,15 @@ fi
     else
       enable_substitute=no
     fi
-  elif test "$enable_substitute" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_substitute" != "no" ; then
+  elif test "$enable_substitute" = "reallyall" -o "$enable_substitute" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_substitute" != "no" ; then
       enable_substitute=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_substitute=no
+    fi
+  else
+    enable_substitute=no
   fi
   if test "$enable_substitute" != "no"; then
             :
@@ -16397,7 +16754,6 @@ $as_echo "$enable_substitute$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_substitute=`echo $enable_substitute|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES substitute"
@@ -16479,34 +16835,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_sed" in
+      case "$enable_sed" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_sed" = "static"; then
-    enable_sed=static
+  if test "$enable_sed" = "static" -o "$enable_sed" = "shared"; then
+    :
   elif test "$enable_sed" = "yes"; then
     enable_sed=$module_default
+  elif test "$enable_sed" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_sed=$module_default
+    else
+      enable_sed=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_sed" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_sed=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_sed=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_sed" = "maybe-all"; then
+  elif test "$enable_sed" = "all" -o "$enable_sed" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_sed=$module_default
@@ -16514,10 +16873,15 @@ fi
     else
       enable_sed=no
     fi
-  elif test "$enable_sed" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_sed" != "no" ; then
+  elif test "$enable_sed" = "reallyall" -o "$enable_sed" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_sed" != "no" ; then
       enable_sed=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_sed=no
+    fi
+  else
+    enable_sed=no
   fi
   if test "$enable_sed" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -16572,7 +16936,6 @@ $as_echo "$enable_sed$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_sed=`echo $enable_sed|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES sed"
@@ -16656,34 +17019,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_charset_lite" in
+      case "$enable_charset_lite" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_charset_lite" = "static"; then
-    enable_charset_lite=static
+  if test "$enable_charset_lite" = "static" -o "$enable_charset_lite" = "shared"; then
+    :
   elif test "$enable_charset_lite" = "yes"; then
     enable_charset_lite=$module_default
+  elif test "$enable_charset_lite" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_charset_lite=$module_default
+    else
+      enable_charset_lite=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_charset_lite" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_charset_lite=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_charset_lite=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_charset_lite" = "maybe-all"; then
+  elif test "$enable_charset_lite" = "all" -o "$enable_charset_lite" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_charset_lite=$module_default
@@ -16691,10 +17057,15 @@ fi
     else
       enable_charset_lite=no
     fi
-  elif test "$enable_charset_lite" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_charset_lite" != "no" ; then
+  elif test "$enable_charset_lite" = "reallyall" -o "$enable_charset_lite" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_charset_lite" != "no" ; then
       enable_charset_lite=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_charset_lite=no
+    fi
+  else
+    enable_charset_lite=no
   fi
   if test "$enable_charset_lite" != "no"; then
             :
@@ -16710,7 +17081,6 @@ $as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_charset_lite=`echo $enable_charset_lite|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES charset_lite"
@@ -16791,34 +17161,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_charset_lite" in
+      case "$enable_charset_lite" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_charset_lite" = "static"; then
-    enable_charset_lite=static
+  if test "$enable_charset_lite" = "static" -o "$enable_charset_lite" = "shared"; then
+    :
   elif test "$enable_charset_lite" = "yes"; then
     enable_charset_lite=$module_default
+  elif test "$enable_charset_lite" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_charset_lite=$module_default
+    else
+      enable_charset_lite=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_charset_lite" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_charset_lite=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_charset_lite=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_charset_lite" = "maybe-all"; then
+  elif test "$enable_charset_lite" = "all" -o "$enable_charset_lite" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_charset_lite=$module_default
@@ -16826,10 +17199,15 @@ fi
     else
       enable_charset_lite=no
     fi
-  elif test "$enable_charset_lite" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_charset_lite" != "no" ; then
+  elif test "$enable_charset_lite" = "reallyall" -o "$enable_charset_lite" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_charset_lite" != "no" ; then
       enable_charset_lite=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_charset_lite=no
+    fi
+  else
+    enable_charset_lite=no
   fi
   if test "$enable_charset_lite" != "no"; then
             :
@@ -16845,7 +17223,6 @@ $as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_charset_lite=`echo $enable_charset_lite|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES charset_lite"
@@ -16928,34 +17305,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_deflate" in
+      case "$enable_deflate" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_deflate" = "static"; then
-    enable_deflate=static
+  if test "$enable_deflate" = "static" -o "$enable_deflate" = "shared"; then
+    :
   elif test "$enable_deflate" = "yes"; then
     enable_deflate=$module_default
+  elif test "$enable_deflate" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_deflate=$module_default
+    else
+      enable_deflate=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_deflate" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_deflate=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_deflate=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_deflate" = "maybe-all"; then
+  elif test "$enable_deflate" = "all" -o "$enable_deflate" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_deflate=$module_default
@@ -16963,10 +17343,15 @@ fi
     else
       enable_deflate=no
     fi
-  elif test "$enable_deflate" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_deflate" != "no" ; then
+  elif test "$enable_deflate" = "reallyall" -o "$enable_deflate" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_deflate" != "no" ; then
       enable_deflate=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_deflate=no
+    fi
+  else
+    enable_deflate=no
   fi
   if test "$enable_deflate" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -17265,7 +17650,6 @@ $as_echo "$enable_deflate$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_deflate=`echo $enable_deflate|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES deflate"
@@ -17348,34 +17732,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_xml2enc" in
+      case "$enable_xml2enc" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_xml2enc" = "static"; then
-    enable_xml2enc=static
+  if test "$enable_xml2enc" = "static" -o "$enable_xml2enc" = "shared"; then
+    :
   elif test "$enable_xml2enc" = "yes"; then
     enable_xml2enc=$module_default
+  elif test "$enable_xml2enc" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_xml2enc=$module_default
+    else
+      enable_xml2enc=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_xml2enc" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_xml2enc=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_xml2enc=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_xml2enc" = "maybe-all"; then
+  elif test "$enable_xml2enc" = "all" -o "$enable_xml2enc" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_xml2enc=$module_default
@@ -17383,10 +17770,15 @@ fi
     else
       enable_xml2enc=no
     fi
-  elif test "$enable_xml2enc" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_xml2enc" != "no" ; then
+  elif test "$enable_xml2enc" = "reallyall" -o "$enable_xml2enc" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_xml2enc" != "no" ; then
       enable_xml2enc=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_xml2enc=no
+    fi
+  else
+    enable_xml2enc=no
   fi
   if test "$enable_xml2enc" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -17498,7 +17890,6 @@ $as_echo "$enable_xml2enc$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_xml2enc=`echo $enable_xml2enc|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES xml2enc"
@@ -17578,34 +17969,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_html" in
+      case "$enable_proxy_html" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_html" = "static"; then
-    enable_proxy_html=static
+  if test "$enable_proxy_html" = "static" -o "$enable_proxy_html" = "shared"; then
+    :
   elif test "$enable_proxy_html" = "yes"; then
     enable_proxy_html=$module_default
+  elif test "$enable_proxy_html" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_html=$module_default
+    else
+      enable_proxy_html=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_html" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_html=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_html=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_html" = "maybe-all"; then
+  elif test "$enable_proxy_html" = "all" -o "$enable_proxy_html" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_html=$module_default
@@ -17613,10 +18007,15 @@ fi
     else
       enable_proxy_html=no
     fi
-  elif test "$enable_proxy_html" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_html" != "no" ; then
+  elif test "$enable_proxy_html" = "reallyall" -o "$enable_proxy_html" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_html" != "no" ; then
       enable_proxy_html=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_html=no
+    fi
+  else
+    enable_proxy_html=no
   fi
   if test "$enable_proxy_html" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -17729,7 +18128,6 @@ $as_echo "$enable_proxy_html$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_html=`echo $enable_proxy_html|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_html"
@@ -17872,34 +18270,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_http" in
+      case "$enable_http" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_http" = "static"; then
-    enable_http=static
+  if test "$enable_http" = "static" -o "$enable_http" = "shared"; then
+    :
   elif test "$enable_http" = "yes"; then
     enable_http=$module_default
+  elif test "$enable_http" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_http=$module_default
+    else
+      enable_http=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_http" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_http=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_http=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_http" = "maybe-all"; then
+  elif test "$enable_http" = "all" -o "$enable_http" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_http=$module_default
@@ -17907,10 +18308,15 @@ fi
     else
       enable_http=no
     fi
-  elif test "$enable_http" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_http" != "no" ; then
+  elif test "$enable_http" = "reallyall" -o "$enable_http" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_http" != "no" ; then
       enable_http=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_http=no
+    fi
+  else
+    enable_http=no
   fi
   if test "$enable_http" != "no"; then
             :
@@ -17926,7 +18332,6 @@ $as_echo "$enable_http$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_http=`echo $enable_http|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES http"
@@ -18006,34 +18411,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_mime" in
+      case "$enable_mime" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_mime" = "static"; then
-    enable_mime=static
+  if test "$enable_mime" = "static" -o "$enable_mime" = "shared"; then
+    :
   elif test "$enable_mime" = "yes"; then
     enable_mime=$module_default
+  elif test "$enable_mime" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_mime=$module_default
+    else
+      enable_mime=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_mime" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_mime=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_mime=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_mime" = "maybe-all"; then
+  elif test "$enable_mime" = "all" -o "$enable_mime" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_mime=$module_default
@@ -18041,10 +18449,15 @@ fi
     else
       enable_mime=no
     fi
-  elif test "$enable_mime" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_mime" != "no" ; then
+  elif test "$enable_mime" = "reallyall" -o "$enable_mime" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_mime" != "no" ; then
       enable_mime=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_mime=no
+    fi
+  else
+    enable_mime=no
   fi
   if test "$enable_mime" != "no"; then
             :
@@ -18060,7 +18473,6 @@ $as_echo "$enable_mime$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_mime=`echo $enable_mime|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES mime"
@@ -18175,34 +18587,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_ldap" in
+      case "$enable_ldap" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_ldap" = "static"; then
-    enable_ldap=static
+  if test "$enable_ldap" = "static" -o "$enable_ldap" = "shared"; then
+    :
   elif test "$enable_ldap" = "yes"; then
     enable_ldap=$module_default
+  elif test "$enable_ldap" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_ldap=$module_default
+    else
+      enable_ldap=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_ldap" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_ldap=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_ldap=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_ldap" = "maybe-all"; then
+  elif test "$enable_ldap" = "all" -o "$enable_ldap" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_ldap=$module_default
@@ -18210,10 +18625,15 @@ fi
     else
       enable_ldap=no
     fi
-  elif test "$enable_ldap" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_ldap" != "no" ; then
+  elif test "$enable_ldap" = "reallyall" -o "$enable_ldap" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_ldap" != "no" ; then
       enable_ldap=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_ldap=no
+    fi
+  else
+    enable_ldap=no
   fi
   if test "$enable_ldap" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -18308,7 +18728,6 @@ $as_echo "$enable_ldap$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_ldap=`echo $enable_ldap|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ldap"
@@ -18444,34 +18863,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_log_config" in
+      case "$enable_log_config" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_log_config" = "static"; then
-    enable_log_config=static
+  if test "$enable_log_config" = "static" -o "$enable_log_config" = "shared"; then
+    :
   elif test "$enable_log_config" = "yes"; then
     enable_log_config=$module_default
+  elif test "$enable_log_config" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_log_config=$module_default
+    else
+      enable_log_config=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_log_config" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_log_config=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_log_config=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_log_config" = "maybe-all"; then
+  elif test "$enable_log_config" = "all" -o "$enable_log_config" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_log_config=$module_default
@@ -18479,10 +18901,15 @@ fi
     else
       enable_log_config=no
     fi
-  elif test "$enable_log_config" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_log_config" != "no" ; then
+  elif test "$enable_log_config" = "reallyall" -o "$enable_log_config" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_log_config" != "no" ; then
       enable_log_config=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_log_config=no
+    fi
+  else
+    enable_log_config=no
   fi
   if test "$enable_log_config" != "no"; then
             :
@@ -18498,7 +18925,6 @@ $as_echo "$enable_log_config$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_log_config=`echo $enable_log_config|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES log_config"
@@ -18578,34 +19004,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_log_debug" in
+      case "$enable_log_debug" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_log_debug" = "static"; then
-    enable_log_debug=static
+  if test "$enable_log_debug" = "static" -o "$enable_log_debug" = "shared"; then
+    :
   elif test "$enable_log_debug" = "yes"; then
     enable_log_debug=$module_default
+  elif test "$enable_log_debug" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_log_debug=$module_default
+    else
+      enable_log_debug=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_log_debug" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_log_debug=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_log_debug=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_log_debug" = "maybe-all"; then
+  elif test "$enable_log_debug" = "all" -o "$enable_log_debug" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_log_debug=$module_default
@@ -18613,10 +19042,15 @@ fi
     else
       enable_log_debug=no
     fi
-  elif test "$enable_log_debug" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_log_debug" != "no" ; then
+  elif test "$enable_log_debug" = "reallyall" -o "$enable_log_debug" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_log_debug" != "no" ; then
       enable_log_debug=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_log_debug=no
+    fi
+  else
+    enable_log_debug=no
   fi
   if test "$enable_log_debug" != "no"; then
             :
@@ -18632,7 +19066,6 @@ $as_echo "$enable_log_debug$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_log_debug=`echo $enable_log_debug|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES log_debug"
@@ -18712,34 +19145,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_log_forensic" in
+      case "$enable_log_forensic" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_log_forensic" = "static"; then
-    enable_log_forensic=static
+  if test "$enable_log_forensic" = "static" -o "$enable_log_forensic" = "shared"; then
+    :
   elif test "$enable_log_forensic" = "yes"; then
     enable_log_forensic=$module_default
+  elif test "$enable_log_forensic" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_log_forensic=$module_default
+    else
+      enable_log_forensic=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_log_forensic" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_log_forensic=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_log_forensic=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_log_forensic" = "maybe-all"; then
+  elif test "$enable_log_forensic" = "all" -o "$enable_log_forensic" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_log_forensic=$module_default
@@ -18747,10 +19183,15 @@ fi
     else
       enable_log_forensic=no
     fi
-  elif test "$enable_log_forensic" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_log_forensic" != "no" ; then
+  elif test "$enable_log_forensic" = "reallyall" -o "$enable_log_forensic" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_log_forensic" != "no" ; then
       enable_log_forensic=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_log_forensic=no
+    fi
+  else
+    enable_log_forensic=no
   fi
   if test "$enable_log_forensic" != "no"; then
             :
@@ -18766,7 +19207,6 @@ $as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_log_forensic=`echo $enable_log_forensic|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES log_forensic"
@@ -18872,34 +19312,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_logio" in
+      case "$enable_logio" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_logio" = "static"; then
-    enable_logio=static
+  if test "$enable_logio" = "static" -o "$enable_logio" = "shared"; then
+    :
   elif test "$enable_logio" = "yes"; then
     enable_logio=$module_default
+  elif test "$enable_logio" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_logio=$module_default
+    else
+      enable_logio=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_logio" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_logio=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_logio=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_logio" = "maybe-all"; then
+  elif test "$enable_logio" = "all" -o "$enable_logio" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_logio=$module_default
@@ -18907,10 +19350,15 @@ fi
     else
       enable_logio=no
     fi
-  elif test "$enable_logio" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_logio" != "no" ; then
+  elif test "$enable_logio" = "reallyall" -o "$enable_logio" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_logio" != "no" ; then
       enable_logio=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_logio=no
+    fi
+  else
+    enable_logio=no
   fi
   if test "$enable_logio" != "no"; then
             :
@@ -18926,7 +19374,6 @@ $as_echo "$enable_logio$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_logio=`echo $enable_logio|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES logio"
@@ -19065,34 +19512,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_lua" in
+      case "$enable_lua" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_lua" = "static"; then
-    enable_lua=static
+  if test "$enable_lua" = "static" -o "$enable_lua" = "shared"; then
+    :
   elif test "$enable_lua" = "yes"; then
     enable_lua=$module_default
+  elif test "$enable_lua" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_lua=$module_default
+    else
+      enable_lua=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_lua" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_lua=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_lua=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_lua" = "maybe-all"; then
+  elif test "$enable_lua" = "all" -o "$enable_lua" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_lua=$module_default
@@ -19100,10 +19550,15 @@ fi
     else
       enable_lua=no
     fi
-  elif test "$enable_lua" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_lua" != "no" ; then
+  elif test "$enable_lua" = "reallyall" -o "$enable_lua" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_lua" != "no" ; then
       enable_lua=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_lua=no
+    fi
+  else
+    enable_lua=no
   fi
   if test "$enable_lua" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -19899,7 +20354,6 @@ $as_echo "$enable_lua$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_lua=`echo $enable_lua|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lua"
@@ -20035,34 +20489,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_env" in
+      case "$enable_env" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_env" = "static"; then
-    enable_env=static
+  if test "$enable_env" = "static" -o "$enable_env" = "shared"; then
+    :
   elif test "$enable_env" = "yes"; then
     enable_env=$module_default
+  elif test "$enable_env" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_env=$module_default
+    else
+      enable_env=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_env" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_env=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_env=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_env" = "maybe-all"; then
+  elif test "$enable_env" = "all" -o "$enable_env" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_env=$module_default
@@ -20070,10 +20527,15 @@ fi
     else
       enable_env=no
     fi
-  elif test "$enable_env" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_env" != "no" ; then
+  elif test "$enable_env" = "reallyall" -o "$enable_env" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_env" != "no" ; then
       enable_env=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_env=no
+    fi
+  else
+    enable_env=no
   fi
   if test "$enable_env" != "no"; then
             :
@@ -20089,7 +20551,6 @@ $as_echo "$enable_env$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_env=`echo $enable_env|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES env"
@@ -20169,34 +20630,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_mime_magic" in
+      case "$enable_mime_magic" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_mime_magic" = "static"; then
-    enable_mime_magic=static
+  if test "$enable_mime_magic" = "static" -o "$enable_mime_magic" = "shared"; then
+    :
   elif test "$enable_mime_magic" = "yes"; then
     enable_mime_magic=$module_default
+  elif test "$enable_mime_magic" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_mime_magic=$module_default
+    else
+      enable_mime_magic=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_mime_magic" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_mime_magic=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_mime_magic=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_mime_magic" = "maybe-all"; then
+  elif test "$enable_mime_magic" = "all" -o "$enable_mime_magic" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_mime_magic=$module_default
@@ -20204,10 +20668,15 @@ fi
     else
       enable_mime_magic=no
     fi
-  elif test "$enable_mime_magic" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_mime_magic" != "no" ; then
+  elif test "$enable_mime_magic" = "reallyall" -o "$enable_mime_magic" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_mime_magic" != "no" ; then
       enable_mime_magic=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_mime_magic=no
+    fi
+  else
+    enable_mime_magic=no
   fi
   if test "$enable_mime_magic" != "no"; then
             :
@@ -20223,7 +20692,6 @@ $as_echo "$enable_mime_magic$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_mime_magic=`echo $enable_mime_magic|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES mime_magic"
@@ -20303,34 +20771,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cern_meta" in
+      case "$enable_cern_meta" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cern_meta" = "static"; then
-    enable_cern_meta=static
+  if test "$enable_cern_meta" = "static" -o "$enable_cern_meta" = "shared"; then
+    :
   elif test "$enable_cern_meta" = "yes"; then
     enable_cern_meta=$module_default
+  elif test "$enable_cern_meta" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cern_meta=$module_default
+    else
+      enable_cern_meta=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cern_meta" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cern_meta=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cern_meta=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cern_meta" = "maybe-all"; then
+  elif test "$enable_cern_meta" = "all" -o "$enable_cern_meta" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cern_meta=$module_default
@@ -20338,10 +20809,15 @@ fi
     else
       enable_cern_meta=no
     fi
-  elif test "$enable_cern_meta" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cern_meta" != "no" ; then
+  elif test "$enable_cern_meta" = "reallyall" -o "$enable_cern_meta" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cern_meta" != "no" ; then
       enable_cern_meta=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cern_meta=no
+    fi
+  else
+    enable_cern_meta=no
   fi
   if test "$enable_cern_meta" != "no"; then
             :
@@ -20357,7 +20833,6 @@ $as_echo "$enable_cern_meta$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cern_meta=`echo $enable_cern_meta|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cern_meta"
@@ -20437,34 +20912,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_expires" in
+      case "$enable_expires" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_expires" = "static"; then
-    enable_expires=static
+  if test "$enable_expires" = "static" -o "$enable_expires" = "shared"; then
+    :
   elif test "$enable_expires" = "yes"; then
     enable_expires=$module_default
+  elif test "$enable_expires" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_expires=$module_default
+    else
+      enable_expires=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_expires" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_expires=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_expires=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_expires" = "maybe-all"; then
+  elif test "$enable_expires" = "all" -o "$enable_expires" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_expires=$module_default
@@ -20472,10 +20950,15 @@ fi
     else
       enable_expires=no
     fi
-  elif test "$enable_expires" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_expires" != "no" ; then
+  elif test "$enable_expires" = "reallyall" -o "$enable_expires" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_expires" != "no" ; then
       enable_expires=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_expires=no
+    fi
+  else
+    enable_expires=no
   fi
   if test "$enable_expires" != "no"; then
             :
@@ -20491,7 +20974,6 @@ $as_echo "$enable_expires$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_expires=`echo $enable_expires|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES expires"
@@ -20571,34 +21053,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_headers" in
+      case "$enable_headers" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_headers" = "static"; then
-    enable_headers=static
+  if test "$enable_headers" = "static" -o "$enable_headers" = "shared"; then
+    :
   elif test "$enable_headers" = "yes"; then
     enable_headers=$module_default
+  elif test "$enable_headers" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_headers=$module_default
+    else
+      enable_headers=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_headers" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_headers=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_headers=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_headers" = "maybe-all"; then
+  elif test "$enable_headers" = "all" -o "$enable_headers" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_headers=$module_default
@@ -20606,10 +21091,15 @@ fi
     else
       enable_headers=no
     fi
-  elif test "$enable_headers" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_headers" != "no" ; then
+  elif test "$enable_headers" = "reallyall" -o "$enable_headers" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_headers" != "no" ; then
       enable_headers=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_headers=no
+    fi
+  else
+    enable_headers=no
   fi
   if test "$enable_headers" != "no"; then
             :
@@ -20625,7 +21115,6 @@ $as_echo "$enable_headers$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_headers=`echo $enable_headers|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES headers"
@@ -20705,34 +21194,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_ident" in
+      case "$enable_ident" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_ident" = "static"; then
-    enable_ident=static
+  if test "$enable_ident" = "static" -o "$enable_ident" = "shared"; then
+    :
   elif test "$enable_ident" = "yes"; then
     enable_ident=$module_default
+  elif test "$enable_ident" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_ident=$module_default
+    else
+      enable_ident=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_ident" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_ident=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_ident=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_ident" = "maybe-all"; then
+  elif test "$enable_ident" = "all" -o "$enable_ident" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_ident=$module_default
@@ -20740,10 +21232,15 @@ fi
     else
       enable_ident=no
     fi
-  elif test "$enable_ident" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_ident" != "no" ; then
+  elif test "$enable_ident" = "reallyall" -o "$enable_ident" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_ident" != "no" ; then
       enable_ident=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_ident=no
+    fi
+  else
+    enable_ident=no
   fi
   if test "$enable_ident" != "no"; then
             :
@@ -20759,7 +21256,6 @@ $as_echo "$enable_ident$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_ident=`echo $enable_ident|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ident"
@@ -20840,34 +21336,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_usertrack" in
+      case "$enable_usertrack" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_usertrack" = "static"; then
-    enable_usertrack=static
+  if test "$enable_usertrack" = "static" -o "$enable_usertrack" = "shared"; then
+    :
   elif test "$enable_usertrack" = "yes"; then
     enable_usertrack=$module_default
+  elif test "$enable_usertrack" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_usertrack=$module_default
+    else
+      enable_usertrack=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_usertrack" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_usertrack=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_usertrack=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_usertrack" = "maybe-all"; then
+  elif test "$enable_usertrack" = "all" -o "$enable_usertrack" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_usertrack=$module_default
@@ -20875,10 +21374,15 @@ fi
     else
       enable_usertrack=no
     fi
-  elif test "$enable_usertrack" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_usertrack" != "no" ; then
+  elif test "$enable_usertrack" = "reallyall" -o "$enable_usertrack" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_usertrack" != "no" ; then
       enable_usertrack=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_usertrack=no
+    fi
+  else
+    enable_usertrack=no
   fi
   if test "$enable_usertrack" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -20931,7 +21435,6 @@ $as_echo "$enable_usertrack$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_usertrack=`echo $enable_usertrack|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES usertrack"
@@ -21012,34 +21515,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_unique_id" in
+      case "$enable_unique_id" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_unique_id" = "static"; then
-    enable_unique_id=static
+  if test "$enable_unique_id" = "static" -o "$enable_unique_id" = "shared"; then
+    :
   elif test "$enable_unique_id" = "yes"; then
     enable_unique_id=$module_default
+  elif test "$enable_unique_id" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_unique_id=$module_default
+    else
+      enable_unique_id=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_unique_id" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_unique_id=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_unique_id=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_unique_id" = "maybe-all"; then
+  elif test "$enable_unique_id" = "all" -o "$enable_unique_id" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_unique_id=$module_default
@@ -21047,10 +21553,15 @@ fi
     else
       enable_unique_id=no
     fi
-  elif test "$enable_unique_id" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_unique_id" != "no" ; then
+  elif test "$enable_unique_id" = "reallyall" -o "$enable_unique_id" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_unique_id" != "no" ; then
       enable_unique_id=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_unique_id=no
+    fi
+  else
+    enable_unique_id=no
   fi
   if test "$enable_unique_id" != "no"; then
             :
@@ -21066,7 +21577,6 @@ $as_echo "$enable_unique_id$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_unique_id=`echo $enable_unique_id|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES unique_id"
@@ -21146,34 +21656,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_setenvif" in
+      case "$enable_setenvif" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_setenvif" = "static"; then
-    enable_setenvif=static
+  if test "$enable_setenvif" = "static" -o "$enable_setenvif" = "shared"; then
+    :
   elif test "$enable_setenvif" = "yes"; then
     enable_setenvif=$module_default
+  elif test "$enable_setenvif" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_setenvif=$module_default
+    else
+      enable_setenvif=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_setenvif" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_setenvif=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_setenvif=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_setenvif" = "maybe-all"; then
+  elif test "$enable_setenvif" = "all" -o "$enable_setenvif" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_setenvif=$module_default
@@ -21181,10 +21694,15 @@ fi
     else
       enable_setenvif=no
     fi
-  elif test "$enable_setenvif" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_setenvif" != "no" ; then
+  elif test "$enable_setenvif" = "reallyall" -o "$enable_setenvif" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_setenvif" != "no" ; then
       enable_setenvif=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_setenvif=no
+    fi
+  else
+    enable_setenvif=no
   fi
   if test "$enable_setenvif" != "no"; then
             :
@@ -21200,7 +21718,6 @@ $as_echo "$enable_setenvif$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_setenvif=`echo $enable_setenvif|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES setenvif"
@@ -21280,34 +21797,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_version" in
+      case "$enable_version" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_version" = "static"; then
-    enable_version=static
+  if test "$enable_version" = "static" -o "$enable_version" = "shared"; then
+    :
   elif test "$enable_version" = "yes"; then
     enable_version=$module_default
+  elif test "$enable_version" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_version=$module_default
+    else
+      enable_version=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_version" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_version=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_version=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_version" = "maybe-all"; then
+  elif test "$enable_version" = "all" -o "$enable_version" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_version=$module_default
@@ -21315,10 +21835,15 @@ fi
     else
       enable_version=no
     fi
-  elif test "$enable_version" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_version" != "no" ; then
+  elif test "$enable_version" = "reallyall" -o "$enable_version" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_version" != "no" ; then
       enable_version=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_version=no
+    fi
+  else
+    enable_version=no
   fi
   if test "$enable_version" != "no"; then
             :
@@ -21334,7 +21859,6 @@ $as_echo "$enable_version$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_version=`echo $enable_version|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES version"
@@ -21414,34 +21938,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_remoteip" in
+      case "$enable_remoteip" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_remoteip" = "static"; then
-    enable_remoteip=static
+  if test "$enable_remoteip" = "static" -o "$enable_remoteip" = "shared"; then
+    :
   elif test "$enable_remoteip" = "yes"; then
     enable_remoteip=$module_default
+  elif test "$enable_remoteip" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_remoteip=$module_default
+    else
+      enable_remoteip=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_remoteip" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_remoteip=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_remoteip=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_remoteip" = "maybe-all"; then
+  elif test "$enable_remoteip" = "all" -o "$enable_remoteip" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_remoteip=$module_default
@@ -21449,10 +21976,15 @@ fi
     else
       enable_remoteip=no
     fi
-  elif test "$enable_remoteip" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_remoteip" != "no" ; then
+  elif test "$enable_remoteip" = "reallyall" -o "$enable_remoteip" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_remoteip" != "no" ; then
       enable_remoteip=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_remoteip=no
+    fi
+  else
+    enable_remoteip=no
   fi
   if test "$enable_remoteip" != "no"; then
             :
@@ -21468,7 +22000,6 @@ $as_echo "$enable_remoteip$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_remoteip=`echo $enable_remoteip|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES remoteip"
@@ -21570,14 +22101,6 @@ EOF
   > $modpath_current/modules.mk
 
 
-if test "$enable_proxy" = "shared"; then
-  proxy_mods_enable=shared
-elif test "$enable_proxy" = "yes"; then
-  proxy_mods_enable=yes
-else
-  proxy_mods_enable=most
-fi
-
 proxy_objs="mod_proxy.lo proxy_util.lo"
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy" >&5
@@ -21586,38 +22109,41 @@ $as_echo_n "checking whether to enable mod_proxy... " >&6; }
 if test "${enable_proxy+set}" = set; then :
   enableval=$enable_proxy; force_proxy=$enableval
 else
-  enable_proxy=$proxy_mods_enable
+  enable_proxy=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy" in
+      case "$enable_proxy" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy" = "static"; then
-    enable_proxy=static
+  if test "$enable_proxy" = "static" -o "$enable_proxy" = "shared"; then
+    :
   elif test "$enable_proxy" = "yes"; then
     enable_proxy=$module_default
+  elif test "$enable_proxy" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy=$module_default
+    else
+      enable_proxy=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy" = "maybe-all"; then
+  elif test "$enable_proxy" = "all" -o "$enable_proxy" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy=$module_default
@@ -21625,10 +22151,15 @@ fi
     else
       enable_proxy=no
     fi
-  elif test "$enable_proxy" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy" != "no" ; then
+  elif test "$enable_proxy" = "reallyall" -o "$enable_proxy" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy" != "no" ; then
       enable_proxy=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy=no
+    fi
+  else
+    enable_proxy=no
   fi
   if test "$enable_proxy" != "no"; then
             :
@@ -21644,11 +22175,10 @@ $as_echo "$enable_proxy$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy=`echo $enable_proxy|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy"
       fi
       ;;
@@ -21714,6 +22244,15 @@ EOF
   fi
 
 
+save_module_selection=$module_selection
+save_module_default=$module_default
+if test "$enable_proxy" != "no"; then
+    module_selection=most
+    if test "$enable_proxy" = "shared" -o "$enable_proxy" = "static"; then
+        module_default=$enable_proxy
+    fi
+fi
+
 proxy_connect_objs="mod_proxy_connect.lo"
 proxy_ftp_objs="mod_proxy_ftp.lo"
 proxy_http_objs="mod_proxy_http.lo"
@@ -21747,38 +22286,41 @@ $as_echo_n "checking whether to enable mod_proxy_connect... " >&6; }
 if test "${enable_proxy_connect+set}" = set; then :
   enableval=$enable_proxy_connect; force_proxy_connect=$enableval
 else
-  enable_proxy_connect=$proxy_mods_enable
+  enable_proxy_connect=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_connect" in
+      case "$enable_proxy_connect" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_connect" = "static"; then
-    enable_proxy_connect=static
+  if test "$enable_proxy_connect" = "static" -o "$enable_proxy_connect" = "shared"; then
+    :
   elif test "$enable_proxy_connect" = "yes"; then
     enable_proxy_connect=$module_default
+  elif test "$enable_proxy_connect" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_connect=$module_default
+    else
+      enable_proxy_connect=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_connect" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_connect=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_connect=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_connect" = "maybe-all"; then
+  elif test "$enable_proxy_connect" = "all" -o "$enable_proxy_connect" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_connect=$module_default
@@ -21786,10 +22328,15 @@ fi
     else
       enable_proxy_connect=no
     fi
-  elif test "$enable_proxy_connect" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_connect" != "no" ; then
+  elif test "$enable_proxy_connect" = "reallyall" -o "$enable_proxy_connect" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_connect" != "no" ; then
       enable_proxy_connect=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_connect=no
+    fi
+  else
+    enable_proxy_connect=no
   fi
   if test "$enable_proxy_connect" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -21799,9 +22346,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_connect\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_connect\"" >&2;}
                             elif test "$enable_proxy_connect" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_connect=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_connect statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_connect statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_connect=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_connect shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_connect shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -21826,11 +22373,10 @@ $as_echo "$enable_proxy_connect$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_connect=`echo $enable_proxy_connect|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_connect"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_connect"
       fi
       ;;
@@ -21902,38 +22448,41 @@ $as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; }
 if test "${enable_proxy_ftp+set}" = set; then :
   enableval=$enable_proxy_ftp; force_proxy_ftp=$enableval
 else
-  enable_proxy_ftp=$proxy_mods_enable
+  enable_proxy_ftp=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_ftp" in
+      case "$enable_proxy_ftp" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_ftp" = "static"; then
-    enable_proxy_ftp=static
+  if test "$enable_proxy_ftp" = "static" -o "$enable_proxy_ftp" = "shared"; then
+    :
   elif test "$enable_proxy_ftp" = "yes"; then
     enable_proxy_ftp=$module_default
+  elif test "$enable_proxy_ftp" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_ftp=$module_default
+    else
+      enable_proxy_ftp=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_ftp" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_ftp=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_ftp=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_ftp" = "maybe-all"; then
+  elif test "$enable_proxy_ftp" = "all" -o "$enable_proxy_ftp" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_ftp=$module_default
@@ -21941,10 +22490,15 @@ fi
     else
       enable_proxy_ftp=no
     fi
-  elif test "$enable_proxy_ftp" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_ftp" != "no" ; then
+  elif test "$enable_proxy_ftp" = "reallyall" -o "$enable_proxy_ftp" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_ftp" != "no" ; then
       enable_proxy_ftp=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_ftp=no
+    fi
+  else
+    enable_proxy_ftp=no
   fi
   if test "$enable_proxy_ftp" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -21954,9 +22508,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_ftp\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_ftp\"" >&2;}
                             elif test "$enable_proxy_ftp" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_ftp=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_ftp statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_ftp statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_ftp=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_ftp shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_ftp shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -21981,11 +22535,10 @@ $as_echo "$enable_proxy_ftp$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_ftp=`echo $enable_proxy_ftp|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_ftp"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ftp"
       fi
       ;;
@@ -22057,38 +22610,41 @@ $as_echo_n "checking whether to enable mod_proxy_http... " >&6; }
 if test "${enable_proxy_http+set}" = set; then :
   enableval=$enable_proxy_http; force_proxy_http=$enableval
 else
-  enable_proxy_http=$proxy_mods_enable
+  enable_proxy_http=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_http" in
+      case "$enable_proxy_http" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_http" = "static"; then
-    enable_proxy_http=static
+  if test "$enable_proxy_http" = "static" -o "$enable_proxy_http" = "shared"; then
+    :
   elif test "$enable_proxy_http" = "yes"; then
     enable_proxy_http=$module_default
+  elif test "$enable_proxy_http" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_http=$module_default
+    else
+      enable_proxy_http=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_http" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_http=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_http=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_http" = "maybe-all"; then
+  elif test "$enable_proxy_http" = "all" -o "$enable_proxy_http" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_http=$module_default
@@ -22096,10 +22652,15 @@ fi
     else
       enable_proxy_http=no
     fi
-  elif test "$enable_proxy_http" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_http" != "no" ; then
+  elif test "$enable_proxy_http" = "reallyall" -o "$enable_proxy_http" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_http" != "no" ; then
       enable_proxy_http=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_http=no
+    fi
+  else
+    enable_proxy_http=no
   fi
   if test "$enable_proxy_http" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -22109,9 +22670,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_http\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_http\"" >&2;}
                             elif test "$enable_proxy_http" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_http=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_http statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_http statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_http=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_http shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_http shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -22136,11 +22697,10 @@ $as_echo "$enable_proxy_http$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_http=`echo $enable_proxy_http|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_http"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_http"
       fi
       ;;
@@ -22212,38 +22772,41 @@ $as_echo_n "checking whether to enable mod_proxy_fcgi... " >&6; }
 if test "${enable_proxy_fcgi+set}" = set; then :
   enableval=$enable_proxy_fcgi; force_proxy_fcgi=$enableval
 else
-  enable_proxy_fcgi=$proxy_mods_enable
+  enable_proxy_fcgi=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_fcgi" in
+      case "$enable_proxy_fcgi" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_fcgi" = "static"; then
-    enable_proxy_fcgi=static
+  if test "$enable_proxy_fcgi" = "static" -o "$enable_proxy_fcgi" = "shared"; then
+    :
   elif test "$enable_proxy_fcgi" = "yes"; then
     enable_proxy_fcgi=$module_default
+  elif test "$enable_proxy_fcgi" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_fcgi=$module_default
+    else
+      enable_proxy_fcgi=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_fcgi" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_fcgi=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_fcgi=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_fcgi" = "maybe-all"; then
+  elif test "$enable_proxy_fcgi" = "all" -o "$enable_proxy_fcgi" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_fcgi=$module_default
@@ -22251,10 +22814,15 @@ fi
     else
       enable_proxy_fcgi=no
     fi
-  elif test "$enable_proxy_fcgi" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_fcgi" != "no" ; then
+  elif test "$enable_proxy_fcgi" = "reallyall" -o "$enable_proxy_fcgi" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_fcgi" != "no" ; then
       enable_proxy_fcgi=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_fcgi=no
+    fi
+  else
+    enable_proxy_fcgi=no
   fi
   if test "$enable_proxy_fcgi" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -22264,9 +22832,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_fcgi\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_fcgi\"" >&2;}
                             elif test "$enable_proxy_fcgi" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_fcgi=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_fcgi statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_fcgi statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_fcgi=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_fcgi shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_fcgi shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -22291,11 +22859,10 @@ $as_echo "$enable_proxy_fcgi$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_fcgi=`echo $enable_proxy_fcgi|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_fcgi"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fcgi"
       fi
       ;;
@@ -22367,38 +22934,41 @@ $as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; }
 if test "${enable_proxy_scgi+set}" = set; then :
   enableval=$enable_proxy_scgi; force_proxy_scgi=$enableval
 else
-  enable_proxy_scgi=$proxy_mods_enable
+  enable_proxy_scgi=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_scgi" in
+      case "$enable_proxy_scgi" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_scgi" = "static"; then
-    enable_proxy_scgi=static
+  if test "$enable_proxy_scgi" = "static" -o "$enable_proxy_scgi" = "shared"; then
+    :
   elif test "$enable_proxy_scgi" = "yes"; then
     enable_proxy_scgi=$module_default
+  elif test "$enable_proxy_scgi" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_scgi=$module_default
+    else
+      enable_proxy_scgi=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_scgi" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_scgi=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_scgi=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_scgi" = "maybe-all"; then
+  elif test "$enable_proxy_scgi" = "all" -o "$enable_proxy_scgi" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_scgi=$module_default
@@ -22406,10 +22976,15 @@ fi
     else
       enable_proxy_scgi=no
     fi
-  elif test "$enable_proxy_scgi" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_scgi" != "no" ; then
+  elif test "$enable_proxy_scgi" = "reallyall" -o "$enable_proxy_scgi" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_scgi" != "no" ; then
       enable_proxy_scgi=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_scgi=no
+    fi
+  else
+    enable_proxy_scgi=no
   fi
   if test "$enable_proxy_scgi" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -22419,9 +22994,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_scgi\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_scgi\"" >&2;}
                             elif test "$enable_proxy_scgi" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_scgi=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_scgi statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_scgi statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_scgi=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_scgi shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_scgi shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -22446,11 +23021,10 @@ $as_echo "$enable_proxy_scgi$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_scgi=`echo $enable_proxy_scgi|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_scgi"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_scgi"
       fi
       ;;
@@ -22526,34 +23100,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_fdpass" in
+      case "$enable_proxy_fdpass" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_fdpass" = "static"; then
-    enable_proxy_fdpass=static
+  if test "$enable_proxy_fdpass" = "static" -o "$enable_proxy_fdpass" = "shared"; then
+    :
   elif test "$enable_proxy_fdpass" = "yes"; then
     enable_proxy_fdpass=$module_default
+  elif test "$enable_proxy_fdpass" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_fdpass=$module_default
+    else
+      enable_proxy_fdpass=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_fdpass" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_fdpass=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_fdpass=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_fdpass" = "maybe-all"; then
+  elif test "$enable_proxy_fdpass" = "all" -o "$enable_proxy_fdpass" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_fdpass=$module_default
@@ -22561,10 +23138,15 @@ fi
     else
       enable_proxy_fdpass=no
     fi
-  elif test "$enable_proxy_fdpass" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_fdpass" != "no" ; then
+  elif test "$enable_proxy_fdpass" = "reallyall" -o "$enable_proxy_fdpass" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_fdpass" != "no" ; then
       enable_proxy_fdpass=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_fdpass=no
+    fi
+  else
+    enable_proxy_fdpass=no
   fi
   if test "$enable_proxy_fdpass" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -22574,9 +23156,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_fdpass\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_fdpass\"" >&2;}
                             elif test "$enable_proxy_fdpass" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_fdpass=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_fdpass statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_fdpass statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_fdpass=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_fdpass shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_fdpass shared because mod_proxy is built shared\"" >&2;}
                             else
 
   ac_fn_c_check_decl "$LINENO" "CMSG_DATA" "ac_cv_have_decl_CMSG_DATA" "
@@ -22616,7 +23198,6 @@ $as_echo "$enable_proxy_fdpass$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_fdpass=`echo $enable_proxy_fdpass|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_fdpass"
@@ -22692,38 +23273,41 @@ $as_echo_n "checking whether to enable mod_proxy_wstunnel... " >&6; }
 if test "${enable_proxy_wstunnel+set}" = set; then :
   enableval=$enable_proxy_wstunnel; force_proxy_wstunnel=$enableval
 else
-  enable_proxy_wstunnel=$proxy_mods_enable
+  enable_proxy_wstunnel=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_wstunnel" in
+      case "$enable_proxy_wstunnel" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_wstunnel" = "static"; then
-    enable_proxy_wstunnel=static
+  if test "$enable_proxy_wstunnel" = "static" -o "$enable_proxy_wstunnel" = "shared"; then
+    :
   elif test "$enable_proxy_wstunnel" = "yes"; then
     enable_proxy_wstunnel=$module_default
+  elif test "$enable_proxy_wstunnel" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_wstunnel=$module_default
+    else
+      enable_proxy_wstunnel=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_wstunnel" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_wstunnel=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_wstunnel=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_wstunnel" = "maybe-all"; then
+  elif test "$enable_proxy_wstunnel" = "all" -o "$enable_proxy_wstunnel" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_wstunnel=$module_default
@@ -22731,10 +23315,15 @@ fi
     else
       enable_proxy_wstunnel=no
     fi
-  elif test "$enable_proxy_wstunnel" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_wstunnel" != "no" ; then
+  elif test "$enable_proxy_wstunnel" = "reallyall" -o "$enable_proxy_wstunnel" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_wstunnel" != "no" ; then
       enable_proxy_wstunnel=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_wstunnel=no
+    fi
+  else
+    enable_proxy_wstunnel=no
   fi
   if test "$enable_proxy_wstunnel" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -22744,9 +23333,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_wstunnel\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_wstunnel\"" >&2;}
                             elif test "$enable_proxy_wstunnel" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_wstunnel=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_wstunnel statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_wstunnel statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_wstunnel=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_wstunnel shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_wstunnel shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -22771,11 +23360,10 @@ $as_echo "$enable_proxy_wstunnel$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_wstunnel=`echo $enable_proxy_wstunnel|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_wstunnel"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_wstunnel"
       fi
       ;;
@@ -22847,38 +23435,41 @@ $as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; }
 if test "${enable_proxy_ajp+set}" = set; then :
   enableval=$enable_proxy_ajp; force_proxy_ajp=$enableval
 else
-  enable_proxy_ajp=$proxy_mods_enable
+  enable_proxy_ajp=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_ajp" in
+      case "$enable_proxy_ajp" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_ajp" = "static"; then
-    enable_proxy_ajp=static
+  if test "$enable_proxy_ajp" = "static" -o "$enable_proxy_ajp" = "shared"; then
+    :
   elif test "$enable_proxy_ajp" = "yes"; then
     enable_proxy_ajp=$module_default
+  elif test "$enable_proxy_ajp" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_ajp=$module_default
+    else
+      enable_proxy_ajp=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_ajp" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_ajp=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_ajp=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_ajp" = "maybe-all"; then
+  elif test "$enable_proxy_ajp" = "all" -o "$enable_proxy_ajp" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_ajp=$module_default
@@ -22886,10 +23477,15 @@ fi
     else
       enable_proxy_ajp=no
     fi
-  elif test "$enable_proxy_ajp" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_ajp" != "no" ; then
+  elif test "$enable_proxy_ajp" = "reallyall" -o "$enable_proxy_ajp" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_ajp" != "no" ; then
       enable_proxy_ajp=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_ajp=no
+    fi
+  else
+    enable_proxy_ajp=no
   fi
   if test "$enable_proxy_ajp" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -22899,9 +23495,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_ajp\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_ajp\"" >&2;}
                             elif test "$enable_proxy_ajp" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_ajp=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_ajp statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_ajp statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_ajp=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_ajp shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_ajp shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -22926,11 +23522,10 @@ $as_echo "$enable_proxy_ajp$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_ajp=`echo $enable_proxy_ajp|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_ajp"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ajp"
       fi
       ;;
@@ -23002,38 +23597,41 @@ $as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; }
 if test "${enable_proxy_balancer+set}" = set; then :
   enableval=$enable_proxy_balancer; force_proxy_balancer=$enableval
 else
-  enable_proxy_balancer=$proxy_mods_enable
+  enable_proxy_balancer=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_balancer" in
+      case "$enable_proxy_balancer" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_balancer" = "static"; then
-    enable_proxy_balancer=static
+  if test "$enable_proxy_balancer" = "static" -o "$enable_proxy_balancer" = "shared"; then
+    :
   elif test "$enable_proxy_balancer" = "yes"; then
     enable_proxy_balancer=$module_default
+  elif test "$enable_proxy_balancer" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_balancer=$module_default
+    else
+      enable_proxy_balancer=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_balancer" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_balancer=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_balancer=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_balancer" = "maybe-all"; then
+  elif test "$enable_proxy_balancer" = "all" -o "$enable_proxy_balancer" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_balancer=$module_default
@@ -23041,10 +23639,15 @@ fi
     else
       enable_proxy_balancer=no
     fi
-  elif test "$enable_proxy_balancer" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_balancer" != "no" ; then
+  elif test "$enable_proxy_balancer" = "reallyall" -o "$enable_proxy_balancer" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_balancer" != "no" ; then
       enable_proxy_balancer=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_balancer=no
+    fi
+  else
+    enable_proxy_balancer=no
   fi
   if test "$enable_proxy_balancer" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -23054,9 +23657,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_balancer\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_balancer\"" >&2;}
                             elif test "$enable_proxy_balancer" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_balancer=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_balancer statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_balancer statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_balancer=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_balancer shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_balancer shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -23081,11 +23684,10 @@ $as_echo "$enable_proxy_balancer$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_balancer=`echo $enable_proxy_balancer|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_balancer"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_balancer"
       fi
       ;;
@@ -23158,38 +23760,41 @@ $as_echo_n "checking whether to enable mod_proxy_express... " >&6; }
 if test "${enable_proxy_express+set}" = set; then :
   enableval=$enable_proxy_express; force_proxy_express=$enableval
 else
-  enable_proxy_express=$proxy_mods_enable
+  enable_proxy_express=most
 fi
 
     _apmod_extra_msg=""
-        case "$enable_proxy_express" in
+      case "$enable_proxy_express" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_proxy_express" = "static"; then
-    enable_proxy_express=static
+  if test "$enable_proxy_express" = "static" -o "$enable_proxy_express" = "shared"; then
+    :
   elif test "$enable_proxy_express" = "yes"; then
     enable_proxy_express=$module_default
+  elif test "$enable_proxy_express" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_express=$module_default
+    else
+      enable_proxy_express=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_proxy_express" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_proxy_express=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_proxy_express=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_proxy_express" = "maybe-all"; then
+  elif test "$enable_proxy_express" = "all" -o "$enable_proxy_express" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_proxy_express=$module_default
@@ -23197,10 +23802,15 @@ fi
     else
       enable_proxy_express=no
     fi
-  elif test "$enable_proxy_express" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_proxy_express" != "no" ; then
+  elif test "$enable_proxy_express" = "reallyall" -o "$enable_proxy_express" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_express" != "no" ; then
       enable_proxy_express=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_express=no
+    fi
+  else
+    enable_proxy_express=no
   fi
   if test "$enable_proxy_express" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -23210,9 +23820,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_express\"" >&5
 $as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_express\"" >&2;}
                             elif test "$enable_proxy_express" = "static" && test "$enable_proxy" != "static" ; then
-                              enable_proxy_express=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_express statically if mod_proxy is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_proxy_express statically if mod_proxy is built shared\"" >&2;}
+                              enable_proxy_express=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_express shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_express shared because mod_proxy is built shared\"" >&2;}
                             else
             :
             fi
@@ -23237,11 +23847,10 @@ $as_echo "$enable_proxy_express$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_proxy_express=`echo $enable_proxy_express|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_express"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "most" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_express"
       fi
       ;;
@@ -23307,6 +23916,176 @@ EOF
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_hcheck" >&5
+$as_echo_n "checking whether to enable mod_proxy_hcheck... " >&6; }
+    # Check whether --enable-proxy-hcheck was given.
+if test "${enable_proxy_hcheck+set}" = set; then :
+  enableval=$enable_proxy_hcheck; force_proxy_hcheck=$enableval
+else
+  enable_proxy_hcheck=most
+fi
+
+    _apmod_extra_msg=""
+      case "$enable_proxy_hcheck" in
+    yes|static|shared)
+      _apmod_required="yes"
+      ;;
+    *)
+      _apmod_required="no"
+      ;;
+  esac
+  if test "$enable_proxy_hcheck" = "static" -o "$enable_proxy_hcheck" = "shared"; then
+    :
+  elif test "$enable_proxy_hcheck" = "yes"; then
+    enable_proxy_hcheck=$module_default
+  elif test "$enable_proxy_hcheck" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_hcheck=$module_default
+    else
+      enable_proxy_hcheck=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
+  elif test "$enable_proxy_hcheck" = "most"; then
+    if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+            "$module_selection" = "reallyall"
+    then
+      enable_proxy_hcheck=$module_default
+    else
+      enable_proxy_hcheck=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
+  elif test "$enable_proxy_hcheck" = "all" -o "$enable_proxy_hcheck" = "maybe-all"; then
+    if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_hcheck=$module_default
+      _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_hcheck=no
+    fi
+  elif test "$enable_proxy_hcheck" = "reallyall" -o "$enable_proxy_hcheck" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_hcheck" != "no" ; then
+      enable_proxy_hcheck=$module_default
+      _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_hcheck=no
+    fi
+  else
+    enable_proxy_hcheck=no
+  fi
+  if test "$enable_proxy_hcheck" != "no"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+            if test "$enable_proxy" = "no" ; then
+                              enable_proxy_hcheck=no
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_hcheck\"" >&5
+$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_hcheck\"" >&2;}
+                            elif test "$enable_proxy_hcheck" = "static" && test "$enable_proxy" != "static" ; then
+                              enable_proxy_hcheck=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_hcheck shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_hcheck shared because mod_proxy is built shared\"" >&2;}
+                            elif test "$enable_watchdog" = "no" ; then
+                              enable_proxy_hcheck=no
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_watchdog is disabled but required for mod_proxy_hcheck\"" >&5
+$as_echo "$as_me: WARNING: \"mod_watchdog is disabled but required for mod_proxy_hcheck\"" >&2;}
+                            elif test "$enable_proxy_hcheck" = "static" && test "$enable_watchdog" != "static" ; then
+                              enable_proxy_hcheck=$enable_watchdog
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_hcheck shared because mod_watchdog is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_hcheck shared because mod_watchdog is built shared\"" >&2;}
+                            else
+            :
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_hcheck" >&5
+$as_echo_n "checking whether to enable mod_proxy_hcheck... " >&6; }
+            if test "$enable_proxy_hcheck" = "no"; then
+              if test "$_apmod_required" = "no"; then
+                _apmod_extra_msg=" (disabled)"
+              else
+                as_fn_error $? "mod_proxy_hcheck has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+              fi
+            fi
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_hcheck$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_hcheck$_apmod_extra_msg" >&6; }
+  if test "$enable_proxy_hcheck" != "no"; then
+    case "$enable_proxy_hcheck" in
+    static*)
+      MODLIST="$MODLIST proxy_hcheck"
+      if test "proxy_hcheck" = "so"; then
+          sharedobjs=yes
+      fi
+      shared="";;
+    *)
+      sharedobjs=yes
+      shared=yes
+      DSO_MODULES="$DSO_MODULES proxy_hcheck"
+      if test "most" = "yes" ; then
+        ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_hcheck"
+      fi
+      ;;
+    esac
+
+
+  if test -z ""; then
+    objects="mod_proxy_hcheck.lo"
+  else
+    objects=""
+  fi
+
+  if test -z "$module_standalone"; then
+    if test -z "$shared"; then
+      # The filename of a convenience library must have a "lib" prefix:
+      libname="libmod_proxy_hcheck.la"
+      BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+      modpath_static="$modpath_static $libname"
+      cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+	\$(MOD_LINK) $objects \$(MOD_PROXY_HCHECK_LDADD)
+EOF
+      if test ! -z "\$(MOD_PROXY_HCHECK_LDADD)"; then
+
+  if test "x$AP_LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting AP_LIBS to \"\$(MOD_PROXY_HCHECK_LDADD)\""
+    AP_LIBS="\$(MOD_PROXY_HCHECK_LDADD)"
+  else
+    apr_addto_bugger="\$(MOD_PROXY_HCHECK_LDADD)"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $AP_LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to AP_LIBS"
+        AP_LIBS="$AP_LIBS $i"
+      fi
+    done
+  fi
+
+      fi
+    else
+      apache_need_shared=yes
+      libname="mod_proxy_hcheck.la"
+      shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+      modpath_shared="$modpath_shared $libname"
+      cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version  $objects \$(MOD_PROXY_HCHECK_LDADD)
+EOF
+    fi
+  fi
+
+
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PROXY_HCHECK_LDADD"
+
+
+
+  fi
+
+
 
   if test "x$INCLUDES" = "x"; then
     test "x$silent" != "xyes" && echo "  setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
@@ -23329,6 +24108,9 @@ EOF
   fi
 
 
+module_selection=$save_module_selection
+module_default=$save_module_default
+
 
   echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
   echo "static = $modpath_static" >> $modpath_current/modules.mk
@@ -23395,34 +24177,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_session" in
+      case "$enable_session" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_session" = "static"; then
-    enable_session=static
+  if test "$enable_session" = "static" -o "$enable_session" = "shared"; then
+    :
   elif test "$enable_session" = "yes"; then
     enable_session=$module_default
+  elif test "$enable_session" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_session=$module_default
+    else
+      enable_session=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_session" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_session=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_session=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_session" = "maybe-all"; then
+  elif test "$enable_session" = "all" -o "$enable_session" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_session=$module_default
@@ -23430,10 +24215,15 @@ fi
     else
       enable_session=no
     fi
-  elif test "$enable_session" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_session" != "no" ; then
+  elif test "$enable_session" = "reallyall" -o "$enable_session" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_session" != "no" ; then
       enable_session=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_session=no
+    fi
+  else
+    enable_session=no
   fi
   if test "$enable_session" != "no"; then
             :
@@ -23449,7 +24239,6 @@ $as_echo "$enable_session$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_session=`echo $enable_session|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES session"
@@ -23529,34 +24318,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_session_cookie" in
+      case "$enable_session_cookie" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_session_cookie" = "static"; then
-    enable_session_cookie=static
+  if test "$enable_session_cookie" = "static" -o "$enable_session_cookie" = "shared"; then
+    :
   elif test "$enable_session_cookie" = "yes"; then
     enable_session_cookie=$module_default
+  elif test "$enable_session_cookie" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_session_cookie=$module_default
+    else
+      enable_session_cookie=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_session_cookie" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_session_cookie=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_session_cookie=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_session_cookie" = "maybe-all"; then
+  elif test "$enable_session_cookie" = "all" -o "$enable_session_cookie" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_session_cookie=$module_default
@@ -23564,10 +24356,15 @@ fi
     else
       enable_session_cookie=no
     fi
-  elif test "$enable_session_cookie" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_session_cookie" != "no" ; then
+  elif test "$enable_session_cookie" = "reallyall" -o "$enable_session_cookie" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_session_cookie" != "no" ; then
       enable_session_cookie=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_session_cookie=no
+    fi
+  else
+    enable_session_cookie=no
   fi
   if test "$enable_session_cookie" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -23577,9 +24374,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_cookie\"" >&5
 $as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_cookie\"" >&2;}
                             elif test "$enable_session_cookie" = "static" && test "$enable_session" != "static" ; then
-                              enable_session_cookie=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_cookie statically if mod_session is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_session_cookie statically if mod_session is built shared\"" >&2;}
+                              enable_session_cookie=$enable_session
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_session_cookie shared because mod_session is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_session_cookie shared because mod_session is built shared\"" >&2;}
                             else
             :
             fi
@@ -23604,7 +24401,6 @@ $as_echo "$enable_session_cookie$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_session_cookie=`echo $enable_session_cookie|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES session_cookie"
@@ -23724,34 +24520,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_session_crypto" in
+      case "$enable_session_crypto" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_session_crypto" = "static"; then
-    enable_session_crypto=static
+  if test "$enable_session_crypto" = "static" -o "$enable_session_crypto" = "shared"; then
+    :
   elif test "$enable_session_crypto" = "yes"; then
     enable_session_crypto=$module_default
+  elif test "$enable_session_crypto" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_session_crypto=$module_default
+    else
+      enable_session_crypto=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_session_crypto" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_session_crypto=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_session_crypto=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_session_crypto" = "maybe-all"; then
+  elif test "$enable_session_crypto" = "all" -o "$enable_session_crypto" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_session_crypto=$module_default
@@ -23759,10 +24558,15 @@ fi
     else
       enable_session_crypto=no
     fi
-  elif test "$enable_session_crypto" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_session_crypto" != "no" ; then
+  elif test "$enable_session_crypto" = "reallyall" -o "$enable_session_crypto" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_session_crypto" != "no" ; then
       enable_session_crypto=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_session_crypto=no
+    fi
+  else
+    enable_session_crypto=no
   fi
   if test "$enable_session_crypto" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -23772,9 +24576,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_crypto\"" >&5
 $as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_crypto\"" >&2;}
                             elif test "$enable_session_crypto" = "static" && test "$enable_session" != "static" ; then
-                              enable_session_crypto=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_crypto statically if mod_session is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_session_crypto statically if mod_session is built shared\"" >&2;}
+                              enable_session_crypto=$enable_session
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_session_crypto shared because mod_session is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_session_crypto shared because mod_session is built shared\"" >&2;}
                             else
 
 if test "$session_mods_enable_crypto" = "no" ; then
@@ -23803,7 +24607,6 @@ $as_echo "$enable_session_crypto$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_session_crypto=`echo $enable_session_crypto|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES session_crypto"
@@ -23884,34 +24687,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_session_dbd" in
+      case "$enable_session_dbd" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_session_dbd" = "static"; then
-    enable_session_dbd=static
+  if test "$enable_session_dbd" = "static" -o "$enable_session_dbd" = "shared"; then
+    :
   elif test "$enable_session_dbd" = "yes"; then
     enable_session_dbd=$module_default
+  elif test "$enable_session_dbd" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_session_dbd=$module_default
+    else
+      enable_session_dbd=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_session_dbd" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_session_dbd=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_session_dbd=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_session_dbd" = "maybe-all"; then
+  elif test "$enable_session_dbd" = "all" -o "$enable_session_dbd" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_session_dbd=$module_default
@@ -23919,10 +24725,15 @@ fi
     else
       enable_session_dbd=no
     fi
-  elif test "$enable_session_dbd" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_session_dbd" != "no" ; then
+  elif test "$enable_session_dbd" = "reallyall" -o "$enable_session_dbd" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_session_dbd" != "no" ; then
       enable_session_dbd=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_session_dbd=no
+    fi
+  else
+    enable_session_dbd=no
   fi
   if test "$enable_session_dbd" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -23932,9 +24743,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_dbd\"" >&5
 $as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_dbd\"" >&2;}
                             elif test "$enable_session_dbd" = "static" && test "$enable_session" != "static" ; then
-                              enable_session_dbd=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_dbd statically if mod_session is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_session_dbd statically if mod_session is built shared\"" >&2;}
+                              enable_session_dbd=$enable_session
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_session_dbd shared because mod_session is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_session_dbd shared because mod_session is built shared\"" >&2;}
                             else
             :
             fi
@@ -23959,7 +24770,6 @@ $as_echo "$enable_session_dbd$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_session_dbd=`echo $enable_session_dbd|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES session_dbd"
@@ -24096,34 +24906,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_slotmem_shm" in
+      case "$enable_slotmem_shm" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_slotmem_shm" = "static"; then
-    enable_slotmem_shm=static
+  if test "$enable_slotmem_shm" = "static" -o "$enable_slotmem_shm" = "shared"; then
+    :
   elif test "$enable_slotmem_shm" = "yes"; then
     enable_slotmem_shm=$module_default
+  elif test "$enable_slotmem_shm" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_slotmem_shm=$module_default
+    else
+      enable_slotmem_shm=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_slotmem_shm" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_slotmem_shm=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_slotmem_shm=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_slotmem_shm" = "maybe-all"; then
+  elif test "$enable_slotmem_shm" = "all" -o "$enable_slotmem_shm" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_slotmem_shm=$module_default
@@ -24131,10 +24944,15 @@ fi
     else
       enable_slotmem_shm=no
     fi
-  elif test "$enable_slotmem_shm" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_slotmem_shm" != "no" ; then
+  elif test "$enable_slotmem_shm" = "reallyall" -o "$enable_slotmem_shm" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_slotmem_shm" != "no" ; then
       enable_slotmem_shm=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_slotmem_shm=no
+    fi
+  else
+    enable_slotmem_shm=no
   fi
   if test "$enable_slotmem_shm" != "no"; then
             :
@@ -24150,7 +24968,6 @@ $as_echo "$enable_slotmem_shm$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_slotmem_shm=`echo $enable_slotmem_shm|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES slotmem_shm"
@@ -24230,34 +25047,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_slotmem_plain" in
+      case "$enable_slotmem_plain" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_slotmem_plain" = "static"; then
-    enable_slotmem_plain=static
+  if test "$enable_slotmem_plain" = "static" -o "$enable_slotmem_plain" = "shared"; then
+    :
   elif test "$enable_slotmem_plain" = "yes"; then
     enable_slotmem_plain=$module_default
+  elif test "$enable_slotmem_plain" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_slotmem_plain=$module_default
+    else
+      enable_slotmem_plain=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_slotmem_plain" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_slotmem_plain=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_slotmem_plain=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_slotmem_plain" = "maybe-all"; then
+  elif test "$enable_slotmem_plain" = "all" -o "$enable_slotmem_plain" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_slotmem_plain=$module_default
@@ -24265,10 +25085,15 @@ fi
     else
       enable_slotmem_plain=no
     fi
-  elif test "$enable_slotmem_plain" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_slotmem_plain" != "no" ; then
+  elif test "$enable_slotmem_plain" = "reallyall" -o "$enable_slotmem_plain" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_slotmem_plain" != "no" ; then
       enable_slotmem_plain=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_slotmem_plain=no
+    fi
+  else
+    enable_slotmem_plain=no
   fi
   if test "$enable_slotmem_plain" != "no"; then
             :
@@ -24284,7 +25109,6 @@ $as_echo "$enable_slotmem_plain$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_slotmem_plain=`echo $enable_slotmem_plain|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES slotmem_plain"
@@ -24398,34 +25222,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_ssl" in
+      case "$enable_ssl" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_ssl" = "static"; then
-    enable_ssl=static
+  if test "$enable_ssl" = "static" -o "$enable_ssl" = "shared"; then
+    :
   elif test "$enable_ssl" = "yes"; then
     enable_ssl=$module_default
+  elif test "$enable_ssl" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_ssl=$module_default
+    else
+      enable_ssl=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_ssl" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_ssl=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_ssl=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_ssl" = "maybe-all"; then
+  elif test "$enable_ssl" = "all" -o "$enable_ssl" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_ssl=$module_default
@@ -24433,10 +25260,15 @@ fi
     else
       enable_ssl=no
     fi
-  elif test "$enable_ssl" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_ssl" != "no" ; then
+  elif test "$enable_ssl" = "reallyall" -o "$enable_ssl" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_ssl" != "no" ; then
       enable_ssl=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_ssl=no
+    fi
+  else
+    enable_ssl=no
   fi
   if test "$enable_ssl" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -25050,7 +25882,6 @@ $as_echo "$enable_ssl$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_ssl=`echo $enable_ssl|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ssl"
@@ -25187,34 +26018,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_optional_hook_export" in
+      case "$enable_optional_hook_export" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_optional_hook_export" = "static"; then
-    enable_optional_hook_export=static
+  if test "$enable_optional_hook_export" = "static" -o "$enable_optional_hook_export" = "shared"; then
+    :
   elif test "$enable_optional_hook_export" = "yes"; then
     enable_optional_hook_export=$module_default
+  elif test "$enable_optional_hook_export" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_optional_hook_export=$module_default
+    else
+      enable_optional_hook_export=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_optional_hook_export" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_optional_hook_export=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_optional_hook_export=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_optional_hook_export" = "maybe-all"; then
+  elif test "$enable_optional_hook_export" = "all" -o "$enable_optional_hook_export" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_optional_hook_export=$module_default
@@ -25222,10 +26056,15 @@ fi
     else
       enable_optional_hook_export=no
     fi
-  elif test "$enable_optional_hook_export" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_optional_hook_export" != "no" ; then
+  elif test "$enable_optional_hook_export" = "reallyall" -o "$enable_optional_hook_export" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_optional_hook_export" != "no" ; then
       enable_optional_hook_export=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_optional_hook_export=no
+    fi
+  else
+    enable_optional_hook_export=no
   fi
   if test "$enable_optional_hook_export" != "no"; then
             :
@@ -25241,7 +26080,6 @@ $as_echo "$enable_optional_hook_export$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_optional_hook_export=`echo $enable_optional_hook_export|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES optional_hook_export"
@@ -25321,34 +26159,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_optional_hook_import" in
+      case "$enable_optional_hook_import" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_optional_hook_import" = "static"; then
-    enable_optional_hook_import=static
+  if test "$enable_optional_hook_import" = "static" -o "$enable_optional_hook_import" = "shared"; then
+    :
   elif test "$enable_optional_hook_import" = "yes"; then
     enable_optional_hook_import=$module_default
+  elif test "$enable_optional_hook_import" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_optional_hook_import=$module_default
+    else
+      enable_optional_hook_import=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_optional_hook_import" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_optional_hook_import=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_optional_hook_import=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_optional_hook_import" = "maybe-all"; then
+  elif test "$enable_optional_hook_import" = "all" -o "$enable_optional_hook_import" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_optional_hook_import=$module_default
@@ -25356,10 +26197,15 @@ fi
     else
       enable_optional_hook_import=no
     fi
-  elif test "$enable_optional_hook_import" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_optional_hook_import" != "no" ; then
+  elif test "$enable_optional_hook_import" = "reallyall" -o "$enable_optional_hook_import" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_optional_hook_import" != "no" ; then
       enable_optional_hook_import=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_optional_hook_import=no
+    fi
+  else
+    enable_optional_hook_import=no
   fi
   if test "$enable_optional_hook_import" != "no"; then
             :
@@ -25375,7 +26221,6 @@ $as_echo "$enable_optional_hook_import$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_optional_hook_import=`echo $enable_optional_hook_import|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES optional_hook_import"
@@ -25455,34 +26300,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_optional_fn_import" in
+      case "$enable_optional_fn_import" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_optional_fn_import" = "static"; then
-    enable_optional_fn_import=static
+  if test "$enable_optional_fn_import" = "static" -o "$enable_optional_fn_import" = "shared"; then
+    :
   elif test "$enable_optional_fn_import" = "yes"; then
     enable_optional_fn_import=$module_default
+  elif test "$enable_optional_fn_import" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_optional_fn_import=$module_default
+    else
+      enable_optional_fn_import=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_optional_fn_import" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_optional_fn_import=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_optional_fn_import=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_optional_fn_import" = "maybe-all"; then
+  elif test "$enable_optional_fn_import" = "all" -o "$enable_optional_fn_import" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_optional_fn_import=$module_default
@@ -25490,10 +26338,15 @@ fi
     else
       enable_optional_fn_import=no
     fi
-  elif test "$enable_optional_fn_import" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_optional_fn_import" != "no" ; then
+  elif test "$enable_optional_fn_import" = "reallyall" -o "$enable_optional_fn_import" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_optional_fn_import" != "no" ; then
       enable_optional_fn_import=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_optional_fn_import=no
+    fi
+  else
+    enable_optional_fn_import=no
   fi
   if test "$enable_optional_fn_import" != "no"; then
             :
@@ -25509,7 +26362,6 @@ $as_echo "$enable_optional_fn_import$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_optional_fn_import=`echo $enable_optional_fn_import|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES optional_fn_import"
@@ -25589,34 +26441,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_optional_fn_export" in
+      case "$enable_optional_fn_export" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_optional_fn_export" = "static"; then
-    enable_optional_fn_export=static
+  if test "$enable_optional_fn_export" = "static" -o "$enable_optional_fn_export" = "shared"; then
+    :
   elif test "$enable_optional_fn_export" = "yes"; then
     enable_optional_fn_export=$module_default
+  elif test "$enable_optional_fn_export" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_optional_fn_export=$module_default
+    else
+      enable_optional_fn_export=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_optional_fn_export" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_optional_fn_export=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_optional_fn_export=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_optional_fn_export" = "maybe-all"; then
+  elif test "$enable_optional_fn_export" = "all" -o "$enable_optional_fn_export" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_optional_fn_export=$module_default
@@ -25624,10 +26479,15 @@ fi
     else
       enable_optional_fn_export=no
     fi
-  elif test "$enable_optional_fn_export" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_optional_fn_export" != "no" ; then
+  elif test "$enable_optional_fn_export" = "reallyall" -o "$enable_optional_fn_export" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_optional_fn_export" != "no" ; then
       enable_optional_fn_export=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_optional_fn_export=no
+    fi
+  else
+    enable_optional_fn_export=no
   fi
   if test "$enable_optional_fn_export" != "no"; then
             :
@@ -25643,7 +26503,6 @@ $as_echo "$enable_optional_fn_export$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_optional_fn_export=`echo $enable_optional_fn_export|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES optional_fn_export"
@@ -25724,34 +26583,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_dialup" in
+      case "$enable_dialup" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_dialup" = "static"; then
-    enable_dialup=static
+  if test "$enable_dialup" = "static" -o "$enable_dialup" = "shared"; then
+    :
   elif test "$enable_dialup" = "yes"; then
     enable_dialup=$module_default
+  elif test "$enable_dialup" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_dialup=$module_default
+    else
+      enable_dialup=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_dialup" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_dialup=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_dialup=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_dialup" = "maybe-all"; then
+  elif test "$enable_dialup" = "all" -o "$enable_dialup" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_dialup=$module_default
@@ -25759,10 +26621,15 @@ fi
     else
       enable_dialup=no
     fi
-  elif test "$enable_dialup" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_dialup" != "no" ; then
+  elif test "$enable_dialup" = "reallyall" -o "$enable_dialup" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_dialup" != "no" ; then
       enable_dialup=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_dialup=no
+    fi
+  else
+    enable_dialup=no
   fi
   if test "$enable_dialup" != "no"; then
             :
@@ -25778,7 +26645,6 @@ $as_echo "$enable_dialup$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_dialup=`echo $enable_dialup|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dialup"
@@ -27194,7 +28060,7 @@ esac
   > $modpath_current/modules.mk
 
 
-http2_objs="mod_http2.lo h2_alt_svc.lo h2_bucket_eoc.lo h2_bucket_eos.lo h2_config.lo h2_conn.lo h2_conn_io.lo h2_ctx.lo h2_filter.lo h2_from_h1.lo h2_h2.lo h2_int_queue.lo h2_io.lo h2_io_set.lo h2_mplx.lo h2_ngn_shed.lo h2_push.lo h2_request.lo h2_response.lo h2_session.lo h2_stream.lo h2_switch.lo h2_task.lo h2_task_input.lo h2_task_output.lo h2_util.lo h2_worker.lo h2_workers.lo "
+http2_objs="mod_http2.lo h2_alt_svc.lo h2_bucket_beam.lo h2_bucket_eoc.lo h2_bucket_eos.lo h2_config.lo h2_conn.lo h2_conn_io.lo h2_ctx.lo h2_filter.lo h2_from_h1.lo h2_h2.lo h2_mplx.lo h2_ngn_shed.lo h2_push.lo h2_request.lo h2_response.lo h2_session.lo h2_stream.lo h2_switch.lo h2_task.lo h2_util.lo h2_worker.lo h2_workers.lo "
 
 
 
@@ -27210,34 +28076,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_http2" in
+      case "$enable_http2" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_http2" = "static"; then
-    enable_http2=static
+  if test "$enable_http2" = "static" -o "$enable_http2" = "shared"; then
+    :
   elif test "$enable_http2" = "yes"; then
     enable_http2=$module_default
+  elif test "$enable_http2" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_http2=$module_default
+    else
+      enable_http2=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_http2" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_http2=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_http2=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_http2" = "maybe-all"; then
+  elif test "$enable_http2" = "all" -o "$enable_http2" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_http2=$module_default
@@ -27245,10 +28114,15 @@ fi
     else
       enable_http2=no
     fi
-  elif test "$enable_http2" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_http2" != "no" ; then
+  elif test "$enable_http2" = "reallyall" -o "$enable_http2" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_http2" != "no" ; then
       enable_http2=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_http2=no
+    fi
+  else
+    enable_http2=no
   fi
   if test "$enable_http2" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -27934,27 +28808,6 @@ fi
     done
   fi
 
-
-  if test "x$ab_CFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting ab_CFLAGS to \"$pkglookup\""
-    ab_CFLAGS="$pkglookup"
-  else
-    apr_addto_bugger="$pkglookup"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $ab_CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to ab_CFLAGS"
-        ab_CFLAGS="$ab_CFLAGS $i"
-      fi
-    done
-  fi
-
         pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`"
 
   if test "x$LDFLAGS" = "x"; then
@@ -28089,27 +28942,6 @@ fi
   fi
 
 
-  if test "x$ab_CFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting ab_CFLAGS to \"-I$ap_nghttp2_base/include\""
-    ab_CFLAGS="-I$ap_nghttp2_base/include"
-  else
-    apr_addto_bugger="-I$ap_nghttp2_base/include"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $ab_CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to ab_CFLAGS"
-        ab_CFLAGS="$ab_CFLAGS $i"
-      fi
-    done
-  fi
-
-
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-L$ap_nghttp2_base/lib\""
     LDFLAGS="-L$ap_nghttp2_base/lib"
@@ -28271,18 +29103,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
 
 
-  test "x$silent" != "xyes" && echo "  forcing ab_LDFLAGS to \"$MOD_LDFLAGS\""
-  ab_LDFLAGS="$MOD_LDFLAGS"
-
-
-  APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_CFLAGS"
-
-
-
-  APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_LDFLAGS"
-
-
-
             liberrors=""
       for ac_header in nghttp2/nghttp2.h
 do :
@@ -28431,7 +29251,6 @@ $as_echo "$enable_http2$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_http2=`echo $enable_http2|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES http2"
@@ -28507,6 +29326,693 @@ EOF
 
 
 
+proxy_http2_objs="mod_proxy_http2.lo h2_proxy_session.lo h2_proxy_util.lo "
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_http2" >&5
+$as_echo_n "checking whether to enable mod_proxy_http2... " >&6; }
+    # Check whether --enable-proxy-http2 was given.
+if test "${enable_proxy_http2+set}" = set; then :
+  enableval=$enable_proxy_http2; force_proxy_http2=$enableval
+else
+  enable_proxy_http2=no
+fi
+
+    _apmod_extra_msg=""
+      case "$enable_proxy_http2" in
+    yes|static|shared)
+      _apmod_required="yes"
+      ;;
+    *)
+      _apmod_required="no"
+      ;;
+  esac
+  if test "$enable_proxy_http2" = "static" -o "$enable_proxy_http2" = "shared"; then
+    :
+  elif test "$enable_proxy_http2" = "yes"; then
+    enable_proxy_http2=$module_default
+  elif test "$enable_proxy_http2" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_http2=$module_default
+    else
+      enable_proxy_http2=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
+  elif test "$enable_proxy_http2" = "most"; then
+    if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+            "$module_selection" = "reallyall"
+    then
+      enable_proxy_http2=$module_default
+    else
+      enable_proxy_http2=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
+  elif test "$enable_proxy_http2" = "all" -o "$enable_proxy_http2" = "maybe-all"; then
+    if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_proxy_http2=$module_default
+      _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_http2=no
+    fi
+  elif test "$enable_proxy_http2" = "reallyall" -o "$enable_proxy_http2" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_proxy_http2" != "no" ; then
+      enable_proxy_http2=$module_default
+      _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_proxy_http2=no
+    fi
+  else
+    enable_proxy_http2=no
+  fi
+  if test "$enable_proxy_http2" != "no"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+            if test "$enable_proxy" = "no" ; then
+                              enable_proxy_http2=no
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_http2\"" >&5
+$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_http2\"" >&2;}
+                            elif test "$enable_proxy_http2" = "static" && test "$enable_proxy" != "static" ; then
+                              enable_proxy_http2=$enable_proxy
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_proxy_http2 shared because mod_proxy is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_proxy_http2 shared because mod_proxy is built shared\"" >&2;}
+                            else
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nghttp2" >&5
+$as_echo_n "checking for nghttp2... " >&6; }
+if ${ac_cv_nghttp2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        ac_cv_nghttp2=no
+    ap_nghttp2_found=""
+    ap_nghttp2_base=""
+    ap_nghttp2_libs=""
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided nghttp2 base directory" >&5
+$as_echo_n "checking for user-provided nghttp2 base directory... " >&6; }
+
+# Check whether --with-nghttp2 was given.
+if test "${with_nghttp2+set}" = set; then :
+  withval=$with_nghttp2;
+            if test "x$withval" != "xyes" -a "x$withval" != "x"; then
+                ap_nghttp2_base="`cd $withval ; pwd`"
+      fi
+
+fi
+
+    if test "x$ap_nghttp2_base" = "x"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_nghttp2_base" >&5
+$as_echo "$ap_nghttp2_base" >&6; }
+    fi
+
+        saved_CPPFLAGS="$CPPFLAGS"
+    saved_LIBS="$LIBS"
+    saved_LDFLAGS="$LDFLAGS"
+
+        if test -n "$PKGCONFIG"; then
+      saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config along $PKG_CONFIG_PATH" >&5
+$as_echo_n "checking for pkg-config along $PKG_CONFIG_PATH... " >&6; }
+      if test "x$ap_nghttp2_base" != "x" -a \
+              -f "${ap_nghttp2_base}/lib/pkgconfig/libnghttp2.pc"; then
+                        PKG_CONFIG_PATH="${ap_nghttp2_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+        export PKG_CONFIG_PATH
+      fi
+      # Check whether --enable-nghttp2-staticlib-deps was given.
+if test "${enable_nghttp2_staticlib_deps+set}" = set; then :
+  enableval=$enable_nghttp2_staticlib_deps;
+        if test "$enableval" = "yes"; then
+          PKGCONFIG_LIBOPTS="--static"
+        fi
+
+fi
+
+      ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`"
+      if test $? -eq 0; then
+        ap_nghttp2_found="yes"
+        pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`"
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"$pkglookup\""
+    CPPFLAGS="$pkglookup"
+  else
+    apr_addto_bugger="$pkglookup"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $CPPFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$MOD_CFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_CFLAGS to \"$pkglookup\""
+    MOD_CFLAGS="$pkglookup"
+  else
+    apr_addto_bugger="$pkglookup"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_CFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_CFLAGS"
+        MOD_CFLAGS="$MOD_CFLAGS $i"
+      fi
+    done
+  fi
+
+        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`"
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$pkglookup\""
+    LDFLAGS="$pkglookup"
+  else
+    apr_addto_bugger="$pkglookup"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$MOD_LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_LDFLAGS to \"$pkglookup\""
+    MOD_LDFLAGS="$pkglookup"
+  else
+    apr_addto_bugger="$pkglookup"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_LDFLAGS"
+        MOD_LDFLAGS="$MOD_LDFLAGS $i"
+      fi
+    done
+  fi
+
+        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libnghttp2`"
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$pkglookup\""
+    LDFLAGS="$pkglookup"
+  else
+    apr_addto_bugger="$pkglookup"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$MOD_LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_LDFLAGS to \"$pkglookup\""
+    MOD_LDFLAGS="$pkglookup"
+  else
+    apr_addto_bugger="$pkglookup"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_LDFLAGS"
+        MOD_LDFLAGS="$MOD_LDFLAGS $i"
+      fi
+    done
+  fi
+
+      fi
+      PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
+    fi
+
+        if test "x$ap_nghttp2_base" != "x" -a "x$ap_nghttp2_found" = "x"; then
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-I$ap_nghttp2_base/include\""
+    CPPFLAGS="-I$ap_nghttp2_base/include"
+  else
+    apr_addto_bugger="-I$ap_nghttp2_base/include"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $CPPFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$MOD_CFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_CFLAGS to \"-I$ap_nghttp2_base/include\""
+    MOD_CFLAGS="-I$ap_nghttp2_base/include"
+  else
+    apr_addto_bugger="-I$ap_nghttp2_base/include"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_CFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_CFLAGS"
+        MOD_CFLAGS="$MOD_CFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-L$ap_nghttp2_base/lib\""
+    LDFLAGS="-L$ap_nghttp2_base/lib"
+  else
+    apr_addto_bugger="-L$ap_nghttp2_base/lib"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$MOD_LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_LDFLAGS to \"-L$ap_nghttp2_base/lib\""
+    MOD_LDFLAGS="-L$ap_nghttp2_base/lib"
+  else
+    apr_addto_bugger="-L$ap_nghttp2_base/lib"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_LDFLAGS"
+        MOD_LDFLAGS="$MOD_LDFLAGS $i"
+      fi
+    done
+  fi
+
+      if test "x$ap_platform_runtime_link_flag" != "x"; then
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_nghttp2_base/lib\""
+    LDFLAGS="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib"
+  else
+    apr_addto_bugger="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$MOD_LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_LDFLAGS to \"$ap_platform_runtime_link_flag$ap_nghttp2_base/lib\""
+    MOD_LDFLAGS="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib"
+  else
+    apr_addto_bugger="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_LDFLAGS"
+        MOD_LDFLAGS="$MOD_LDFLAGS $i"
+      fi
+    done
+  fi
+
+      fi
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nghttp2 version >= 1.2.1" >&5
+$as_echo_n "checking for nghttp2 version >= 1.2.1... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <nghttp2/nghttp2ver.h>
+int
+main ()
+{
+
+#if !defined(NGHTTP2_VERSION_NUM)
+#error "Missing nghttp2 version"
+#endif
+#if NGHTTP2_VERSION_NUM < 0x010201
+#error "Unsupported nghttp2 version " NGHTTP2_VERSION_TEXT
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "OK" >&6; }
+       ac_cv_nghttp2=yes
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5
+$as_echo "FAILED" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    if test "x$ac_cv_nghttp2" = "xyes"; then
+      ap_nghttp2_libs="${ap_nghttp2_libs:--lnghttp2} `$apr_config --libs`"
+
+  if test "x$MOD_LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_LDFLAGS to \"$ap_nghttp2_libs\""
+    MOD_LDFLAGS="$ap_nghttp2_libs"
+  else
+    apr_addto_bugger="$ap_nghttp2_libs"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_LDFLAGS"
+        MOD_LDFLAGS="$MOD_LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$ap_nghttp2_libs\""
+    LIBS="$ap_nghttp2_libs"
+  else
+    apr_addto_bugger="$ap_nghttp2_libs"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
+      fi
+    done
+  fi
+
+
+            liberrors=""
+      for ac_header in nghttp2/nghttp2.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "nghttp2/nghttp2.h" "ac_cv_header_nghttp2_nghttp2_h" "$ac_includes_default"
+if test "x$ac_cv_header_nghttp2_nghttp2_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NGHTTP2_NGHTTP2_H 1
+_ACEOF
+
+fi
+
+done
+
+      for ac_func in nghttp2_session_server_new2
+do :
+  ac_fn_c_check_func "$LINENO" "nghttp2_session_server_new2" "ac_cv_func_nghttp2_session_server_new2"
+if test "x$ac_cv_func_nghttp2_session_server_new2" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NGHTTP2_SESSION_SERVER_NEW2 1
+_ACEOF
+
+else
+  liberrors="yes"
+fi
+done
+
+      if test "x$liberrors" != "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 library is unusable" >&5
+$as_echo "$as_me: WARNING: nghttp2 library is unusable" >&2;}
+      fi
+      for ac_func in nghttp2_stream_get_weight
+do :
+  ac_fn_c_check_func "$LINENO" "nghttp2_stream_get_weight" "ac_cv_func_nghttp2_stream_get_weight"
+if test "x$ac_cv_func_nghttp2_stream_get_weight" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NGHTTP2_STREAM_GET_WEIGHT 1
+_ACEOF
+
+else
+  liberrors="yes"
+fi
+done
+
+      if test "x$liberrors" != "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 version >= 1.3.0 is required" >&5
+$as_echo "$as_me: WARNING: nghttp2 version >= 1.3.0 is required" >&2;}
+      fi
+      for ac_func in nghttp2_session_change_stream_priority
+do :
+  ac_fn_c_check_func "$LINENO" "nghttp2_session_change_stream_priority" "ac_cv_func_nghttp2_session_change_stream_priority"
+if test "x$ac_cv_func_nghttp2_session_change_stream_priority" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NGHTTP2_SESSION_CHANGE_STREAM_PRIORITY 1
+_ACEOF
+
+  if test "x$MOD_CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_CPPFLAGS to \""-DH2_NG2_CHANGE_PRIO"\""
+    MOD_CPPFLAGS=""-DH2_NG2_CHANGE_PRIO""
+  else
+    apr_addto_bugger=""-DH2_NG2_CHANGE_PRIO""
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_CPPFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_CPPFLAGS"
+        MOD_CPPFLAGS="$MOD_CPPFLAGS $i"
+      fi
+    done
+  fi
+
+fi
+done
+
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 version is too old" >&5
+$as_echo "$as_me: WARNING: nghttp2 version is too old" >&2;}
+    fi
+
+        CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+    LDFLAGS="$saved_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_nghttp2" >&5
+$as_echo "$ac_cv_nghttp2" >&6; }
+  if test "x$ac_cv_nghttp2" = "xyes"; then
+
+$as_echo "#define HAVE_NGHTTP2 1" >>confdefs.h
+
+  fi
+
+    if test "$ac_cv_nghttp2" = "yes" ; then
+        if test "x$enable_http2" = "xshared"; then
+           # The only symbol which needs to be exported is the module
+           # structure, so ask libtool to hide everything else:
+
+  if test "x$MOD_PROXY_HTTP2_LDADD" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting MOD_PROXY_HTTP2_LDADD to \"-export-symbols-regex proxy_http2_module\""
+    MOD_PROXY_HTTP2_LDADD="-export-symbols-regex proxy_http2_module"
+  else
+    apr_addto_bugger="-export-symbols-regex proxy_http2_module"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $MOD_PROXY_HTTP2_LDADD; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to MOD_PROXY_HTTP2_LDADD"
+        MOD_PROXY_HTTP2_LDADD="$MOD_PROXY_HTTP2_LDADD $i"
+      fi
+    done
+  fi
+
+        fi
+    else
+        enable_proxy_http2=no
+    fi
+
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_http2" >&5
+$as_echo_n "checking whether to enable mod_proxy_http2... " >&6; }
+            if test "$enable_proxy_http2" = "no"; then
+              if test "$_apmod_required" = "no"; then
+                _apmod_extra_msg=" (disabled)"
+              else
+                as_fn_error $? "mod_proxy_http2 has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+              fi
+            fi
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_http2$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_http2$_apmod_extra_msg" >&6; }
+  if test "$enable_proxy_http2" != "no"; then
+    case "$enable_proxy_http2" in
+    static*)
+      MODLIST="$MODLIST proxy_http2"
+      if test "proxy_http2" = "so"; then
+          sharedobjs=yes
+      fi
+      shared="";;
+    *)
+      sharedobjs=yes
+      shared=yes
+      DSO_MODULES="$DSO_MODULES proxy_http2"
+      if test "no" = "yes" ; then
+        ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_http2"
+      fi
+      ;;
+    esac
+
+
+  if test -z "$proxy_http2_objs"; then
+    objects="mod_proxy_http2.lo"
+  else
+    objects="$proxy_http2_objs"
+  fi
+
+  if test -z "$module_standalone"; then
+    if test -z "$shared"; then
+      # The filename of a convenience library must have a "lib" prefix:
+      libname="libmod_proxy_http2.la"
+      BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+      modpath_static="$modpath_static $libname"
+      cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+	\$(MOD_LINK) $objects \$(MOD_PROXY_HTTP2_LDADD)
+EOF
+      if test ! -z "\$(MOD_PROXY_HTTP2_LDADD)"; then
+
+  if test "x$AP_LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting AP_LIBS to \"\$(MOD_PROXY_HTTP2_LDADD)\""
+    AP_LIBS="\$(MOD_PROXY_HTTP2_LDADD)"
+  else
+    apr_addto_bugger="\$(MOD_PROXY_HTTP2_LDADD)"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $AP_LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to AP_LIBS"
+        AP_LIBS="$AP_LIBS $i"
+      fi
+    done
+  fi
+
+      fi
+    else
+      apache_need_shared=yes
+      libname="mod_proxy_http2.la"
+      shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+      modpath_shared="$modpath_shared $libname"
+      cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version  $objects \$(MOD_PROXY_HTTP2_LDADD)
+EOF
+    fi
+  fi
+
+
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PROXY_HTTP2_LDADD"
+
+
+
+  fi
+
+
+
 
   echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
   echo "static = $modpath_static" >> $modpath_current/modules.mk
@@ -28546,38 +30052,41 @@ $as_echo_n "checking whether to enable mod_lbmethod_byrequests... " >&6; }
 if test "${enable_lbmethod_byrequests+set}" = set; then :
   enableval=$enable_lbmethod_byrequests; force_lbmethod_byrequests=$enableval
 else
-  enable_lbmethod_byrequests=$proxy_mods_enable
+  enable_lbmethod_byrequests=$enable_proxy_balancer
 fi
 
     _apmod_extra_msg=""
-        case "$enable_lbmethod_byrequests" in
+      case "$enable_lbmethod_byrequests" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_lbmethod_byrequests" = "static"; then
-    enable_lbmethod_byrequests=static
+  if test "$enable_lbmethod_byrequests" = "static" -o "$enable_lbmethod_byrequests" = "shared"; then
+    :
   elif test "$enable_lbmethod_byrequests" = "yes"; then
     enable_lbmethod_byrequests=$module_default
+  elif test "$enable_lbmethod_byrequests" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_lbmethod_byrequests=$module_default
+    else
+      enable_lbmethod_byrequests=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_lbmethod_byrequests" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_lbmethod_byrequests=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_lbmethod_byrequests=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_lbmethod_byrequests" = "maybe-all"; then
+  elif test "$enable_lbmethod_byrequests" = "all" -o "$enable_lbmethod_byrequests" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_lbmethod_byrequests=$module_default
@@ -28585,13 +30094,39 @@ fi
     else
       enable_lbmethod_byrequests=no
     fi
-  elif test "$enable_lbmethod_byrequests" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_lbmethod_byrequests" != "no" ; then
+  elif test "$enable_lbmethod_byrequests" = "reallyall" -o "$enable_lbmethod_byrequests" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_lbmethod_byrequests" != "no" ; then
       enable_lbmethod_byrequests=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_lbmethod_byrequests=no
+    fi
+  else
+    enable_lbmethod_byrequests=no
   fi
   if test "$enable_lbmethod_byrequests" != "no"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+            if test "$enable_proxy_balancer" = "no" ; then
+                              enable_lbmethod_byrequests=no
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_byrequests\"" >&5
+$as_echo "$as_me: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_byrequests\"" >&2;}
+                            elif test "$enable_lbmethod_byrequests" = "static" && test "$enable_proxy_balancer" != "static" ; then
+                              enable_lbmethod_byrequests=$enable_proxy_balancer
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_lbmethod_byrequests shared because mod_proxy_balancer is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_lbmethod_byrequests shared because mod_proxy_balancer is built shared\"" >&2;}
+                            else
             :
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_byrequests" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_byrequests... " >&6; }
+            if test "$enable_lbmethod_byrequests" = "no"; then
+              if test "$_apmod_required" = "no"; then
+                _apmod_extra_msg=" (disabled)"
+              else
+                as_fn_error $? "mod_lbmethod_byrequests has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+              fi
+            fi
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_byrequests$_apmod_extra_msg" >&5
 $as_echo "$enable_lbmethod_byrequests$_apmod_extra_msg" >&6; }
@@ -28604,11 +30139,10 @@ $as_echo "$enable_lbmethod_byrequests$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_lbmethod_byrequests=`echo $enable_lbmethod_byrequests|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_byrequests"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_balancer" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_byrequests"
       fi
       ;;
@@ -28680,38 +30214,41 @@ $as_echo_n "checking whether to enable mod_lbmethod_bytraffic... " >&6; }
 if test "${enable_lbmethod_bytraffic+set}" = set; then :
   enableval=$enable_lbmethod_bytraffic; force_lbmethod_bytraffic=$enableval
 else
-  enable_lbmethod_bytraffic=$proxy_mods_enable
+  enable_lbmethod_bytraffic=$enable_proxy_balancer
 fi
 
     _apmod_extra_msg=""
-        case "$enable_lbmethod_bytraffic" in
+      case "$enable_lbmethod_bytraffic" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_lbmethod_bytraffic" = "static"; then
-    enable_lbmethod_bytraffic=static
+  if test "$enable_lbmethod_bytraffic" = "static" -o "$enable_lbmethod_bytraffic" = "shared"; then
+    :
   elif test "$enable_lbmethod_bytraffic" = "yes"; then
     enable_lbmethod_bytraffic=$module_default
+  elif test "$enable_lbmethod_bytraffic" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_lbmethod_bytraffic=$module_default
+    else
+      enable_lbmethod_bytraffic=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_lbmethod_bytraffic" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_lbmethod_bytraffic=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_lbmethod_bytraffic=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_lbmethod_bytraffic" = "maybe-all"; then
+  elif test "$enable_lbmethod_bytraffic" = "all" -o "$enable_lbmethod_bytraffic" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_lbmethod_bytraffic=$module_default
@@ -28719,13 +30256,39 @@ fi
     else
       enable_lbmethod_bytraffic=no
     fi
-  elif test "$enable_lbmethod_bytraffic" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_lbmethod_bytraffic" != "no" ; then
+  elif test "$enable_lbmethod_bytraffic" = "reallyall" -o "$enable_lbmethod_bytraffic" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_lbmethod_bytraffic" != "no" ; then
       enable_lbmethod_bytraffic=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_lbmethod_bytraffic=no
+    fi
+  else
+    enable_lbmethod_bytraffic=no
   fi
   if test "$enable_lbmethod_bytraffic" != "no"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+            if test "$enable_proxy_balancer" = "no" ; then
+                              enable_lbmethod_bytraffic=no
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_bytraffic\"" >&5
+$as_echo "$as_me: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_bytraffic\"" >&2;}
+                            elif test "$enable_lbmethod_bytraffic" = "static" && test "$enable_proxy_balancer" != "static" ; then
+                              enable_lbmethod_bytraffic=$enable_proxy_balancer
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_lbmethod_bytraffic shared because mod_proxy_balancer is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_lbmethod_bytraffic shared because mod_proxy_balancer is built shared\"" >&2;}
+                            else
             :
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_bytraffic" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_bytraffic... " >&6; }
+            if test "$enable_lbmethod_bytraffic" = "no"; then
+              if test "$_apmod_required" = "no"; then
+                _apmod_extra_msg=" (disabled)"
+              else
+                as_fn_error $? "mod_lbmethod_bytraffic has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+              fi
+            fi
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_bytraffic$_apmod_extra_msg" >&5
 $as_echo "$enable_lbmethod_bytraffic$_apmod_extra_msg" >&6; }
@@ -28738,11 +30301,10 @@ $as_echo "$enable_lbmethod_bytraffic$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_lbmethod_bytraffic=`echo $enable_lbmethod_bytraffic|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_bytraffic"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_balancer" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_bytraffic"
       fi
       ;;
@@ -28814,38 +30376,41 @@ $as_echo_n "checking whether to enable mod_lbmethod_bybusyness... " >&6; }
 if test "${enable_lbmethod_bybusyness+set}" = set; then :
   enableval=$enable_lbmethod_bybusyness; force_lbmethod_bybusyness=$enableval
 else
-  enable_lbmethod_bybusyness=$proxy_mods_enable
+  enable_lbmethod_bybusyness=$enable_proxy_balancer
 fi
 
     _apmod_extra_msg=""
-        case "$enable_lbmethod_bybusyness" in
+      case "$enable_lbmethod_bybusyness" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_lbmethod_bybusyness" = "static"; then
-    enable_lbmethod_bybusyness=static
+  if test "$enable_lbmethod_bybusyness" = "static" -o "$enable_lbmethod_bybusyness" = "shared"; then
+    :
   elif test "$enable_lbmethod_bybusyness" = "yes"; then
     enable_lbmethod_bybusyness=$module_default
+  elif test "$enable_lbmethod_bybusyness" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_lbmethod_bybusyness=$module_default
+    else
+      enable_lbmethod_bybusyness=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_lbmethod_bybusyness" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_lbmethod_bybusyness=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_lbmethod_bybusyness=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_lbmethod_bybusyness" = "maybe-all"; then
+  elif test "$enable_lbmethod_bybusyness" = "all" -o "$enable_lbmethod_bybusyness" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_lbmethod_bybusyness=$module_default
@@ -28853,13 +30418,39 @@ fi
     else
       enable_lbmethod_bybusyness=no
     fi
-  elif test "$enable_lbmethod_bybusyness" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_lbmethod_bybusyness" != "no" ; then
+  elif test "$enable_lbmethod_bybusyness" = "reallyall" -o "$enable_lbmethod_bybusyness" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_lbmethod_bybusyness" != "no" ; then
       enable_lbmethod_bybusyness=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_lbmethod_bybusyness=no
+    fi
+  else
+    enable_lbmethod_bybusyness=no
   fi
   if test "$enable_lbmethod_bybusyness" != "no"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+            if test "$enable_proxy_balancer" = "no" ; then
+                              enable_lbmethod_bybusyness=no
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_bybusyness\"" >&5
+$as_echo "$as_me: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_bybusyness\"" >&2;}
+                            elif test "$enable_lbmethod_bybusyness" = "static" && test "$enable_proxy_balancer" != "static" ; then
+                              enable_lbmethod_bybusyness=$enable_proxy_balancer
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_lbmethod_bybusyness shared because mod_proxy_balancer is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_lbmethod_bybusyness shared because mod_proxy_balancer is built shared\"" >&2;}
+                            else
             :
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_bybusyness" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_bybusyness... " >&6; }
+            if test "$enable_lbmethod_bybusyness" = "no"; then
+              if test "$_apmod_required" = "no"; then
+                _apmod_extra_msg=" (disabled)"
+              else
+                as_fn_error $? "mod_lbmethod_bybusyness has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+              fi
+            fi
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_bybusyness$_apmod_extra_msg" >&5
 $as_echo "$enable_lbmethod_bybusyness$_apmod_extra_msg" >&6; }
@@ -28872,11 +30463,10 @@ $as_echo "$enable_lbmethod_bybusyness$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_lbmethod_bybusyness=`echo $enable_lbmethod_bybusyness|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_bybusyness"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_balancer" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_bybusyness"
       fi
       ;;
@@ -28948,38 +30538,41 @@ $as_echo_n "checking whether to enable mod_lbmethod_heartbeat... " >&6; }
 if test "${enable_lbmethod_heartbeat+set}" = set; then :
   enableval=$enable_lbmethod_heartbeat; force_lbmethod_heartbeat=$enableval
 else
-  enable_lbmethod_heartbeat=$proxy_mods_enable
+  enable_lbmethod_heartbeat=$enable_proxy_balancer
 fi
 
     _apmod_extra_msg=""
-        case "$enable_lbmethod_heartbeat" in
+      case "$enable_lbmethod_heartbeat" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_lbmethod_heartbeat" = "static"; then
-    enable_lbmethod_heartbeat=static
+  if test "$enable_lbmethod_heartbeat" = "static" -o "$enable_lbmethod_heartbeat" = "shared"; then
+    :
   elif test "$enable_lbmethod_heartbeat" = "yes"; then
     enable_lbmethod_heartbeat=$module_default
+  elif test "$enable_lbmethod_heartbeat" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_lbmethod_heartbeat=$module_default
+    else
+      enable_lbmethod_heartbeat=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_lbmethod_heartbeat" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_lbmethod_heartbeat=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_lbmethod_heartbeat=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_lbmethod_heartbeat" = "maybe-all"; then
+  elif test "$enable_lbmethod_heartbeat" = "all" -o "$enable_lbmethod_heartbeat" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_lbmethod_heartbeat=$module_default
@@ -28987,13 +30580,39 @@ fi
     else
       enable_lbmethod_heartbeat=no
     fi
-  elif test "$enable_lbmethod_heartbeat" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_lbmethod_heartbeat" != "no" ; then
+  elif test "$enable_lbmethod_heartbeat" = "reallyall" -o "$enable_lbmethod_heartbeat" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_lbmethod_heartbeat" != "no" ; then
       enable_lbmethod_heartbeat=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_lbmethod_heartbeat=no
+    fi
+  else
+    enable_lbmethod_heartbeat=no
   fi
   if test "$enable_lbmethod_heartbeat" != "no"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+            if test "$enable_proxy_balancer" = "no" ; then
+                              enable_lbmethod_heartbeat=no
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_heartbeat\"" >&5
+$as_echo "$as_me: WARNING: \"mod_proxy_balancer is disabled but required for mod_lbmethod_heartbeat\"" >&2;}
+                            elif test "$enable_lbmethod_heartbeat" = "static" && test "$enable_proxy_balancer" != "static" ; then
+                              enable_lbmethod_heartbeat=$enable_proxy_balancer
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_lbmethod_heartbeat shared because mod_proxy_balancer is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_lbmethod_heartbeat shared because mod_proxy_balancer is built shared\"" >&2;}
+                            else
             :
+            fi
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_heartbeat" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_heartbeat... " >&6; }
+            if test "$enable_lbmethod_heartbeat" = "no"; then
+              if test "$_apmod_required" = "no"; then
+                _apmod_extra_msg=" (disabled)"
+              else
+                as_fn_error $? "mod_lbmethod_heartbeat has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+              fi
+            fi
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_heartbeat$_apmod_extra_msg" >&5
 $as_echo "$enable_lbmethod_heartbeat$_apmod_extra_msg" >&6; }
@@ -29006,11 +30625,10 @@ $as_echo "$enable_lbmethod_heartbeat$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_lbmethod_heartbeat=`echo $enable_lbmethod_heartbeat|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_heartbeat"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_balancer" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_heartbeat"
       fi
       ;;
@@ -29572,34 +31190,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_unixd" in
+      case "$enable_unixd" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_unixd" = "static"; then
-    enable_unixd=static
+  if test "$enable_unixd" = "static" -o "$enable_unixd" = "shared"; then
+    :
   elif test "$enable_unixd" = "yes"; then
     enable_unixd=$module_default
+  elif test "$enable_unixd" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_unixd=$module_default
+    else
+      enable_unixd=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_unixd" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_unixd=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_unixd=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_unixd" = "maybe-all"; then
+  elif test "$enable_unixd" = "all" -o "$enable_unixd" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_unixd=$module_default
@@ -29607,10 +31228,15 @@ fi
     else
       enable_unixd=no
     fi
-  elif test "$enable_unixd" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_unixd" != "no" ; then
+  elif test "$enable_unixd" = "reallyall" -o "$enable_unixd" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_unixd" != "no" ; then
       enable_unixd=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_unixd=no
+    fi
+  else
+    enable_unixd=no
   fi
   if test "$enable_unixd" != "no"; then
             :
@@ -29626,7 +31252,6 @@ $as_echo "$enable_unixd$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_unixd=`echo $enable_unixd|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES unixd"
@@ -29706,34 +31331,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_privileges" in
+      case "$enable_privileges" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_privileges" = "static"; then
-    enable_privileges=static
+  if test "$enable_privileges" = "static" -o "$enable_privileges" = "shared"; then
+    :
   elif test "$enable_privileges" = "yes"; then
     enable_privileges=$module_default
+  elif test "$enable_privileges" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_privileges=$module_default
+    else
+      enable_privileges=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_privileges" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_privileges=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_privileges=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_privileges" = "maybe-all"; then
+  elif test "$enable_privileges" = "all" -o "$enable_privileges" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_privileges=$module_default
@@ -29741,10 +31369,15 @@ fi
     else
       enable_privileges=no
     fi
-  elif test "$enable_privileges" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_privileges" != "no" ; then
+  elif test "$enable_privileges" = "reallyall" -o "$enable_privileges" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_privileges" != "no" ; then
       enable_privileges=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_privileges=no
+    fi
+  else
+    enable_privileges=no
   fi
   if test "$enable_privileges" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -29793,7 +31426,6 @@ $as_echo "$enable_privileges$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_privileges=`echo $enable_privileges|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES privileges"
@@ -29939,34 +31571,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_heartbeat" in
+      case "$enable_heartbeat" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_heartbeat" = "static"; then
-    enable_heartbeat=static
+  if test "$enable_heartbeat" = "static" -o "$enable_heartbeat" = "shared"; then
+    :
   elif test "$enable_heartbeat" = "yes"; then
     enable_heartbeat=$module_default
+  elif test "$enable_heartbeat" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_heartbeat=$module_default
+    else
+      enable_heartbeat=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_heartbeat" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_heartbeat=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_heartbeat=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_heartbeat" = "maybe-all"; then
+  elif test "$enable_heartbeat" = "all" -o "$enable_heartbeat" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_heartbeat=$module_default
@@ -29974,10 +31609,15 @@ fi
     else
       enable_heartbeat=no
     fi
-  elif test "$enable_heartbeat" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_heartbeat" != "no" ; then
+  elif test "$enable_heartbeat" = "reallyall" -o "$enable_heartbeat" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_heartbeat" != "no" ; then
       enable_heartbeat=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_heartbeat=no
+    fi
+  else
+    enable_heartbeat=no
   fi
   if test "$enable_heartbeat" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -29987,9 +31627,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_watchdog is disabled but required for mod_heartbeat\"" >&5
 $as_echo "$as_me: WARNING: \"mod_watchdog is disabled but required for mod_heartbeat\"" >&2;}
                             elif test "$enable_heartbeat" = "static" && test "$enable_watchdog" != "static" ; then
-                              enable_heartbeat=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_heartbeat statically if mod_watchdog is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_heartbeat statically if mod_watchdog is built shared\"" >&2;}
+                              enable_heartbeat=$enable_watchdog
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_heartbeat shared because mod_watchdog is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_heartbeat shared because mod_watchdog is built shared\"" >&2;}
                             else
             :
             fi
@@ -30014,7 +31654,6 @@ $as_echo "$enable_heartbeat$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_heartbeat=`echo $enable_heartbeat|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES heartbeat"
@@ -30094,34 +31733,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_heartmonitor" in
+      case "$enable_heartmonitor" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_heartmonitor" = "static"; then
-    enable_heartmonitor=static
+  if test "$enable_heartmonitor" = "static" -o "$enable_heartmonitor" = "shared"; then
+    :
   elif test "$enable_heartmonitor" = "yes"; then
     enable_heartmonitor=$module_default
+  elif test "$enable_heartmonitor" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_heartmonitor=$module_default
+    else
+      enable_heartmonitor=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_heartmonitor" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_heartmonitor=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_heartmonitor=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_heartmonitor" = "maybe-all"; then
+  elif test "$enable_heartmonitor" = "all" -o "$enable_heartmonitor" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_heartmonitor=$module_default
@@ -30129,10 +31771,15 @@ fi
     else
       enable_heartmonitor=no
     fi
-  elif test "$enable_heartmonitor" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_heartmonitor" != "no" ; then
+  elif test "$enable_heartmonitor" = "reallyall" -o "$enable_heartmonitor" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_heartmonitor" != "no" ; then
       enable_heartmonitor=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_heartmonitor=no
+    fi
+  else
+    enable_heartmonitor=no
   fi
   if test "$enable_heartmonitor" != "no"; then
             :
@@ -30148,7 +31795,6 @@ $as_echo "$enable_heartmonitor$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_heartmonitor=`echo $enable_heartmonitor|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES heartmonitor"
@@ -30269,34 +31915,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_dav" in
+      case "$enable_dav" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_dav" = "static"; then
-    enable_dav=static
+  if test "$enable_dav" = "static" -o "$enable_dav" = "shared"; then
+    :
   elif test "$enable_dav" = "yes"; then
     enable_dav=$module_default
+  elif test "$enable_dav" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_dav=$module_default
+    else
+      enable_dav=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_dav" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_dav=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_dav=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_dav" = "maybe-all"; then
+  elif test "$enable_dav" = "all" -o "$enable_dav" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_dav=$module_default
@@ -30304,10 +31953,15 @@ fi
     else
       enable_dav=no
     fi
-  elif test "$enable_dav" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_dav" != "no" ; then
+  elif test "$enable_dav" = "reallyall" -o "$enable_dav" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_dav" != "no" ; then
       enable_dav=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_dav=no
+    fi
+  else
+    enable_dav=no
   fi
   if test "$enable_dav" != "no"; then
             :
@@ -30323,7 +31977,6 @@ $as_echo "$enable_dav$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_dav=`echo $enable_dav|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dav"
@@ -30463,34 +32116,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_status" in
+      case "$enable_status" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_status" = "static"; then
-    enable_status=static
+  if test "$enable_status" = "static" -o "$enable_status" = "shared"; then
+    :
   elif test "$enable_status" = "yes"; then
     enable_status=$module_default
+  elif test "$enable_status" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_status=$module_default
+    else
+      enable_status=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_status" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_status=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_status=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_status" = "maybe-all"; then
+  elif test "$enable_status" = "all" -o "$enable_status" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_status=$module_default
@@ -30498,10 +32154,15 @@ fi
     else
       enable_status=no
     fi
-  elif test "$enable_status" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_status" != "no" ; then
+  elif test "$enable_status" = "reallyall" -o "$enable_status" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_status" != "no" ; then
       enable_status=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_status=no
+    fi
+  else
+    enable_status=no
   fi
   if test "$enable_status" != "no"; then
             :
@@ -30517,7 +32178,6 @@ $as_echo "$enable_status$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_status=`echo $enable_status|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES status"
@@ -30597,34 +32257,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_autoindex" in
+      case "$enable_autoindex" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_autoindex" = "static"; then
-    enable_autoindex=static
+  if test "$enable_autoindex" = "static" -o "$enable_autoindex" = "shared"; then
+    :
   elif test "$enable_autoindex" = "yes"; then
     enable_autoindex=$module_default
+  elif test "$enable_autoindex" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_autoindex=$module_default
+    else
+      enable_autoindex=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_autoindex" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_autoindex=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_autoindex=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_autoindex" = "maybe-all"; then
+  elif test "$enable_autoindex" = "all" -o "$enable_autoindex" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_autoindex=$module_default
@@ -30632,10 +32295,15 @@ fi
     else
       enable_autoindex=no
     fi
-  elif test "$enable_autoindex" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_autoindex" != "no" ; then
+  elif test "$enable_autoindex" = "reallyall" -o "$enable_autoindex" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_autoindex" != "no" ; then
       enable_autoindex=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_autoindex=no
+    fi
+  else
+    enable_autoindex=no
   fi
   if test "$enable_autoindex" != "no"; then
             :
@@ -30651,7 +32319,6 @@ $as_echo "$enable_autoindex$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_autoindex=`echo $enable_autoindex|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES autoindex"
@@ -30731,34 +32398,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_asis" in
+      case "$enable_asis" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_asis" = "static"; then
-    enable_asis=static
+  if test "$enable_asis" = "static" -o "$enable_asis" = "shared"; then
+    :
   elif test "$enable_asis" = "yes"; then
     enable_asis=$module_default
+  elif test "$enable_asis" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_asis=$module_default
+    else
+      enable_asis=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_asis" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_asis=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_asis=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_asis" = "maybe-all"; then
+  elif test "$enable_asis" = "all" -o "$enable_asis" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_asis=$module_default
@@ -30766,10 +32436,15 @@ fi
     else
       enable_asis=no
     fi
-  elif test "$enable_asis" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_asis" != "no" ; then
+  elif test "$enable_asis" = "reallyall" -o "$enable_asis" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_asis" != "no" ; then
       enable_asis=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_asis=no
+    fi
+  else
+    enable_asis=no
   fi
   if test "$enable_asis" != "no"; then
             :
@@ -30785,7 +32460,6 @@ $as_echo "$enable_asis$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_asis=`echo $enable_asis|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES asis"
@@ -30865,34 +32539,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_info" in
+      case "$enable_info" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_info" = "static"; then
-    enable_info=static
+  if test "$enable_info" = "static" -o "$enable_info" = "shared"; then
+    :
   elif test "$enable_info" = "yes"; then
     enable_info=$module_default
+  elif test "$enable_info" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_info=$module_default
+    else
+      enable_info=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_info" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_info=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_info=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_info" = "maybe-all"; then
+  elif test "$enable_info" = "all" -o "$enable_info" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_info=$module_default
@@ -30900,10 +32577,15 @@ fi
     else
       enable_info=no
     fi
-  elif test "$enable_info" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_info" != "no" ; then
+  elif test "$enable_info" = "reallyall" -o "$enable_info" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_info" != "no" ; then
       enable_info=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_info=no
+    fi
+  else
+    enable_info=no
   fi
   if test "$enable_info" != "no"; then
             :
@@ -30919,7 +32601,6 @@ $as_echo "$enable_info$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_info=`echo $enable_info|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES info"
@@ -30999,34 +32680,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_suexec" in
+      case "$enable_suexec" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_suexec" = "static"; then
-    enable_suexec=static
+  if test "$enable_suexec" = "static" -o "$enable_suexec" = "shared"; then
+    :
   elif test "$enable_suexec" = "yes"; then
     enable_suexec=$module_default
+  elif test "$enable_suexec" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_suexec=$module_default
+    else
+      enable_suexec=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_suexec" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_suexec=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_suexec=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_suexec" = "maybe-all"; then
+  elif test "$enable_suexec" = "all" -o "$enable_suexec" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_suexec=$module_default
@@ -31034,10 +32718,15 @@ fi
     else
       enable_suexec=no
     fi
-  elif test "$enable_suexec" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_suexec" != "no" ; then
+  elif test "$enable_suexec" = "reallyall" -o "$enable_suexec" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_suexec" != "no" ; then
       enable_suexec=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_suexec=no
+    fi
+  else
+    enable_suexec=no
   fi
   if test "$enable_suexec" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -31067,7 +32756,6 @@ $as_echo "$enable_suexec$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_suexec=`echo $enable_suexec|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES suexec"
@@ -31163,34 +32851,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cgid" in
+      case "$enable_cgid" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cgid" = "static"; then
-    enable_cgid=static
+  if test "$enable_cgid" = "static" -o "$enable_cgid" = "shared"; then
+    :
   elif test "$enable_cgid" = "yes"; then
     enable_cgid=$module_default
+  elif test "$enable_cgid" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cgid=$module_default
+    else
+      enable_cgid=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cgid" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cgid=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cgid=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cgid" = "maybe-all"; then
+  elif test "$enable_cgid" = "all" -o "$enable_cgid" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cgid=$module_default
@@ -31198,10 +32889,15 @@ fi
     else
       enable_cgid=no
     fi
-  elif test "$enable_cgid" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cgid" != "no" ; then
+  elif test "$enable_cgid" = "reallyall" -o "$enable_cgid" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cgid" != "no" ; then
       enable_cgid=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cgid=no
+    fi
+  else
+    enable_cgid=no
   fi
   if test "$enable_cgid" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -31267,7 +32963,6 @@ $as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cgid=`echo $enable_cgid|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cgid"
@@ -31347,34 +33042,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cgi" in
+      case "$enable_cgi" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cgi" = "static"; then
-    enable_cgi=static
+  if test "$enable_cgi" = "static" -o "$enable_cgi" = "shared"; then
+    :
   elif test "$enable_cgi" = "yes"; then
     enable_cgi=$module_default
+  elif test "$enable_cgi" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cgi=$module_default
+    else
+      enable_cgi=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cgi" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cgi=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cgi=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cgi" = "maybe-all"; then
+  elif test "$enable_cgi" = "all" -o "$enable_cgi" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cgi=$module_default
@@ -31382,10 +33080,15 @@ fi
     else
       enable_cgi=no
     fi
-  elif test "$enable_cgi" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cgi" != "no" ; then
+  elif test "$enable_cgi" = "reallyall" -o "$enable_cgi" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cgi" != "no" ; then
       enable_cgi=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cgi=no
+    fi
+  else
+    enable_cgi=no
   fi
   if test "$enable_cgi" != "no"; then
             :
@@ -31401,7 +33104,6 @@ $as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cgi=`echo $enable_cgi|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cgi"
@@ -31482,34 +33184,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cgi" in
+      case "$enable_cgi" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cgi" = "static"; then
-    enable_cgi=static
+  if test "$enable_cgi" = "static" -o "$enable_cgi" = "shared"; then
+    :
   elif test "$enable_cgi" = "yes"; then
     enable_cgi=$module_default
+  elif test "$enable_cgi" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cgi=$module_default
+    else
+      enable_cgi=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cgi" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cgi=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cgi=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cgi" = "maybe-all"; then
+  elif test "$enable_cgi" = "all" -o "$enable_cgi" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cgi=$module_default
@@ -31517,10 +33222,15 @@ fi
     else
       enable_cgi=no
     fi
-  elif test "$enable_cgi" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cgi" != "no" ; then
+  elif test "$enable_cgi" = "reallyall" -o "$enable_cgi" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cgi" != "no" ; then
       enable_cgi=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cgi=no
+    fi
+  else
+    enable_cgi=no
   fi
   if test "$enable_cgi" != "no"; then
             :
@@ -31536,7 +33246,6 @@ $as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cgi=`echo $enable_cgi|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cgi"
@@ -31616,34 +33325,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_cgid" in
+      case "$enable_cgid" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_cgid" = "static"; then
-    enable_cgid=static
+  if test "$enable_cgid" = "static" -o "$enable_cgid" = "shared"; then
+    :
   elif test "$enable_cgid" = "yes"; then
     enable_cgid=$module_default
+  elif test "$enable_cgid" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_cgid=$module_default
+    else
+      enable_cgid=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_cgid" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_cgid=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_cgid=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_cgid" = "maybe-all"; then
+  elif test "$enable_cgid" = "all" -o "$enable_cgid" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_cgid=$module_default
@@ -31651,10 +33363,15 @@ fi
     else
       enable_cgid=no
     fi
-  elif test "$enable_cgid" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_cgid" != "no" ; then
+  elif test "$enable_cgid" = "reallyall" -o "$enable_cgid" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_cgid" != "no" ; then
       enable_cgid=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_cgid=no
+    fi
+  else
+    enable_cgid=no
   fi
   if test "$enable_cgid" != "no"; then
             :
@@ -31670,7 +33387,6 @@ $as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_cgid=`echo $enable_cgid|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cgid"
@@ -31915,34 +33631,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_dav_fs" in
+      case "$enable_dav_fs" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_dav_fs" = "static"; then
-    enable_dav_fs=static
+  if test "$enable_dav_fs" = "static" -o "$enable_dav_fs" = "shared"; then
+    :
   elif test "$enable_dav_fs" = "yes"; then
     enable_dav_fs=$module_default
+  elif test "$enable_dav_fs" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_dav_fs=$module_default
+    else
+      enable_dav_fs=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_dav_fs" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_dav_fs=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_dav_fs=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_dav_fs" = "maybe-all"; then
+  elif test "$enable_dav_fs" = "all" -o "$enable_dav_fs" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_dav_fs=$module_default
@@ -31950,10 +33669,15 @@ fi
     else
       enable_dav_fs=no
     fi
-  elif test "$enable_dav_fs" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_dav_fs" != "no" ; then
+  elif test "$enable_dav_fs" = "reallyall" -o "$enable_dav_fs" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_dav_fs" != "no" ; then
       enable_dav_fs=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_dav_fs=no
+    fi
+  else
+    enable_dav_fs=no
   fi
   if test "$enable_dav_fs" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -31963,9 +33687,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_dav is disabled but required for mod_dav_fs\"" >&5
 $as_echo "$as_me: WARNING: \"mod_dav is disabled but required for mod_dav_fs\"" >&2;}
                             elif test "$enable_dav_fs" = "static" && test "$enable_dav" != "static" ; then
-                              enable_dav_fs=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_dav_fs statically if mod_dav is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_dav_fs statically if mod_dav is built shared\"" >&2;}
+                              enable_dav_fs=$enable_dav
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_dav_fs shared because mod_dav is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_dav_fs shared because mod_dav is built shared\"" >&2;}
                             else
             :
             fi
@@ -31990,7 +33714,6 @@ $as_echo "$enable_dav_fs$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_dav_fs=`echo $enable_dav_fs|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dav_fs"
@@ -32113,34 +33836,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_dav_lock" in
+      case "$enable_dav_lock" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_dav_lock" = "static"; then
-    enable_dav_lock=static
+  if test "$enable_dav_lock" = "static" -o "$enable_dav_lock" = "shared"; then
+    :
   elif test "$enable_dav_lock" = "yes"; then
     enable_dav_lock=$module_default
+  elif test "$enable_dav_lock" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_dav_lock=$module_default
+    else
+      enable_dav_lock=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_dav_lock" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_dav_lock=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_dav_lock=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_dav_lock" = "maybe-all"; then
+  elif test "$enable_dav_lock" = "all" -o "$enable_dav_lock" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_dav_lock=$module_default
@@ -32148,10 +33874,15 @@ fi
     else
       enable_dav_lock=no
     fi
-  elif test "$enable_dav_lock" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_dav_lock" != "no" ; then
+  elif test "$enable_dav_lock" = "reallyall" -o "$enable_dav_lock" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_dav_lock" != "no" ; then
       enable_dav_lock=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_dav_lock=no
+    fi
+  else
+    enable_dav_lock=no
   fi
   if test "$enable_dav_lock" != "no"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -32161,9 +33892,9 @@ $as_echo "checking dependencies" >&6; }
                               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_dav is disabled but required for mod_dav_lock\"" >&5
 $as_echo "$as_me: WARNING: \"mod_dav is disabled but required for mod_dav_lock\"" >&2;}
                             elif test "$enable_dav_lock" = "static" && test "$enable_dav" != "static" ; then
-                              enable_dav_lock=no
-                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_dav_lock statically if mod_dav is built shared\"" >&5
-$as_echo "$as_me: WARNING: \"cannot build mod_dav_lock statically if mod_dav is built shared\"" >&2;}
+                              enable_dav_lock=$enable_dav
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"building mod_dav_lock shared because mod_dav is built shared\"" >&5
+$as_echo "$as_me: WARNING: \"building mod_dav_lock shared because mod_dav is built shared\"" >&2;}
                             else
             :
             fi
@@ -32188,7 +33919,6 @@ $as_echo "$enable_dav_lock$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_dav_lock=`echo $enable_dav_lock|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dav_lock"
@@ -32367,34 +34097,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_vhost_alias" in
+      case "$enable_vhost_alias" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_vhost_alias" = "static"; then
-    enable_vhost_alias=static
+  if test "$enable_vhost_alias" = "static" -o "$enable_vhost_alias" = "shared"; then
+    :
   elif test "$enable_vhost_alias" = "yes"; then
     enable_vhost_alias=$module_default
+  elif test "$enable_vhost_alias" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_vhost_alias=$module_default
+    else
+      enable_vhost_alias=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_vhost_alias" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_vhost_alias=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_vhost_alias=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_vhost_alias" = "maybe-all"; then
+  elif test "$enable_vhost_alias" = "all" -o "$enable_vhost_alias" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_vhost_alias=$module_default
@@ -32402,10 +34135,15 @@ fi
     else
       enable_vhost_alias=no
     fi
-  elif test "$enable_vhost_alias" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_vhost_alias" != "no" ; then
+  elif test "$enable_vhost_alias" = "reallyall" -o "$enable_vhost_alias" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_vhost_alias" != "no" ; then
       enable_vhost_alias=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_vhost_alias=no
+    fi
+  else
+    enable_vhost_alias=no
   fi
   if test "$enable_vhost_alias" != "no"; then
             :
@@ -32421,7 +34159,6 @@ $as_echo "$enable_vhost_alias$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_vhost_alias=`echo $enable_vhost_alias|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES vhost_alias"
@@ -32501,34 +34238,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_negotiation" in
+      case "$enable_negotiation" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_negotiation" = "static"; then
-    enable_negotiation=static
+  if test "$enable_negotiation" = "static" -o "$enable_negotiation" = "shared"; then
+    :
   elif test "$enable_negotiation" = "yes"; then
     enable_negotiation=$module_default
+  elif test "$enable_negotiation" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_negotiation=$module_default
+    else
+      enable_negotiation=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_negotiation" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_negotiation=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_negotiation=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_negotiation" = "maybe-all"; then
+  elif test "$enable_negotiation" = "all" -o "$enable_negotiation" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_negotiation=$module_default
@@ -32536,10 +34276,15 @@ fi
     else
       enable_negotiation=no
     fi
-  elif test "$enable_negotiation" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_negotiation" != "no" ; then
+  elif test "$enable_negotiation" = "reallyall" -o "$enable_negotiation" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_negotiation" != "no" ; then
       enable_negotiation=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_negotiation=no
+    fi
+  else
+    enable_negotiation=no
   fi
   if test "$enable_negotiation" != "no"; then
             :
@@ -32555,7 +34300,6 @@ $as_echo "$enable_negotiation$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_negotiation=`echo $enable_negotiation|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES negotiation"
@@ -32635,34 +34379,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_dir" in
+      case "$enable_dir" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_dir" = "static"; then
-    enable_dir=static
+  if test "$enable_dir" = "static" -o "$enable_dir" = "shared"; then
+    :
   elif test "$enable_dir" = "yes"; then
     enable_dir=$module_default
+  elif test "$enable_dir" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_dir=$module_default
+    else
+      enable_dir=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_dir" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_dir=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_dir=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_dir" = "maybe-all"; then
+  elif test "$enable_dir" = "all" -o "$enable_dir" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_dir=$module_default
@@ -32670,10 +34417,15 @@ fi
     else
       enable_dir=no
     fi
-  elif test "$enable_dir" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_dir" != "no" ; then
+  elif test "$enable_dir" = "reallyall" -o "$enable_dir" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_dir" != "no" ; then
       enable_dir=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_dir=no
+    fi
+  else
+    enable_dir=no
   fi
   if test "$enable_dir" != "no"; then
             :
@@ -32689,7 +34441,6 @@ $as_echo "$enable_dir$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_dir=`echo $enable_dir|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dir"
@@ -32769,34 +34520,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_imagemap" in
+      case "$enable_imagemap" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_imagemap" = "static"; then
-    enable_imagemap=static
+  if test "$enable_imagemap" = "static" -o "$enable_imagemap" = "shared"; then
+    :
   elif test "$enable_imagemap" = "yes"; then
     enable_imagemap=$module_default
+  elif test "$enable_imagemap" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_imagemap=$module_default
+    else
+      enable_imagemap=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_imagemap" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_imagemap=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_imagemap=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_imagemap" = "maybe-all"; then
+  elif test "$enable_imagemap" = "all" -o "$enable_imagemap" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_imagemap=$module_default
@@ -32804,10 +34558,15 @@ fi
     else
       enable_imagemap=no
     fi
-  elif test "$enable_imagemap" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_imagemap" != "no" ; then
+  elif test "$enable_imagemap" = "reallyall" -o "$enable_imagemap" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_imagemap" != "no" ; then
       enable_imagemap=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_imagemap=no
+    fi
+  else
+    enable_imagemap=no
   fi
   if test "$enable_imagemap" != "no"; then
             :
@@ -32823,7 +34582,6 @@ $as_echo "$enable_imagemap$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_imagemap=`echo $enable_imagemap|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES imagemap"
@@ -32903,34 +34661,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_actions" in
+      case "$enable_actions" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_actions" = "static"; then
-    enable_actions=static
+  if test "$enable_actions" = "static" -o "$enable_actions" = "shared"; then
+    :
   elif test "$enable_actions" = "yes"; then
     enable_actions=$module_default
+  elif test "$enable_actions" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_actions=$module_default
+    else
+      enable_actions=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_actions" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_actions=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_actions=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_actions" = "maybe-all"; then
+  elif test "$enable_actions" = "all" -o "$enable_actions" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_actions=$module_default
@@ -32938,10 +34699,15 @@ fi
     else
       enable_actions=no
     fi
-  elif test "$enable_actions" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_actions" != "no" ; then
+  elif test "$enable_actions" = "reallyall" -o "$enable_actions" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_actions" != "no" ; then
       enable_actions=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_actions=no
+    fi
+  else
+    enable_actions=no
   fi
   if test "$enable_actions" != "no"; then
             :
@@ -32957,7 +34723,6 @@ $as_echo "$enable_actions$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_actions=`echo $enable_actions|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES actions"
@@ -33037,34 +34802,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_speling" in
+      case "$enable_speling" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_speling" = "static"; then
-    enable_speling=static
+  if test "$enable_speling" = "static" -o "$enable_speling" = "shared"; then
+    :
   elif test "$enable_speling" = "yes"; then
     enable_speling=$module_default
+  elif test "$enable_speling" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_speling=$module_default
+    else
+      enable_speling=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_speling" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_speling=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_speling=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_speling" = "maybe-all"; then
+  elif test "$enable_speling" = "all" -o "$enable_speling" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_speling=$module_default
@@ -33072,10 +34840,15 @@ fi
     else
       enable_speling=no
     fi
-  elif test "$enable_speling" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_speling" != "no" ; then
+  elif test "$enable_speling" = "reallyall" -o "$enable_speling" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_speling" != "no" ; then
       enable_speling=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_speling=no
+    fi
+  else
+    enable_speling=no
   fi
   if test "$enable_speling" != "no"; then
             :
@@ -33091,7 +34864,6 @@ $as_echo "$enable_speling$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_speling=`echo $enable_speling|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES speling"
@@ -33171,34 +34943,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_userdir" in
+      case "$enable_userdir" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_userdir" = "static"; then
-    enable_userdir=static
+  if test "$enable_userdir" = "static" -o "$enable_userdir" = "shared"; then
+    :
   elif test "$enable_userdir" = "yes"; then
     enable_userdir=$module_default
+  elif test "$enable_userdir" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_userdir=$module_default
+    else
+      enable_userdir=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_userdir" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_userdir=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_userdir=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_userdir" = "maybe-all"; then
+  elif test "$enable_userdir" = "all" -o "$enable_userdir" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_userdir=$module_default
@@ -33206,10 +34981,15 @@ fi
     else
       enable_userdir=no
     fi
-  elif test "$enable_userdir" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_userdir" != "no" ; then
+  elif test "$enable_userdir" = "reallyall" -o "$enable_userdir" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_userdir" != "no" ; then
       enable_userdir=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_userdir=no
+    fi
+  else
+    enable_userdir=no
   fi
   if test "$enable_userdir" != "no"; then
             :
@@ -33225,7 +35005,6 @@ $as_echo "$enable_userdir$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_userdir=`echo $enable_userdir|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES userdir"
@@ -33305,34 +35084,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_alias" in
+      case "$enable_alias" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_alias" = "static"; then
-    enable_alias=static
+  if test "$enable_alias" = "static" -o "$enable_alias" = "shared"; then
+    :
   elif test "$enable_alias" = "yes"; then
     enable_alias=$module_default
+  elif test "$enable_alias" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_alias=$module_default
+    else
+      enable_alias=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_alias" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_alias=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_alias=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_alias" = "maybe-all"; then
+  elif test "$enable_alias" = "all" -o "$enable_alias" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_alias=$module_default
@@ -33340,10 +35122,15 @@ fi
     else
       enable_alias=no
     fi
-  elif test "$enable_alias" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_alias" != "no" ; then
+  elif test "$enable_alias" = "reallyall" -o "$enable_alias" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_alias" != "no" ; then
       enable_alias=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_alias=no
+    fi
+  else
+    enable_alias=no
   fi
   if test "$enable_alias" != "no"; then
             :
@@ -33359,7 +35146,6 @@ $as_echo "$enable_alias$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_alias=`echo $enable_alias|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES alias"
@@ -33439,34 +35225,37 @@ else
 fi
 
     _apmod_extra_msg=""
-        case "$enable_rewrite" in
+      case "$enable_rewrite" in
     yes|static|shared)
       _apmod_required="yes"
       ;;
     *)
-      case "$module_selection" in
-      reallyall|all|most)
-        _apmod_required="no"
-        ;;
-      *)
-        _apmod_required="yes"
-        ;;
-      esac
+      _apmod_required="no"
+      ;;
   esac
-  if test "$enable_rewrite" = "static"; then
-    enable_rewrite=static
+  if test "$enable_rewrite" = "static" -o "$enable_rewrite" = "shared"; then
+    :
   elif test "$enable_rewrite" = "yes"; then
     enable_rewrite=$module_default
+  elif test "$enable_rewrite" = "few"; then
+    if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+            "$module_selection" = "all" -o "$module_selection" = "reallyall"
+    then
+      enable_rewrite=$module_default
+    else
+      enable_rewrite=no
+    fi
+    _apmod_extra_msg=" ($module_selection)"
   elif test "$enable_rewrite" = "most"; then
     if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
             "$module_selection" = "reallyall"
     then
       enable_rewrite=$module_default
-    elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+    else
       enable_rewrite=no
     fi
     _apmod_extra_msg=" ($module_selection)"
-  elif test "$enable_rewrite" = "maybe-all"; then
+  elif test "$enable_rewrite" = "all" -o "$enable_rewrite" = "maybe-all"; then
     if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
     then
       enable_rewrite=$module_default
@@ -33474,10 +35263,15 @@ fi
     else
       enable_rewrite=no
     fi
-  elif test "$enable_rewrite" = "no" -a "$module_selection" = "reallyall" -a \
-            "$force_rewrite" != "no" ; then
+  elif test "$enable_rewrite" = "reallyall" -o "$enable_rewrite" = "no" ; then
+    if test "$module_selection" = "reallyall" -a "$force_rewrite" != "no" ; then
       enable_rewrite=$module_default
       _apmod_extra_msg=" ($module_selection)"
+    else
+      enable_rewrite=no
+    fi
+  else
+    enable_rewrite=no
   fi
   if test "$enable_rewrite" != "no"; then
             :
@@ -33493,7 +35287,6 @@ $as_echo "$enable_rewrite$_apmod_extra_msg" >&6; }
       fi
       shared="";;
     *)
-      enable_rewrite=`echo $enable_rewrite|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES rewrite"