--- configure-old	2013-07-15 18:44:10.000000000 +0200
+++ configure-old	2013-10-27 12:22:24.000000000 +0100
@@ -8707,7 +8707,14 @@ 
         module_default=shared
       else
         i=`echo $i | sed 's/-/_/g'`
-    	eval "enable_$i=shared"
+
+    	loadmod="enable_$i"
+        if test "${!loadmod+set}" = set; then :
+    	  eval "enable_$i=shared,${!loadmod}"
+        else
+    	  eval "enable_$i=shared"
+        fi
+
       fi
     done
 
@@ -8945,11 +8952,11 @@ 
       fi
       shared="";;
     *)
-      enable_authn_dbm=`echo $enable_authn_dbm|sed 's/shared,*//'`
+      enable_authn_dbm=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_dbm"
-      if test "most" = "yes" ; then
+      if test "$enable_authn_dbm" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_dbm"
       fi
       ;;
@@ -9079,11 +9086,11 @@ 
       fi
       shared="";;
     *)
-      enable_authn_anon=`echo $enable_authn_anon|sed 's/shared,*//'`
+      enable_authn_anon=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_anon"
-      if test "most" = "yes" ; then
+      if test "$enable_authn_anon" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_anon"
       fi
       ;;
@@ -9213,11 +9220,11 @@ 
       fi
       shared="";;
     *)
-      enable_authn_dbd=`echo $enable_authn_dbd|sed 's/shared,*//'`
+      enable_authn_dbd=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_dbd"
-      if test "most" = "yes" ; then
+      if test "$enable_authn_dbd" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_dbd"
       fi
       ;;
@@ -9347,11 +9354,11 @@ 
       fi
       shared="";;
     *)
-      enable_authn_socache=`echo $enable_authn_socache|sed 's/shared,*//'`
+      enable_authn_socache=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authn_socache"
-      if test "most" = "yes" ; then
+      if test "$enable_authn_socache" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_socache"
       fi
       ;;
@@ -10019,11 +10026,11 @@ 
       fi
       shared="";;
     *)
-      enable_authz_dbm=`echo $enable_authz_dbm|sed 's/shared,*//'`
+      enable_authz_dbm=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_dbm"
-      if test "most" = "yes" ; then
+      if test "$enable_authz_dbm" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_dbm"
       fi
       ;;
@@ -10153,11 +10160,11 @@ 
       fi
       shared="";;
     *)
-      enable_authz_owner=`echo $enable_authz_owner|sed 's/shared,*//'`
+      enable_authz_owner=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_owner"
-      if test "most" = "yes" ; then
+      if test "$enable_authz_owner" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_owner"
       fi
       ;;
@@ -10287,11 +10294,11 @@ 
       fi
       shared="";;
     *)
-      enable_authz_dbd=`echo $enable_authz_dbd|sed 's/shared,*//'`
+      enable_authz_dbd=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authz_dbd"
-      if test "most" = "yes" ; then
+      if test "$enable_authz_dbd" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_dbd"
       fi
       ;;
@@ -10636,11 +10643,11 @@ 
       fi
       shared="";;
     *)
-      enable_authnz_ldap=`echo $enable_authnz_ldap|sed 's/shared,*//'`
+      enable_authnz_ldap=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES authnz_ldap"
-      if test "most" = "yes" ; then
+      if test "$enable_authnz_ldap" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authnz_ldap"
       fi
       ;;
@@ -11041,11 +11048,11 @@ 
       fi
       shared="";;
     *)
-      enable_auth_form=`echo $enable_auth_form|sed 's/shared,*//'`
+      enable_auth_form=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES auth_form"
-      if test "most" = "yes" ; then
+      if test "$enable_auth_form" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},auth_form"
       fi
       ;;
@@ -11216,11 +11223,11 @@ 
       fi
       shared="";;
     *)
-      enable_auth_digest=`echo $enable_auth_digest|sed 's/shared,*//'`
+      enable_auth_digest=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES auth_digest"
-      if test "most" = "yes" ; then
+      if test "$enable_auth_digest" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},auth_digest"
       fi
       ;;
@@ -11351,11 +11358,11 @@ 
       fi
       shared="";;
     *)
-      enable_allowmethods=`echo $enable_allowmethods|sed 's/shared,*//'`
+      enable_allowmethods=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES allowmethods"
-      if test "most" = "yes" ; then
+      if test "$enable_allowmethods" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},allowmethods"
       fi
       ;;
@@ -11709,11 +11716,11 @@ 
       fi
       shared="";;
     *)
-      enable_file_cache=`echo $enable_file_cache|sed 's/shared,*//'`
+      enable_file_cache=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES file_cache"
-      if test "most" = "yes" ; then
+      if test "$enable_file_cache" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},file_cache"
       fi
       ;;
@@ -11857,11 +11864,11 @@ 
       fi
       shared="";;
     *)
-      enable_cache=`echo $enable_cache|sed 's/shared,*//'`
+      enable_cache=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cache"
-      if test "most" = "yes" ; then
+      if test "$enable_cache" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cache"
       fi
       ;;
@@ -12012,11 +12019,11 @@ 
       fi
       shared="";;
     *)
-      enable_cache_disk=`echo $enable_cache_disk|sed 's/shared,*//'`
+      enable_cache_disk=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cache_disk"
-      if test "most" = "yes" ; then
+      if test "$enable_cache_disk" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cache_disk"
       fi
       ;;
@@ -12146,11 +12153,11 @@ 
       fi
       shared="";;
     *)
-      enable_cache_socache=`echo $enable_cache_socache|sed 's/shared,*//'`
+      enable_cache_socache=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cache_socache"
-      if test "most" = "yes" ; then
+      if test "$enable_cache_socache" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cache_socache"
       fi
       ;;
@@ -12283,11 +12290,11 @@ 
       fi
       shared="";;
     *)
-      enable_socache_shmcb=`echo $enable_socache_shmcb|sed 's/shared,*//'`
+      enable_socache_shmcb=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES socache_shmcb"
-      if test "most" = "yes" ; then
+      if test "$enable_socache_shmcb" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},socache_shmcb"
       fi
       ;;
@@ -12417,11 +12424,11 @@ 
       fi
       shared="";;
     *)
-      enable_socache_dbm=`echo $enable_socache_dbm|sed 's/shared,*//'`
+      enable_socache_dbm=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES socache_dbm"
-      if test "most" = "yes" ; then
+      if test "$enable_socache_dbm" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},socache_dbm"
       fi
       ;;
@@ -12551,11 +12558,11 @@ 
       fi
       shared="";;
     *)
-      enable_socache_memcache=`echo $enable_socache_memcache|sed 's/shared,*//'`
+      enable_socache_memcache=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES socache_memcache"
-      if test "most" = "yes" ; then
+      if test "$enable_socache_memcache" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},socache_memcache"
       fi
       ;;
@@ -13270,7 +13277,7 @@ 
       fi
       shared="";;
     *)
-      enable_so=`echo $enable_so|sed 's/shared,*//'`
+      enable_so=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES so"
@@ -13446,11 +13453,11 @@ 
       fi
       shared="";;
     *)
-      enable_watchdog=`echo $enable_watchdog|sed 's/shared,*//'`
+      enable_watchdog=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES watchdog"
-      if test "" = "yes" ; then
+      if test "$enable_watchdog" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},watchdog"
       fi
       ;;
@@ -13581,11 +13588,11 @@ 
       fi
       shared="";;
     *)
-      enable_macro=`echo $enable_macro|sed 's/shared,*//'`
+      enable_macro=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES macro"
-      if test "most" = "yes" ; then
+      if test "$enable_macro" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},macro"
       fi
       ;;
@@ -13770,11 +13777,11 @@ 
       fi
       shared="";;
     *)
-      enable_dbd=`echo $enable_dbd|sed 's/shared,*//'`
+      enable_dbd=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dbd"
-      if test "most" = "yes" ; then
+      if test "$enable_dbd" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dbd"
       fi
       ;;
@@ -14093,11 +14100,11 @@ 
       fi
       shared="";;
     *)
-      enable_dumpio=`echo $enable_dumpio|sed 's/shared,*//'`
+      enable_dumpio=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dumpio"
-      if test "most" = "yes" ; then
+      if test "$enable_dumpio" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dumpio"
       fi
       ;;
@@ -14261,11 +14268,11 @@ 
       fi
       shared="";;
     *)
-      enable_echo=`echo $enable_echo|sed 's/shared,*//'`
+      enable_echo=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES echo"
-      if test "" = "yes" ; then
+      if test "$enable_echo" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},echo"
       fi
       ;;
@@ -15030,11 +15037,11 @@ 
       fi
       shared="";;
     *)
-      enable_buffer=`echo $enable_buffer|sed 's/shared,*//'`
+      enable_buffer=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES buffer"
-      if test "most" = "yes" ; then
+      if test "$enable_buffer" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},buffer"
       fi
       ;;
@@ -15164,11 +15171,11 @@ 
       fi
       shared="";;
     *)
-      enable_data=`echo $enable_data|sed 's/shared,*//'`
+      enable_data=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES data"
-      if test "" = "yes" ; then
+      if test "$enable_data" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},data"
       fi
       ;;
@@ -15298,11 +15305,11 @@ 
       fi
       shared="";;
     *)
-      enable_ratelimit=`echo $enable_ratelimit|sed 's/shared,*//'`
+      enable_ratelimit=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ratelimit"
-      if test "most" = "yes" ; then
+      if test "$enable_ratelimit" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ratelimit"
       fi
       ;;
@@ -15566,11 +15573,11 @@ 
       fi
       shared="";;
     *)
-      enable_ext_filter=`echo $enable_ext_filter|sed 's/shared,*//'`
+      enable_ext_filter=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ext_filter"
-      if test "most" = "yes" ; then
+      if test "$enable_ext_filter" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ext_filter"
       fi
       ;;
@@ -15700,11 +15707,11 @@ 
       fi
       shared="";;
     *)
-      enable_request=`echo $enable_request|sed 's/shared,*//'`
+      enable_request=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES request"
-      if test "most" = "yes" ; then
+      if test "$enable_request" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},request"
       fi
       ;;
@@ -15834,11 +15841,11 @@ 
       fi
       shared="";;
     *)
-      enable_include=`echo $enable_include|sed 's/shared,*//'`
+      enable_include=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES include"
-      if test "most" = "yes" ; then
+      if test "$enable_include" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},include"
       fi
       ;;
@@ -16102,11 +16109,11 @@ 
       fi
       shared="";;
     *)
-      enable_reflector=`echo $enable_reflector|sed 's/shared,*//'`
+      enable_reflector=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES reflector"
-      if test "" = "yes" ; then
+      if test "$enable_reflector" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},reflector"
       fi
       ;;
@@ -16236,11 +16243,11 @@ 
       fi
       shared="";;
     *)
-      enable_substitute=`echo $enable_substitute|sed 's/shared,*//'`
+      enable_substitute=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES substitute"
-      if test "most" = "yes" ; then
+      if test "$enable_substitute" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},substitute"
       fi
       ;;
@@ -16411,11 +16418,11 @@ 
       fi
       shared="";;
     *)
-      enable_sed=`echo $enable_sed|sed 's/shared,*//'`
+      enable_sed=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES sed"
-      if test "most" = "yes" ; then
+      if test "$enable_sed" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},sed"
       fi
       ;;
@@ -16684,11 +16691,11 @@ 
       fi
       shared="";;
     *)
-      enable_charset_lite=`echo $enable_charset_lite|sed 's/shared,*//'`
+      enable_charset_lite=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES charset_lite"
-      if test "" = "yes" ; then
+      if test "$enable_charset_lite" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},charset_lite"
       fi
       ;;
@@ -17104,11 +17111,11 @@ 
       fi
       shared="";;
     *)
-      enable_deflate=`echo $enable_deflate|sed 's/shared,*//'`
+      enable_deflate=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES deflate"
-      if test "most" = "yes" ; then
+      if test "$enable_deflate" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},deflate"
       fi
       ;;
@@ -17337,11 +17344,11 @@ 
       fi
       shared="";;
     *)
-      enable_xml2enc=`echo $enable_xml2enc|sed 's/shared,*//'`
+      enable_xml2enc=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES xml2enc"
-      if test "" = "yes" ; then
+      if test "$enable_xml2enc" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},xml2enc"
       fi
       ;;
@@ -17568,11 +17575,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_html=`echo $enable_proxy_html|sed 's/shared,*//'`
+      enable_proxy_html=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_html"
-      if test "" = "yes" ; then
+      if test "$enable_proxy_html" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_html"
       fi
       ;;
@@ -18147,11 +18154,11 @@ 
       fi
       shared="";;
     *)
-      enable_ldap=`echo $enable_ldap|sed 's/shared,*//'`
+      enable_ldap=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ldap"
-      if test "most " = "yes" ; then
+      if test "$enable_ldap" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ldap"
       fi
       ;;
@@ -18471,11 +18478,11 @@ 
       fi
       shared="";;
     *)
-      enable_log_debug=`echo $enable_log_debug|sed 's/shared,*//'`
+      enable_log_debug=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES log_debug"
-      if test "most" = "yes" ; then
+      if test "$enable_log_debug" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_debug"
       fi
       ;;
@@ -18605,11 +18612,11 @@ 
       fi
       shared="";;
     *)
-      enable_log_forensic=`echo $enable_log_forensic|sed 's/shared,*//'`
+      enable_log_forensic=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES log_forensic"
-      if test "" = "yes" ; then
+      if test "$enable_log_forensic" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_forensic"
       fi
       ;;
@@ -18765,11 +18772,11 @@ 
       fi
       shared="";;
     *)
-      enable_logio=`echo $enable_logio|sed 's/shared,*//'`
+      enable_logio=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES logio"
-      if test "most" = "yes" ; then
+      if test "$enable_logio" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},logio"
       fi
       ;;
@@ -19559,11 +19566,11 @@ 
       fi
       shared="";;
     *)
-      enable_lua=`echo $enable_lua|sed 's/shared,*//'`
+      enable_lua=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lua"
-      if test "" = "yes" ; then
+      if test "$enable_lua" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lua"
       fi
       ;;
@@ -20151,11 +20158,11 @@ 
       fi
       shared="";;
     *)
-      enable_expires=`echo $enable_expires|sed 's/shared,*//'`
+      enable_expires=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES expires"
-      if test "most" = "yes" ; then
+      if test "$enable_expires" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},expires"
       fi
       ;;
@@ -20591,11 +20598,11 @@ 
       fi
       shared="";;
     *)
-      enable_usertrack=`echo $enable_usertrack|sed 's/shared,*//'`
+      enable_usertrack=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES usertrack"
-      if test "" = "yes" ; then
+      if test "$enable_usertrack" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},usertrack"
       fi
       ;;
@@ -20726,11 +20733,11 @@ 
       fi
       shared="";;
     *)
-      enable_unique_id=`echo $enable_unique_id|sed 's/shared,*//'`
+      enable_unique_id=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES unique_id"
-      if test "most" = "yes" ; then
+      if test "$enable_unique_id" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},unique_id"
       fi
       ;;
@@ -21128,11 +21135,11 @@ 
       fi
       shared="";;
     *)
-      enable_remoteip=`echo $enable_remoteip|sed 's/shared,*//'`
+      enable_remoteip=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES remoteip"
-      if test "most" = "yes" ; then
+      if test "$enable_remoteip" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},remoteip"
       fi
       ;;
@@ -21234,10 +21241,13 @@ 
   proxy_mods_enable=shared
 elif test "$enable_proxy" = "yes"; then
   proxy_mods_enable=yes
+elif test "$enable_proxy" = "shared,yes"; then
+  proxy_mods_enable='shared,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
@@ -21304,11 +21314,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy=`echo $enable_proxy|sed 's/shared,*//'`
+      enable_proxy=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy"
       fi
       ;;
@@ -21405,9 +21415,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_connect... " >&6; }
     # Check whether --enable-proxy-connect was given.
 if test "${enable_proxy_connect+set}" = set; then :
-  enableval=$enable_proxy_connect; force_proxy_connect=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_connect; force_proxy_connect=$enableval
+  else
+    enableval=`echo $enable_proxy_connect|sed 's/yes//'`; force_proxy_connect=$enableval
+  fi
 else
-  enable_proxy_connect=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -21486,11 +21501,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_connect=`echo $enable_proxy_connect|sed 's/shared,*//'`
+      enable_proxy_connect=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_connect"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_connect" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_connect"
       fi
       ;;
@@ -21560,9 +21575,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; }
     # Check whether --enable-proxy-ftp was given.
 if test "${enable_proxy_ftp+set}" = set; then :
-  enableval=$enable_proxy_ftp; force_proxy_ftp=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_ftp; force_proxy_ftp=$enableval
+  else
+    enableval=`echo $enable_proxy_ftp|sed 's/yes//'`; force_proxy_ftp=$enableval
+  fi
 else
-  enable_proxy_ftp=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -21641,11 +21661,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_ftp=`echo $enable_proxy_ftp|sed 's/shared,*//'`
+      enable_proxy_ftp=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_ftp"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_ftp" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ftp"
       fi
       ;;
@@ -21715,9 +21735,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_http... " >&6; }
     # Check whether --enable-proxy-http was given.
 if test "${enable_proxy_http+set}" = set; then :
-  enableval=$enable_proxy_http; force_proxy_http=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_http; force_proxy_http=$enableval
+  else
+    enableval=`echo $enable_proxy_http|sed 's/yes//'`; force_proxy_http=$enableval
+  fi
 else
-  enable_proxy_http=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -21796,11 +21821,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_http=`echo $enable_proxy_http|sed 's/shared,*//'`
+      enable_proxy_http=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_http"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_http" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_http"
       fi
       ;;
@@ -21870,9 +21895,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_fcgi... " >&6; }
     # Check whether --enable-proxy-fcgi was given.
 if test "${enable_proxy_fcgi+set}" = set; then :
-  enableval=$enable_proxy_fcgi; force_proxy_fcgi=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_fcgi; force_proxy_fcgi=$enableval
+  else
+    enableval=`echo $enable_proxy_fcgi|sed 's/yes//'`; force_proxy_fcgi=$enableval
+  fi
 else
-  enable_proxy_fcgi=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -21951,11 +21981,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_fcgi=`echo $enable_proxy_fcgi|sed 's/shared,*//'`
+      enable_proxy_fcgi=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_fcgi"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_fcgi" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fcgi"
       fi
       ;;
@@ -22025,9 +22055,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; }
     # Check whether --enable-proxy-scgi was given.
 if test "${enable_proxy_scgi+set}" = set; then :
-  enableval=$enable_proxy_scgi; force_proxy_scgi=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_scgi; force_proxy_scgi=$enableval
+  else
+    enableval=`echo $enable_proxy_scgi|sed 's/yes//'`; force_proxy_scgi=$enableval
+  fi
 else
-  enable_proxy_scgi=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -22106,11 +22141,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_scgi=`echo $enable_proxy_scgi|sed 's/shared,*//'`
+      enable_proxy_scgi=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_scgi"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_scgi" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_scgi"
       fi
       ;;
@@ -22180,8 +22215,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_fdpass... " >&6; }
     # Check whether --enable-proxy-fdpass was given.
 if test "${enable_proxy_fdpass+set}" = set; then :
-  enableval=$enable_proxy_fdpass; force_proxy_fdpass=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_fdpass; force_proxy_fdpass=$enableval
+  else
+    enableval=`echo $enable_proxy_fdpass|sed 's/yes//'`; force_proxy_fdpass=$enableval
+  fi
 else
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
   enable_proxy_fdpass=maybe-all
 fi
 
@@ -22276,11 +22317,12 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_fdpass=`echo $enable_proxy_fdpass|sed 's/shared,*//'`
+      enable_proxy_fdpass=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_fdpass"
-      if test "" = "yes" ; then
+      if test "$enable_proxy_fdpass" = "yes" ; then
+      #if test "" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fdpass"
       fi
       ;;
@@ -22350,9 +22392,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_wstunnel... " >&6; }
     # Check whether --enable-proxy-wstunnel was given.
 if test "${enable_proxy_wstunnel+set}" = set; then :
-  enableval=$enable_proxy_wstunnel; force_proxy_wstunnel=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_wstunnel; force_proxy_wstunnel=$enableval
+  else
+    enableval=`echo $enable_proxy_wstunnel|sed 's/yes//'`; force_proxy_wstunnel=$enableval
+  fi
 else
-  enable_proxy_wstunnel=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -22431,11 +22478,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_wstunnel=`echo $enable_proxy_wstunnel|sed 's/shared,*//'`
+      enable_proxy_wstunnel=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_wstunnel"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_wstunnel" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_wstunnel"
       fi
       ;;
@@ -22505,9 +22552,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; }
     # Check whether --enable-proxy-ajp was given.
 if test "${enable_proxy_ajp+set}" = set; then :
-  enableval=$enable_proxy_ajp; force_proxy_ajp=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_ajp; force_proxy_ajp=$enableval
+  else
+    enableval=`echo $enable_proxy_ajp|sed 's/yes//'`; force_proxy_ajp=$enableval
+  fi
 else
-  enable_proxy_ajp=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -22586,11 +22638,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_ajp=`echo $enable_proxy_ajp|sed 's/shared,*//'`
+      enable_proxy_ajp=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_ajp"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_ajp" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ajp"
       fi
       ;;
@@ -22660,9 +22712,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; }
     # Check whether --enable-proxy-balancer was given.
 if test "${enable_proxy_balancer+set}" = set; then :
-  enableval=$enable_proxy_balancer; force_proxy_balancer=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_balancer; force_proxy_balancer=$enableval
+  else
+    enableval=`echo $enable_proxy_balancer|sed 's/yes//'`; force_proxy_balancer=$enableval
+  fi
 else
-  enable_proxy_balancer=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -22741,11 +22798,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_balancer=`echo $enable_proxy_balancer|sed 's/shared,*//'`
+      enable_proxy_balancer=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_balancer"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_balancer" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_balancer"
       fi
       ;;
@@ -22816,9 +22873,14 @@ 
 $as_echo_n "checking whether to enable mod_proxy_express... " >&6; }
     # Check whether --enable-proxy-express was given.
 if test "${enable_proxy_express+set}" = set; then :
-  enableval=$enable_proxy_express; force_proxy_express=$enableval
+  isenabled=`echo $proxy_mods_enable|sed 's/shared,*//'`
+  if test "$isenabled" = "yes" ; then
+    enableval=$enable_proxy_express; force_proxy_express=$enableval
+  else
+    enableval=`echo $enable_proxy_express|sed 's/yes//'`; force_proxy_express=$enableval
+  fi
 else
-  enable_proxy_express=$proxy_mods_enable
+  enableval=`echo $proxy_mods_enable|sed 's/yes//'`
 fi
 
     _apmod_extra_msg=""
@@ -22897,11 +22959,11 @@ 
       fi
       shared="";;
     *)
-      enable_proxy_express=`echo $enable_proxy_express|sed 's/shared,*//'`
+      enable_proxy_express=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES proxy_express"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_proxy_express" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_express"
       fi
       ;;
@@ -23109,11 +23171,11 @@ 
       fi
       shared="";;
     *)
-      enable_session=`echo $enable_session|sed 's/shared,*//'`
+      enable_session=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES session"
-      if test "most" = "yes" ; then
+      if test "$enable_session" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session"
       fi
       ;;
@@ -23810,11 +23872,11 @@ 
       fi
       shared="";;
     *)
-      enable_slotmem_shm=`echo $enable_slotmem_shm|sed 's/shared,*//'`
+      enable_slotmem_shm=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES slotmem_shm"
-      if test "most" = "yes" ; then
+      if test "$enable_slotmem_shm" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_shm"
       fi
       ;;
@@ -23944,11 +24006,11 @@ 
       fi
       shared="";;
     *)
-      enable_slotmem_plain=`echo $enable_slotmem_plain|sed 's/shared,*//'`
+      enable_slotmem_plain=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES slotmem_plain"
-      if test "" = "yes" ; then
+      if test "$enable_slotmem_plain" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_plain"
       fi
       ;;
@@ -24663,11 +24725,11 @@ 
       fi
       shared="";;
     *)
-      enable_ssl=`echo $enable_ssl|sed 's/shared,*//'`
+      enable_ssl=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES ssl"
-      if test "most" = "yes" ; then
+      if test "$enable_ssl" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ssl"
       fi
       ;;
@@ -25391,11 +25453,11 @@ 
       fi
       shared="";;
     *)
-      enable_dialup=`echo $enable_dialup|sed 's/shared,*//'`
+      enable_dialup=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dialup"
-      if test "" = "yes" ; then
+      if test "$enable_dialup" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dialup"
       fi
       ;;
@@ -26860,11 +26922,11 @@ 
       fi
       shared="";;
     *)
-      enable_lbmethod_byrequests=`echo $enable_lbmethod_byrequests|sed 's/shared,*//'`
+      enable_lbmethod_byrequests=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_byrequests"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_lbmethod_byrequests" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_byrequests"
       fi
       ;;
@@ -26994,11 +27056,11 @@ 
       fi
       shared="";;
     *)
-      enable_lbmethod_bytraffic=`echo $enable_lbmethod_bytraffic|sed 's/shared,*//'`
+      enable_lbmethod_bytraffic=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_bytraffic"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_lbmethod_bytraffic" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_bytraffic"
       fi
       ;;
@@ -27128,11 +27190,11 @@ 
       fi
       shared="";;
     *)
-      enable_lbmethod_bybusyness=`echo $enable_lbmethod_bybusyness|sed 's/shared,*//'`
+      enable_lbmethod_bybusyness=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_bybusyness"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_lbmethod_bybusyness" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_bybusyness"
       fi
       ;;
@@ -27262,11 +27324,11 @@ 
       fi
       shared="";;
     *)
-      enable_lbmethod_heartbeat=`echo $enable_lbmethod_heartbeat|sed 's/shared,*//'`
+      enable_lbmethod_heartbeat=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES lbmethod_heartbeat"
-      if test "$proxy_mods_enable" = "yes" ; then
+      if test "$enable_lbmethod_heartbeat" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_heartbeat"
       fi
       ;;
@@ -28270,11 +28332,11 @@ 
       fi
       shared="";;
     *)
-      enable_heartbeat=`echo $enable_heartbeat|sed 's/shared,*//'`
+      enable_heartbeat=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES heartbeat"
-      if test "" = "yes" ; then
+      if test "$enable_heartbeat" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},heartbeat"
       fi
       ;;
@@ -28404,11 +28466,11 @@ 
       fi
       shared="";;
     *)
-      enable_heartmonitor=`echo $enable_heartmonitor|sed 's/shared,*//'`
+      enable_heartmonitor=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES heartmonitor"
-      if test "" = "yes" ; then
+      if test "$enable_heartmonitor" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},heartmonitor"
       fi
       ;;
@@ -28579,11 +28641,11 @@ 
       fi
       shared="";;
     *)
-      enable_dav=`echo $enable_dav|sed 's/shared,*//'`
+      enable_dav=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dav"
-      if test "$dav_enable" = "yes" ; then
+      if test "$enable_dav" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dav"
       fi
       ;;
@@ -29041,11 +29103,11 @@ 
       fi
       shared="";;
     *)
-      enable_asis=`echo $enable_asis|sed 's/shared,*//'`
+      enable_asis=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES asis"
-      if test "" = "yes" ; then
+      if test "$enable_asis" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},asis"
       fi
       ;;
@@ -29175,11 +29237,11 @@ 
       fi
       shared="";;
     *)
-      enable_info=`echo $enable_info|sed 's/shared,*//'`
+      enable_info=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES info"
-      if test "most" = "yes" ; then
+      if test "$enable_info" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},info"
       fi
       ;;
@@ -29523,11 +29585,11 @@ 
       fi
       shared="";;
     *)
-      enable_cgid=`echo $enable_cgid|sed 's/shared,*//'`
+      enable_cgid=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cgid"
-      if test "most" = "yes" ; then
+      if test "$enable_cgid" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cgid"
       fi
       ;;
@@ -29792,11 +29854,11 @@ 
       fi
       shared="";;
     *)
-      enable_cgi=`echo $enable_cgi|sed 's/shared,*//'`
+      enable_cgi=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES cgi"
-      if test "most" = "yes" ; then
+      if test "$enable_cgi" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cgi"
       fi
       ;;
@@ -30246,11 +30308,11 @@ 
       fi
       shared="";;
     *)
-      enable_dav_fs=`echo $enable_dav_fs|sed 's/shared,*//'`
+      enable_dav_fs=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dav_fs"
-      if test "$dav_fs_enable" = "yes" ; then
+      if test "$enable_dav_fs" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dav_fs"
       fi
       ;;
@@ -30444,11 +30506,11 @@ 
       fi
       shared="";;
     *)
-      enable_dav_lock=`echo $enable_dav_lock|sed 's/shared,*//'`
+      enable_dav_lock=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES dav_lock"
-      if test "" = "yes" ; then
+      if test "$enable_dav_lock" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dav_lock"
       fi
       ;;
@@ -30677,11 +30739,11 @@ 
       fi
       shared="";;
     *)
-      enable_vhost_alias=`echo $enable_vhost_alias|sed 's/shared,*//'`
+      enable_vhost_alias=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES vhost_alias"
-      if test "most" = "yes" ; then
+      if test "$enable_vhost_alias" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},vhost_alias"
       fi
       ;;
@@ -30811,11 +30873,11 @@ 
       fi
       shared="";;
     *)
-      enable_negotiation=`echo $enable_negotiation|sed 's/shared,*//'`
+      enable_negotiation=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES negotiation"
-      if test "most" = "yes" ; then
+      if test "$enable_negotiation" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},negotiation"
       fi
       ;;
@@ -31213,11 +31275,11 @@ 
       fi
       shared="";;
     *)
-      enable_actions=`echo $enable_actions|sed 's/shared,*//'`
+      enable_actions=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES actions"
-      if test "most" = "yes" ; then
+      if test "$enable_actions" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},actions"
       fi
       ;;
@@ -31347,11 +31409,11 @@ 
       fi
       shared="";;
     *)
-      enable_speling=`echo $enable_speling|sed 's/shared,*//'`
+      enable_speling=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES speling"
-      if test "most" = "yes" ; then
+      if test "$enable_speling" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},speling"
       fi
       ;;
@@ -31481,11 +31543,11 @@ 
       fi
       shared="";;
     *)
-      enable_userdir=`echo $enable_userdir|sed 's/shared,*//'`
+      enable_userdir=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES userdir"
-      if test "most" = "yes" ; then
+      if test "$enable_userdir" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},userdir"
       fi
       ;;
@@ -31749,11 +31811,11 @@ 
       fi
       shared="";;
     *)
-      enable_rewrite=`echo $enable_rewrite|sed 's/shared,*//'`
+      enable_rewrite=`echo $enableval|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES rewrite"
-      if test "most" = "yes" ; then
+      if test "$enable_rewrite" = "yes" ; then
         ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},rewrite"
       fi
       ;;