From: Howard Chu <hyc@openldap.org>
Date: Thu, 25 Aug 2005 09:58:13 +0000 (+0000)
Subject: Regenerated with new OL_ARG_ENABLE
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~578^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fheads%2FOPENLDAP_AC;p=openldap

Regenerated with new OL_ARG_ENABLE
---

diff --git a/configure b/configure
index 787f44ceb6..465d54e0c7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.586.2.19 2005/08/13 03:48:06 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.586.2.21 2005/08/25 07:48:28 hyc Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -1030,54 +1030,66 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-debug 	  enable debugging yes
-  --enable-dynamic	  enable linking built binaries with dynamic libs no
-  --enable-syslog	  enable syslog support auto
-  --enable-proctitle	  enable proctitle support yes
-  --enable-ipv6 	  enable IPv6 support auto
-  --enable-local	  enable AF_LOCAL (AF_UNIX) socket support auto
-  --enable-slapd	  enable building slapd yes
-    --enable-aci	  enable per-object ACIs (experimental) no
-    --enable-cleartext	  enable cleartext passwords yes
-    --enable-crypt	  enable crypt(3) passwords no
-    --enable-lmpasswd	  enable LAN Manager passwords no
-    --enable-spasswd	  enable (Cyrus) SASL password verification no
-    --enable-modules	  enable dynamic module support no
-    --enable-rewrite	  enable DN rewriting in back-ldap and rwm overlay auto
-    --enable-rlookups	  enable reverse lookups of client hostnames no
-    --enable-slapi        enable SLAPI support (experimental) no
-    --enable-slp          enable SLPv2 support no
-    --enable-wrappers	  enable tcp wrapper support no
+  --enable-debug 	  enable debugging [yes]
+  --enable-dynamic	  enable linking built binaries with dynamic libs [no]
+  --enable-syslog	  enable syslog support [auto]
+  --enable-proctitle	  enable proctitle support [yes]
+  --enable-ipv6 	  enable IPv6 support [auto]
+  --enable-local	  enable AF_LOCAL (AF_UNIX) socket support [auto]
+
+SLAPD (Standalone LDAP Daemon) Options:
+  --enable-slapd	  enable building slapd [yes]
+    --enable-aci	  enable per-object ACIs (experimental) [no]
+    --enable-cleartext	  enable cleartext passwords [yes]
+    --enable-crypt	  enable crypt(3) passwords [no]
+    --enable-lmpasswd	  enable LAN Manager passwords [no]
+    --enable-spasswd	  enable (Cyrus) SASL password verification [no]
+    --enable-modules	  enable dynamic module support [no]
+    --enable-rewrite	  enable DN rewriting in back-ldap and rwm overlay [auto]
+    --enable-rlookups	  enable reverse lookups of client hostnames [no]
+    --enable-slapi        enable SLAPI support (experimental) [no]
+    --enable-slp          enable SLPv2 support [no]
+    --enable-wrappers	  enable tcp wrapper support [no]
+
+SLAPD Backend Options:
     --enable-backends	  enable all available backends no|yes|mod
-    --enable-bdb	  enable Berkeley DB backend no|yes|mod ${ol_dflt_backends-yes}
-    --enable-dnssrv	  enable dnssrv backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-hdb	  enable Hierarchical DB backend no|yes|mod ${ol_dflt_backends-yes}
-    --enable-ldap	  enable ldap backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-ldbm	  enable ldbm backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-meta	  enable metadirectory backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-monitor	  enable monitor backend no|yes|mod ${ol_dflt_backends-yes}
-    --enable-null	  enable null backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-passwd	  enable passwd backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-perl	  enable perl backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-relay  	  enable relay backend no|yes|mod ${ol_dflt_backends-yes}
-    --enable-shell	  enable shell backend no|yes|mod ${ol_dflt_backends-no}
-    --enable-sql	  enable sql backend no|yes|mod ${ol_dflt_backends-no}
+    --enable-bdb	  enable Berkeley DB backend no|yes|mod [yes]
+    --enable-dnssrv	  enable dnssrv backend no|yes|mod [no]
+    --enable-hdb	  enable Hierarchical DB backend no|yes|mod [yes]
+    --enable-ldap	  enable ldap backend no|yes|mod [no]
+    --enable-ldbm	  enable ldbm backend no|yes|mod [no]
+      --enable-ldbm-api   use LDBM API auto|berkeley|bcompat|mdbm|gdbm [auto]
+      --enable-ldbm-type  use LDBM type auto|btree|hash [auto]
+    --enable-meta	  enable metadirectory backend no|yes|mod [no]
+    --enable-monitor	  enable monitor backend no|yes|mod [yes]
+    --enable-null	  enable null backend no|yes|mod [no]
+    --enable-passwd	  enable passwd backend no|yes|mod [no]
+    --enable-perl	  enable perl backend no|yes|mod [no]
+    --enable-relay  	  enable relay backend no|yes|mod [yes]
+    --enable-shell	  enable shell backend no|yes|mod [no]
+    --enable-sql	  enable sql backend no|yes|mod [no]
+
+SLAPD Overlay Options:
     --enable-overlays	  enable all available overlays no|yes|mod
-    --enable-accesslog	  In-Directory Access Logging overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-denyop  	  Deny Operation overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-dyngroup	  Dynamic Group overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-dynlist	  Dynamic List overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-glue	  Backend Glue overlay no|yes|mod ${ol_dflt_overlays-yes}
-    --enable-lastmod	  Last Modification overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-ppolicy	  Password Policy overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-proxycache	  Proxy Cache overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-refint	  Referential Integrity overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-retcode	  Return Code testing overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-rwm       	  Rewrite/Remap overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-syncprov	  Syncrepl Provider overlay no|yes|mod ${ol_dflt_overlays-yes}
-    --enable-translucent  Translucent Proxy overlay no|yes|mod ${ol_dflt_overlays-no}
-    --enable-unique       Attribute Uniqueness overlay no|yes|mod ${ol_dflt_overlays-no}
-  --enable-slurpd	  enable building slurpd auto
+    --enable-accesslog	  In-Directory Access Logging overlay no|yes|mod [no]
+    --enable-denyop  	  Deny Operation overlay no|yes|mod [no]
+    --enable-dyngroup	  Dynamic Group overlay no|yes|mod [no]
+    --enable-dynlist	  Dynamic List overlay no|yes|mod [no]
+    --enable-glue	  Backend Glue overlay no|yes|mod [yes]
+    --enable-lastmod	  Last Modification overlay no|yes|mod [no]
+    --enable-ppolicy	  Password Policy overlay no|yes|mod [no]
+    --enable-proxycache	  Proxy Cache overlay no|yes|mod [no]
+    --enable-refint	  Referential Integrity overlay no|yes|mod [no]
+    --enable-retcode	  Return Code testing overlay no|yes|mod [no]
+    --enable-rwm       	  Rewrite/Remap overlay no|yes|mod [no]
+    --enable-syncprov	  Syncrepl Provider overlay no|yes|mod [yes]
+    --enable-translucent  Translucent Proxy overlay no|yes|mod [no]
+    --enable-unique       Attribute Uniqueness overlay no|yes|mod [no]
+
+SLURPD (Replication Daemon) Options:
+  --enable-slurpd	  enable building slurpd [auto]
+
+Library Generation & Linking Options
   --enable-static[=PKGS]
                           build static libraries [default=yes]
   --enable-shared[=PKGS]
@@ -1092,26 +1104,14 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-subdir=DIR       change default subdirectory used for installs
-  --with-cyrus-sasl	  with Cyrus SASL support auto
-  --with-fetch		  with fetch(3) URL support auto
-  --with-threads	  with threads auto
-  --with-tls		  with TLS/SSL support auto
-  --with-yielding-select  with implicitly yielding select auto
+  --with-cyrus-sasl	  with Cyrus SASL support [auto]
+  --with-fetch		  with fetch(3) URL support [auto]
+  --with-threads	  with threads [auto]
+  --with-tls		  with TLS/SSL support [auto]
+  --with-yielding-select  with implicitly yielding select [auto]
   --with-multiple-precision
                           multiple precision support for statistics
-			  auto|bignum|gmp auto
-
-SLAPD (Standalone LDAP Daemon) Options:
-
-SLAPD Backend Options:
-      --with-ldbm-api     with LDBM API auto|berkeley|bcompat|mdbm|gdbm auto
-      --with-ldbm-type	  use LDBM type auto|btree|hash auto
-
-SLAPD Overlay Options:
-
-SLURPD (Replication Daemon) Options:
-
-Library Generation & Linking Options
+			  auto|bignum|gmp [auto]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
@@ -2197,6 +2197,7 @@ esac
 fi;
 
 # OpenLDAP --enable-debug
+
 	# Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -2215,9 +2216,11 @@ echo "$as_me: error: bad value $enableval for --enable-debug" >&2;}
 	ol_enable_debug="$ol_arg"
 
 else
-  	ol_enable_debug="yes"
-fi; # end --enable-debug
+  	ol_enable_debug=yes
+fi;
+# end --enable-debug
 # OpenLDAP --enable-dynamic
+
 	# Check whether --enable-dynamic or --disable-dynamic was given.
 if test "${enable_dynamic+set}" = set; then
   enableval="$enable_dynamic"
@@ -2236,9 +2239,11 @@ echo "$as_me: error: bad value $enableval for --enable-dynamic" >&2;}
 	ol_enable_dynamic="$ol_arg"
 
 else
-  	ol_enable_dynamic="no"
-fi; # end --enable-dynamic
+  	ol_enable_dynamic=no
+fi;
+# end --enable-dynamic
 # OpenLDAP --enable-syslog
+
 	# Check whether --enable-syslog or --disable-syslog was given.
 if test "${enable_syslog+set}" = set; then
   enableval="$enable_syslog"
@@ -2257,9 +2262,11 @@ echo "$as_me: error: bad value $enableval for --enable-syslog" >&2;}
 	ol_enable_syslog="$ol_arg"
 
 else
-  	ol_enable_syslog="auto"
-fi; # end --enable-syslog
+  	ol_enable_syslog=auto
+fi;
+# end --enable-syslog
 # OpenLDAP --enable-proctitle
+
 	# Check whether --enable-proctitle or --disable-proctitle was given.
 if test "${enable_proctitle+set}" = set; then
   enableval="$enable_proctitle"
@@ -2278,11 +2285,13 @@ echo "$as_me: error: bad value $enableval for --enable-proctitle" >&2;}
 	ol_enable_proctitle="$ol_arg"
 
 else
-  	ol_enable_proctitle="yes"
-fi; # end --enable-proctitle
+  	ol_enable_proctitle=yes
+fi;
+# end --enable-proctitle
 ol_enable_referrals=${ol_enable_referrals-no}
 ol_enable_kbind=${ol_enable_kbind-no}
 # OpenLDAP --enable-ipv6
+
 	# Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
   enableval="$enable_ipv6"
@@ -2301,9 +2310,11 @@ echo "$as_me: error: bad value $enableval for --enable-ipv6" >&2;}
 	ol_enable_ipv6="$ol_arg"
 
 else
-  	ol_enable_ipv6="auto"
-fi; # end --enable-ipv6
+  	ol_enable_ipv6=auto
+fi;
+# end --enable-ipv6
 # OpenLDAP --enable-local
+
 	# Check whether --enable-local or --disable-local was given.
 if test "${enable_local+set}" = set; then
   enableval="$enable_local"
@@ -2322,8 +2333,9 @@ echo "$as_me: error: bad value $enableval for --enable-local" >&2;}
 	ol_enable_local="$ol_arg"
 
 else
-  	ol_enable_local="auto"
-fi; # end --enable-local
+  	ol_enable_local=auto
+fi;
+# end --enable-local
 
 # OpenLDAP --with-cyrus_sasl
 
@@ -2466,13 +2478,13 @@ fi; # end --with-multiple_precision
 
 
 
-
-# Check whether --with-xxslapdoptions or --without-xxslapdoptions was given.
-if test "${with_xxslapdoptions+set}" = set; then
-  withval="$with_xxslapdoptions"
+# Check whether --enable-xxslapdoptions or --disable-xxslapdoptions was given.
+if test "${enable_xxslapdoptions+set}" = set; then
+  enableval="$enable_xxslapdoptions"
 
 fi;
 # OpenLDAP --enable-slapd
+
 	# Check whether --enable-slapd or --disable-slapd was given.
 if test "${enable_slapd+set}" = set; then
   enableval="$enable_slapd"
@@ -2491,9 +2503,11 @@ echo "$as_me: error: bad value $enableval for --enable-slapd" >&2;}
 	ol_enable_slapd="$ol_arg"
 
 else
-  	ol_enable_slapd="yes"
-fi; # end --enable-slapd
+  	ol_enable_slapd=yes
+fi;
+# end --enable-slapd
 # OpenLDAP --enable-aci
+
 	# Check whether --enable-aci or --disable-aci was given.
 if test "${enable_aci+set}" = set; then
   enableval="$enable_aci"
@@ -2512,9 +2526,11 @@ echo "$as_me: error: bad value $enableval for --enable-aci" >&2;}
 	ol_enable_aci="$ol_arg"
 
 else
-  	ol_enable_aci="no"
-fi; # end --enable-aci
+  	ol_enable_aci=no
+fi;
+# end --enable-aci
 # OpenLDAP --enable-cleartext
+
 	# Check whether --enable-cleartext or --disable-cleartext was given.
 if test "${enable_cleartext+set}" = set; then
   enableval="$enable_cleartext"
@@ -2533,9 +2549,11 @@ echo "$as_me: error: bad value $enableval for --enable-cleartext" >&2;}
 	ol_enable_cleartext="$ol_arg"
 
 else
-  	ol_enable_cleartext="yes"
-fi; # end --enable-cleartext
+  	ol_enable_cleartext=yes
+fi;
+# end --enable-cleartext
 # OpenLDAP --enable-crypt
+
 	# Check whether --enable-crypt or --disable-crypt was given.
 if test "${enable_crypt+set}" = set; then
   enableval="$enable_crypt"
@@ -2554,9 +2572,11 @@ echo "$as_me: error: bad value $enableval for --enable-crypt" >&2;}
 	ol_enable_crypt="$ol_arg"
 
 else
-  	ol_enable_crypt="no"
-fi; # end --enable-crypt
+  	ol_enable_crypt=no
+fi;
+# end --enable-crypt
 # OpenLDAP --enable-lmpasswd
+
 	# Check whether --enable-lmpasswd or --disable-lmpasswd was given.
 if test "${enable_lmpasswd+set}" = set; then
   enableval="$enable_lmpasswd"
@@ -2575,9 +2595,11 @@ echo "$as_me: error: bad value $enableval for --enable-lmpasswd" >&2;}
 	ol_enable_lmpasswd="$ol_arg"
 
 else
-  	ol_enable_lmpasswd="no"
-fi; # end --enable-lmpasswd
+  	ol_enable_lmpasswd=no
+fi;
+# end --enable-lmpasswd
 # OpenLDAP --enable-spasswd
+
 	# Check whether --enable-spasswd or --disable-spasswd was given.
 if test "${enable_spasswd+set}" = set; then
   enableval="$enable_spasswd"
@@ -2596,9 +2618,11 @@ echo "$as_me: error: bad value $enableval for --enable-spasswd" >&2;}
 	ol_enable_spasswd="$ol_arg"
 
 else
-  	ol_enable_spasswd="no"
-fi; # end --enable-spasswd
+  	ol_enable_spasswd=no
+fi;
+# end --enable-spasswd
 # OpenLDAP --enable-modules
+
 	# Check whether --enable-modules or --disable-modules was given.
 if test "${enable_modules+set}" = set; then
   enableval="$enable_modules"
@@ -2617,10 +2641,12 @@ echo "$as_me: error: bad value $enableval for --enable-modules" >&2;}
 	ol_enable_modules="$ol_arg"
 
 else
-  	ol_enable_modules="no"
-fi; # end --enable-modules
+  	ol_enable_modules=no
+fi;
+# end --enable-modules
 ol_enable_multimaster=${ol_enable_multimaster-no}
 # OpenLDAP --enable-rewrite
+
 	# Check whether --enable-rewrite or --disable-rewrite was given.
 if test "${enable_rewrite+set}" = set; then
   enableval="$enable_rewrite"
@@ -2639,9 +2665,11 @@ echo "$as_me: error: bad value $enableval for --enable-rewrite" >&2;}
 	ol_enable_rewrite="$ol_arg"
 
 else
-  	ol_enable_rewrite="auto"
-fi; # end --enable-rewrite
+  	ol_enable_rewrite=auto
+fi;
+# end --enable-rewrite
 # OpenLDAP --enable-rlookups
+
 	# Check whether --enable-rlookups or --disable-rlookups was given.
 if test "${enable_rlookups+set}" = set; then
   enableval="$enable_rlookups"
@@ -2660,9 +2688,11 @@ echo "$as_me: error: bad value $enableval for --enable-rlookups" >&2;}
 	ol_enable_rlookups="$ol_arg"
 
 else
-  	ol_enable_rlookups="no"
-fi; # end --enable-rlookups
+  	ol_enable_rlookups=no
+fi;
+# end --enable-rlookups
 # OpenLDAP --enable-slapi
+
 	# Check whether --enable-slapi or --disable-slapi was given.
 if test "${enable_slapi+set}" = set; then
   enableval="$enable_slapi"
@@ -2681,9 +2711,11 @@ echo "$as_me: error: bad value $enableval for --enable-slapi" >&2;}
 	ol_enable_slapi="$ol_arg"
 
 else
-  	ol_enable_slapi="no"
-fi; # end --enable-slapi
+  	ol_enable_slapi=no
+fi;
+# end --enable-slapi
 # OpenLDAP --enable-slp
+
 	# Check whether --enable-slp or --disable-slp was given.
 if test "${enable_slp+set}" = set; then
   enableval="$enable_slp"
@@ -2702,9 +2734,11 @@ echo "$as_me: error: bad value $enableval for --enable-slp" >&2;}
 	ol_enable_slp="$ol_arg"
 
 else
-  	ol_enable_slp="no"
-fi; # end --enable-slp
+  	ol_enable_slp=no
+fi;
+# end --enable-slp
 # OpenLDAP --enable-wrappers
+
 	# Check whether --enable-wrappers or --disable-wrappers was given.
 if test "${enable_wrappers+set}" = set; then
   enableval="$enable_wrappers"
@@ -2723,20 +2757,21 @@ echo "$as_me: error: bad value $enableval for --enable-wrappers" >&2;}
 	ol_enable_wrappers="$ol_arg"
 
 else
-  	ol_enable_wrappers="no"
-fi; # end --enable-wrappers
+  	ol_enable_wrappers=no
+fi;
+# end --enable-wrappers
 
 Backends="bdb dnssrv hdb ldap ldbm meta monitor null \
 	passwd perl relay shell sql"
 
-
-# Check whether --with-xxslapbackends or --without-xxslapbackends was given.
-if test "${with_xxslapbackends+set}" = set; then
-  withval="$with_xxslapbackends"
+# Check whether --enable-xxslapbackends or --disable-xxslapbackends was given.
+if test "${enable_xxslapbackends+set}" = set; then
+  enableval="$enable_xxslapbackends"
 
 fi;
 
 # OpenLDAP --enable-backends
+
 	# Check whether --enable-backends or --disable-backends was given.
 if test "${enable_backends+set}" = set; then
   enableval="$enable_backends"
@@ -2754,9 +2789,10 @@ echo "$as_me: error: bad value $enableval for --enable-backends" >&2;}
 	fi
 	ol_enable_backends="$ol_arg"
 
-fi; # end --enable-backends
-test -n "$ol_enable_backends" && ol_dflt_backends="$ol_enable_backends"
+fi;
+# end --enable-backends
 # OpenLDAP --enable-bdb
+
 	# Check whether --enable-bdb or --disable-bdb was given.
 if test "${enable_bdb+set}" = set; then
   enableval="$enable_bdb"
@@ -2775,9 +2811,11 @@ echo "$as_me: error: bad value $enableval for --enable-bdb" >&2;}
 	ol_enable_bdb="$ol_arg"
 
 else
-  	ol_enable_bdb="${ol_dflt_backends-yes}"
-fi; # end --enable-bdb
+  	ol_enable_bdb=${ol_enable_backends:-yes}
+fi;
+# end --enable-bdb
 # OpenLDAP --enable-dnssrv
+
 	# Check whether --enable-dnssrv or --disable-dnssrv was given.
 if test "${enable_dnssrv+set}" = set; then
   enableval="$enable_dnssrv"
@@ -2796,9 +2834,11 @@ echo "$as_me: error: bad value $enableval for --enable-dnssrv" >&2;}
 	ol_enable_dnssrv="$ol_arg"
 
 else
-  	ol_enable_dnssrv="${ol_dflt_backends-no}"
-fi; # end --enable-dnssrv
+  	ol_enable_dnssrv=${ol_enable_backends:-no}
+fi;
+# end --enable-dnssrv
 # OpenLDAP --enable-hdb
+
 	# Check whether --enable-hdb or --disable-hdb was given.
 if test "${enable_hdb+set}" = set; then
   enableval="$enable_hdb"
@@ -2817,9 +2857,11 @@ echo "$as_me: error: bad value $enableval for --enable-hdb" >&2;}
 	ol_enable_hdb="$ol_arg"
 
 else
-  	ol_enable_hdb="${ol_dflt_backends-yes}"
-fi; # end --enable-hdb
+  	ol_enable_hdb=${ol_enable_backends:-yes}
+fi;
+# end --enable-hdb
 # OpenLDAP --enable-ldap
+
 	# Check whether --enable-ldap or --disable-ldap was given.
 if test "${enable_ldap+set}" = set; then
   enableval="$enable_ldap"
@@ -2838,9 +2880,11 @@ echo "$as_me: error: bad value $enableval for --enable-ldap" >&2;}
 	ol_enable_ldap="$ol_arg"
 
 else
-  	ol_enable_ldap="${ol_dflt_backends-no}"
-fi; # end --enable-ldap
+  	ol_enable_ldap=${ol_enable_backends:-no}
+fi;
+# end --enable-ldap
 # OpenLDAP --enable-ldbm
+
 	# Check whether --enable-ldbm or --disable-ldbm was given.
 if test "${enable_ldbm+set}" = set; then
   enableval="$enable_ldbm"
@@ -2859,55 +2903,59 @@ echo "$as_me: error: bad value $enableval for --enable-ldbm" >&2;}
 	ol_enable_ldbm="$ol_arg"
 
 else
-  	ol_enable_ldbm="${ol_dflt_backends-no}"
-fi; # end --enable-ldbm
-# OpenLDAP --with-ldbm_api
+  	ol_enable_ldbm=${ol_enable_backends:-no}
+fi;
+# end --enable-ldbm
+# OpenLDAP --enable-ldbm_api
 
-# Check whether --with-ldbm_api or --without-ldbm_api was given.
-if test "${with_ldbm_api+set}" = set; then
-  withval="$with_ldbm_api"
+	# Check whether --enable-ldbm_api or --disable-ldbm_api was given.
+if test "${enable_ldbm_api+set}" = set; then
+  enableval="$enable_ldbm_api"
 
 	ol_arg=invalid
 	for ol_val in auto berkeley bcompat mdbm gdbm ; do
-		if test "$withval" = "$ol_val" ; then
+		if test "$enableval" = "$ol_val" ; then
 			ol_arg="$ol_val"
 		fi
 	done
 	if test "$ol_arg" = "invalid" ; then
-		{ { echo "$as_me:$LINENO: error: bad value $withval for --with-ldbm_api" >&5
-echo "$as_me: error: bad value $withval for --with-ldbm_api" >&2;}
+		{ { echo "$as_me:$LINENO: error: bad value $enableval for --enable-ldbm_api" >&5
+echo "$as_me: error: bad value $enableval for --enable-ldbm_api" >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	ol_with_ldbm_api="$ol_arg"
+	ol_enable_ldbm_api="$ol_arg"
 
 else
-  	ol_with_ldbm_api="auto"
-fi; # end --with-ldbm_api
+  	ol_enable_ldbm_api=auto
+fi;
+# end --enable-ldbm_api
 
-# OpenLDAP --with-ldbm_type
+# OpenLDAP --enable-ldbm_type
 
-# Check whether --with-ldbm_type or --without-ldbm_type was given.
-if test "${with_ldbm_type+set}" = set; then
-  withval="$with_ldbm_type"
+	# Check whether --enable-ldbm_type or --disable-ldbm_type was given.
+if test "${enable_ldbm_type+set}" = set; then
+  enableval="$enable_ldbm_type"
 
 	ol_arg=invalid
 	for ol_val in auto btree hash ; do
-		if test "$withval" = "$ol_val" ; then
+		if test "$enableval" = "$ol_val" ; then
 			ol_arg="$ol_val"
 		fi
 	done
 	if test "$ol_arg" = "invalid" ; then
-		{ { echo "$as_me:$LINENO: error: bad value $withval for --with-ldbm_type" >&5
-echo "$as_me: error: bad value $withval for --with-ldbm_type" >&2;}
+		{ { echo "$as_me:$LINENO: error: bad value $enableval for --enable-ldbm_type" >&5
+echo "$as_me: error: bad value $enableval for --enable-ldbm_type" >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	ol_with_ldbm_type="$ol_arg"
+	ol_enable_ldbm_type="$ol_arg"
 
 else
-  	ol_with_ldbm_type="auto"
-fi; # end --with-ldbm_type
+  	ol_enable_ldbm_type=auto
+fi;
+# end --enable-ldbm_type
 
 # OpenLDAP --enable-meta
+
 	# Check whether --enable-meta or --disable-meta was given.
 if test "${enable_meta+set}" = set; then
   enableval="$enable_meta"
@@ -2926,9 +2974,11 @@ echo "$as_me: error: bad value $enableval for --enable-meta" >&2;}
 	ol_enable_meta="$ol_arg"
 
 else
-  	ol_enable_meta="${ol_dflt_backends-no}"
-fi; # end --enable-meta
+  	ol_enable_meta=${ol_enable_backends:-no}
+fi;
+# end --enable-meta
 # OpenLDAP --enable-monitor
+
 	# Check whether --enable-monitor or --disable-monitor was given.
 if test "${enable_monitor+set}" = set; then
   enableval="$enable_monitor"
@@ -2947,9 +2997,11 @@ echo "$as_me: error: bad value $enableval for --enable-monitor" >&2;}
 	ol_enable_monitor="$ol_arg"
 
 else
-  	ol_enable_monitor="${ol_dflt_backends-yes}"
-fi; # end --enable-monitor
+  	ol_enable_monitor=${ol_enable_backends:-yes}
+fi;
+# end --enable-monitor
 # OpenLDAP --enable-null
+
 	# Check whether --enable-null or --disable-null was given.
 if test "${enable_null+set}" = set; then
   enableval="$enable_null"
@@ -2968,9 +3020,11 @@ echo "$as_me: error: bad value $enableval for --enable-null" >&2;}
 	ol_enable_null="$ol_arg"
 
 else
-  	ol_enable_null="${ol_dflt_backends-no}"
-fi; # end --enable-null
+  	ol_enable_null=${ol_enable_backends:-no}
+fi;
+# end --enable-null
 # OpenLDAP --enable-passwd
+
 	# Check whether --enable-passwd or --disable-passwd was given.
 if test "${enable_passwd+set}" = set; then
   enableval="$enable_passwd"
@@ -2989,9 +3043,11 @@ echo "$as_me: error: bad value $enableval for --enable-passwd" >&2;}
 	ol_enable_passwd="$ol_arg"
 
 else
-  	ol_enable_passwd="${ol_dflt_backends-no}"
-fi; # end --enable-passwd
+  	ol_enable_passwd=${ol_enable_backends:-no}
+fi;
+# end --enable-passwd
 # OpenLDAP --enable-perl
+
 	# Check whether --enable-perl or --disable-perl was given.
 if test "${enable_perl+set}" = set; then
   enableval="$enable_perl"
@@ -3010,9 +3066,11 @@ echo "$as_me: error: bad value $enableval for --enable-perl" >&2;}
 	ol_enable_perl="$ol_arg"
 
 else
-  	ol_enable_perl="${ol_dflt_backends-no}"
-fi; # end --enable-perl
+  	ol_enable_perl=${ol_enable_backends:-no}
+fi;
+# end --enable-perl
 # OpenLDAP --enable-relay
+
 	# Check whether --enable-relay or --disable-relay was given.
 if test "${enable_relay+set}" = set; then
   enableval="$enable_relay"
@@ -3031,9 +3089,11 @@ echo "$as_me: error: bad value $enableval for --enable-relay" >&2;}
 	ol_enable_relay="$ol_arg"
 
 else
-  	ol_enable_relay="${ol_dflt_backends-yes}"
-fi; # end --enable-relay
+  	ol_enable_relay=${ol_enable_backends:-yes}
+fi;
+# end --enable-relay
 # OpenLDAP --enable-shell
+
 	# Check whether --enable-shell or --disable-shell was given.
 if test "${enable_shell+set}" = set; then
   enableval="$enable_shell"
@@ -3052,9 +3112,11 @@ echo "$as_me: error: bad value $enableval for --enable-shell" >&2;}
 	ol_enable_shell="$ol_arg"
 
 else
-  	ol_enable_shell="${ol_dflt_backends-no}"
-fi; # end --enable-shell
+  	ol_enable_shell=${ol_enable_backends:-no}
+fi;
+# end --enable-shell
 # OpenLDAP --enable-sql
+
 	# Check whether --enable-sql or --disable-sql was given.
 if test "${enable_sql+set}" = set; then
   enableval="$enable_sql"
@@ -3073,20 +3135,21 @@ echo "$as_me: error: bad value $enableval for --enable-sql" >&2;}
 	ol_enable_sql="$ol_arg"
 
 else
-  	ol_enable_sql="${ol_dflt_backends-no}"
-fi; # end --enable-sql
+  	ol_enable_sql=${ol_enable_backends:-no}
+fi;
+# end --enable-sql
 
 Overlays="accesslog denyop dyngroup dynlist glue lastmod ppolicy proxycache \
 	refint retcode rwm syncprov translucent unique"
 
-
-# Check whether --with-xxslapoverlays or --without-xxslapoverlays was given.
-if test "${with_xxslapoverlays+set}" = set; then
-  withval="$with_xxslapoverlays"
+# Check whether --enable-xxslapoverlays or --disable-xxslapoverlays was given.
+if test "${enable_xxslapoverlays+set}" = set; then
+  enableval="$enable_xxslapoverlays"
 
 fi;
 
 # OpenLDAP --enable-overlays
+
 	# Check whether --enable-overlays or --disable-overlays was given.
 if test "${enable_overlays+set}" = set; then
   enableval="$enable_overlays"
@@ -3104,9 +3167,10 @@ echo "$as_me: error: bad value $enableval for --enable-overlays" >&2;}
 	fi
 	ol_enable_overlays="$ol_arg"
 
-fi; # end --enable-overlays
-test -n "$ol_enable_overlays" && ol_dflt_overlays="$ol_enable_overlays"
+fi;
+# end --enable-overlays
 # OpenLDAP --enable-accesslog
+
 	# Check whether --enable-accesslog or --disable-accesslog was given.
 if test "${enable_accesslog+set}" = set; then
   enableval="$enable_accesslog"
@@ -3125,10 +3189,12 @@ echo "$as_me: error: bad value $enableval for --enable-accesslog" >&2;}
 	ol_enable_accesslog="$ol_arg"
 
 else
-  	ol_enable_accesslog="${ol_dflt_overlays-no}"
-fi; # end --enable-accesslog
+  	ol_enable_accesslog=${ol_enable_overlays:-no}
+fi;
+# end --enable-accesslog
 
 # OpenLDAP --enable-denyop
+
 	# Check whether --enable-denyop or --disable-denyop was given.
 if test "${enable_denyop+set}" = set; then
   enableval="$enable_denyop"
@@ -3147,10 +3213,12 @@ echo "$as_me: error: bad value $enableval for --enable-denyop" >&2;}
 	ol_enable_denyop="$ol_arg"
 
 else
-  	ol_enable_denyop="${ol_dflt_overlays-no}"
-fi; # end --enable-denyop
+  	ol_enable_denyop=${ol_enable_overlays:-no}
+fi;
+# end --enable-denyop
 
 # OpenLDAP --enable-dyngroup
+
 	# Check whether --enable-dyngroup or --disable-dyngroup was given.
 if test "${enable_dyngroup+set}" = set; then
   enableval="$enable_dyngroup"
@@ -3169,10 +3237,12 @@ echo "$as_me: error: bad value $enableval for --enable-dyngroup" >&2;}
 	ol_enable_dyngroup="$ol_arg"
 
 else
-  	ol_enable_dyngroup="${ol_dflt_overlays-no}"
-fi; # end --enable-dyngroup
+  	ol_enable_dyngroup=${ol_enable_overlays:-no}
+fi;
+# end --enable-dyngroup
 
 # OpenLDAP --enable-dynlist
+
 	# Check whether --enable-dynlist or --disable-dynlist was given.
 if test "${enable_dynlist+set}" = set; then
   enableval="$enable_dynlist"
@@ -3191,10 +3261,12 @@ echo "$as_me: error: bad value $enableval for --enable-dynlist" >&2;}
 	ol_enable_dynlist="$ol_arg"
 
 else
-  	ol_enable_dynlist="${ol_dflt_overlays-no}"
-fi; # end --enable-dynlist
+  	ol_enable_dynlist=${ol_enable_overlays:-no}
+fi;
+# end --enable-dynlist
 
 # OpenLDAP --enable-glue
+
 	# Check whether --enable-glue or --disable-glue was given.
 if test "${enable_glue+set}" = set; then
   enableval="$enable_glue"
@@ -3213,10 +3285,12 @@ echo "$as_me: error: bad value $enableval for --enable-glue" >&2;}
 	ol_enable_glue="$ol_arg"
 
 else
-  	ol_enable_glue="${ol_dflt_overlays-yes}"
-fi; # end --enable-glue
+  	ol_enable_glue=${ol_enable_overlays:-yes}
+fi;
+# end --enable-glue
 
 # OpenLDAP --enable-lastmod
+
 	# Check whether --enable-lastmod or --disable-lastmod was given.
 if test "${enable_lastmod+set}" = set; then
   enableval="$enable_lastmod"
@@ -3235,10 +3309,12 @@ echo "$as_me: error: bad value $enableval for --enable-lastmod" >&2;}
 	ol_enable_lastmod="$ol_arg"
 
 else
-  	ol_enable_lastmod="${ol_dflt_overlays-no}"
-fi; # end --enable-lastmod
+  	ol_enable_lastmod=${ol_enable_overlays:-no}
+fi;
+# end --enable-lastmod
 
 # OpenLDAP --enable-ppolicy
+
 	# Check whether --enable-ppolicy or --disable-ppolicy was given.
 if test "${enable_ppolicy+set}" = set; then
   enableval="$enable_ppolicy"
@@ -3257,10 +3333,12 @@ echo "$as_me: error: bad value $enableval for --enable-ppolicy" >&2;}
 	ol_enable_ppolicy="$ol_arg"
 
 else
-  	ol_enable_ppolicy="${ol_dflt_overlays-no}"
-fi; # end --enable-ppolicy
+  	ol_enable_ppolicy=${ol_enable_overlays:-no}
+fi;
+# end --enable-ppolicy
 
 # OpenLDAP --enable-proxycache
+
 	# Check whether --enable-proxycache or --disable-proxycache was given.
 if test "${enable_proxycache+set}" = set; then
   enableval="$enable_proxycache"
@@ -3279,10 +3357,12 @@ echo "$as_me: error: bad value $enableval for --enable-proxycache" >&2;}
 	ol_enable_proxycache="$ol_arg"
 
 else
-  	ol_enable_proxycache="${ol_dflt_overlays-no}"
-fi; # end --enable-proxycache
+  	ol_enable_proxycache=${ol_enable_overlays:-no}
+fi;
+# end --enable-proxycache
 
 # OpenLDAP --enable-refint
+
 	# Check whether --enable-refint or --disable-refint was given.
 if test "${enable_refint+set}" = set; then
   enableval="$enable_refint"
@@ -3301,10 +3381,12 @@ echo "$as_me: error: bad value $enableval for --enable-refint" >&2;}
 	ol_enable_refint="$ol_arg"
 
 else
-  	ol_enable_refint="${ol_dflt_overlays-no}"
-fi; # end --enable-refint
+  	ol_enable_refint=${ol_enable_overlays:-no}
+fi;
+# end --enable-refint
 
 # OpenLDAP --enable-retcode
+
 	# Check whether --enable-retcode or --disable-retcode was given.
 if test "${enable_retcode+set}" = set; then
   enableval="$enable_retcode"
@@ -3323,10 +3405,12 @@ echo "$as_me: error: bad value $enableval for --enable-retcode" >&2;}
 	ol_enable_retcode="$ol_arg"
 
 else
-  	ol_enable_retcode="${ol_dflt_overlays-no}"
-fi; # end --enable-retcode
+  	ol_enable_retcode=${ol_enable_overlays:-no}
+fi;
+# end --enable-retcode
 
 # OpenLDAP --enable-rwm
+
 	# Check whether --enable-rwm or --disable-rwm was given.
 if test "${enable_rwm+set}" = set; then
   enableval="$enable_rwm"
@@ -3345,10 +3429,12 @@ echo "$as_me: error: bad value $enableval for --enable-rwm" >&2;}
 	ol_enable_rwm="$ol_arg"
 
 else
-  	ol_enable_rwm="${ol_dflt_overlays-no}"
-fi; # end --enable-rwm
+  	ol_enable_rwm=${ol_enable_overlays:-no}
+fi;
+# end --enable-rwm
 
 # OpenLDAP --enable-syncprov
+
 	# Check whether --enable-syncprov or --disable-syncprov was given.
 if test "${enable_syncprov+set}" = set; then
   enableval="$enable_syncprov"
@@ -3367,10 +3453,12 @@ echo "$as_me: error: bad value $enableval for --enable-syncprov" >&2;}
 	ol_enable_syncprov="$ol_arg"
 
 else
-  	ol_enable_syncprov="${ol_dflt_overlays-yes}"
-fi; # end --enable-syncprov
+  	ol_enable_syncprov=${ol_enable_overlays:-yes}
+fi;
+# end --enable-syncprov
 
 # OpenLDAP --enable-translucent
+
 	# Check whether --enable-translucent or --disable-translucent was given.
 if test "${enable_translucent+set}" = set; then
   enableval="$enable_translucent"
@@ -3389,10 +3477,12 @@ echo "$as_me: error: bad value $enableval for --enable-translucent" >&2;}
 	ol_enable_translucent="$ol_arg"
 
 else
-  	ol_enable_translucent="${ol_dflt_overlays-no}"
-fi; # end --enable-translucent
+  	ol_enable_translucent=${ol_enable_overlays:-no}
+fi;
+# end --enable-translucent
 
 # OpenLDAP --enable-unique
+
 	# Check whether --enable-unique or --disable-unique was given.
 if test "${enable_unique+set}" = set; then
   enableval="$enable_unique"
@@ -3411,18 +3501,18 @@ echo "$as_me: error: bad value $enableval for --enable-unique" >&2;}
 	ol_enable_unique="$ol_arg"
 
 else
-  	ol_enable_unique="${ol_dflt_overlays-no}"
-fi; # end --enable-unique
-
-
+  	ol_enable_unique=${ol_enable_overlays:-no}
+fi;
+# end --enable-unique
 
 
-# Check whether --with-xxslurpdoptions or --without-xxslurpdoptions was given.
-if test "${with_xxslurpdoptions+set}" = set; then
-  withval="$with_xxslurpdoptions"
+# Check whether --enable-xxslurpdoptions or --disable-xxslurpdoptions was given.
+if test "${enable_xxslurpdoptions+set}" = set; then
+  enableval="$enable_xxslurpdoptions"
 
 fi;
 # OpenLDAP --enable-slurpd
+
 	# Check whether --enable-slurpd or --disable-slurpd was given.
 if test "${enable_slurpd+set}" = set; then
   enableval="$enable_slurpd"
@@ -3441,13 +3531,13 @@ echo "$as_me: error: bad value $enableval for --enable-slurpd" >&2;}
 	ol_enable_slurpd="$ol_arg"
 
 else
-  	ol_enable_slurpd="auto"
-fi; # end --enable-slurpd
-
+  	ol_enable_slurpd=auto
+fi;
+# end --enable-slurpd
 
-# Check whether --with-xxliboptions or --without-xxliboptions was given.
-if test "${with_xxliboptions+set}" = set; then
-  withval="$with_xxliboptions"
+# Check whether --enable-xxliboptions or --disable-xxliboptions was given.
+if test "${enable_xxliboptions+set}" = set; then
+  enableval="$enable_xxliboptions"
 
 fi;
 # Check whether --enable-static or --disable-static was given.
@@ -3538,13 +3628,13 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-rlookups argument" >&2;
 		{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-aci argument" >&5
 echo "$as_me: WARNING: slapd disabled, ignoring --enable-aci argument" >&2;}
 	fi
-	if test $ol_with_ldbm_api != auto ; then
-		{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --with-ldbm-api argument" >&5
-echo "$as_me: WARNING: slapd disabled, ignoring --with-ldbm-api argument" >&2;}
+	if test $ol_enable_ldbm_api != auto ; then
+		{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-ldbm-api argument" >&5
+echo "$as_me: WARNING: slapd disabled, ignoring --enable-ldbm-api argument" >&2;}
 	fi
-	if test $ol_with_ldbm_type != auto ; then
-		{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --with-ldbm-type argument" >&5
-echo "$as_me: WARNING: slapd disabled, ignoring --with-ldbm-type argument" >&2;}
+	if test $ol_enable_ldbm_type != auto ; then
+		{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-ldbm-type argument" >&5
+echo "$as_me: WARNING: slapd disabled, ignoring --enable-ldbm-type argument" >&2;}
 	fi
 	if test $ol_enable_slurpd = yes ; then
 		{ { echo "$as_me:$LINENO: error: slurpd requires slapd" >&5
@@ -3579,8 +3669,8 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
 	ol_enable_aci=no
 	ol_enable_wrappers=no
 
-	ol_with_ldbm_api=no
-	ol_with_ldbm_type=no
+	ol_enable_ldbm_api=no
+	ol_enable_ldbm_type=no
 
 	ol_enable_slurpd=no
 
@@ -3588,14 +3678,14 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
 
 elif test $ol_enable_ldbm = no ; then
 
-	if test $ol_with_ldbm_api != auto ; then
-		{ echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --with-ldbm-api argument" >&5
-echo "$as_me: WARNING: LDBM disabled, ignoring --with-ldbm-api argument" >&2;}
+	if test $ol_enable_ldbm_api != auto ; then
+		{ echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&5
+echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&2;}
 	fi
 
-	if test $ol_with_ldbm_type != auto ; then
-		{ echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --with-ldbm-type argument" >&5
-echo "$as_me: WARNING: LDBM disabled, ignoring --with-ldbm-type argument" >&2;}
+	if test $ol_enable_ldbm_type != auto ; then
+		{ echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --enable-ldbm-type argument" >&5
+echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-type argument" >&2;}
 	fi
 
 	if test $ol_enable_modules != yes -a \
@@ -3623,37 +3713,37 @@ echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;}
 		fi
 	fi
 
-	ol_with_ldbm_api=no
-	ol_with_ldbm_type=no
+	ol_enable_ldbm_api=no
+	ol_enable_ldbm_type=no
 
 	if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then
-		ol_with_ldbm_api=berkeley
+		ol_enable_ldbm_api=berkeley
 	fi
 
 else
-		if test $ol_with_ldbm_api = gdbm -a \
-		$ol_with_ldbm_type = btree ; then
+		if test $ol_enable_ldbm_api = gdbm -a \
+		$ol_enable_ldbm_type = btree ; then
 		{ { echo "$as_me:$LINENO: error: GDBM only supports LDBM type hash" >&5
 echo "$as_me: error: GDBM only supports LDBM type hash" >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	if test $ol_with_ldbm_api = mdbm -a \
-		$ol_with_ldbm_type = btree ; then
+	if test $ol_enable_ldbm_api = mdbm -a \
+		$ol_enable_ldbm_type = btree ; then
 		{ { echo "$as_me:$LINENO: error: MDBM only supports LDBM type hash" >&5
 echo "$as_me: error: MDBM only supports LDBM type hash" >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	if test $ol_with_ldbm_api = ndbm -a \
-		$ol_with_ldbm_type = btree ; then
+	if test $ol_enable_ldbm_api = ndbm -a \
+		$ol_enable_ldbm_type = btree ; then
 		{ { echo "$as_me:$LINENO: error: NDBM only supports LDBM type hash" >&5
 echo "$as_me: error: NDBM only supports LDBM type hash" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 
 	if test $ol_enable_bdb != no -o $ol_enable_hdb != no ; then
-		if test $ol_with_ldbm_api = auto ; then
-			ol_with_ldbm_api=berkeley
-		elif test $ol_with_ldbm_api != berkeley ; then
+		if test $ol_enable_ldbm_api = auto ; then
+			ol_enable_ldbm_api=berkeley
+		elif test $ol_enable_ldbm_api != berkeley ; then
 			{ { echo "$as_me:$LINENO: error: LDBM API not compatible with BDB/HDB" >&5
 echo "$as_me: error: LDBM API not compatible with BDB/HDB" >&2;}
    { (exit 1); exit 1; }; }
@@ -5582,7 +5672,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5585 "configure"' > conftest.$ac_ext
+  echo '#line 5675 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7403,7 +7493,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:7406:" \
+echo "$as_me:7496:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8501,11 +8591,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8504: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8594: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8508: \$? = $ac_status" >&5
+   echo "$as_me:8598: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8763,11 +8853,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8766: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8770: \$? = $ac_status" >&5
+   echo "$as_me:8860: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8825,11 +8915,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8828: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8918: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8832: \$? = $ac_status" >&5
+   echo "$as_me:8922: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11065,7 +11155,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11068 "configure"
+#line 11158 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11163,7 +11253,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11166 "configure"
+#line 11256 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13411,11 +13501,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13414: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13504: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13418: \$? = $ac_status" >&5
+   echo "$as_me:13508: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13473,11 +13563,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13476: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13566: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13480: \$? = $ac_status" >&5
+   echo "$as_me:13570: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14842,7 +14932,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14845 "configure"
+#line 14935 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14940,7 +15030,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14943 "configure"
+#line 15033 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15825,11 +15915,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15828: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15918: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15832: \$? = $ac_status" >&5
+   echo "$as_me:15922: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15887,11 +15977,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15890: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15980: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15894: \$? = $ac_status" >&5
+   echo "$as_me:15984: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18009,11 +18099,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18012: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18102: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18016: \$? = $ac_status" >&5
+   echo "$as_me:18106: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18271,11 +18361,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18274: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18364: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18278: \$? = $ac_status" >&5
+   echo "$as_me:18368: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18333,11 +18423,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18336: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18426: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18340: \$? = $ac_status" >&5
+   echo "$as_me:18430: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20573,7 +20663,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20576 "configure"
+#line 20666 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20671,7 +20761,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 20674 "configure"
+#line 20764 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -37865,11 +37955,11 @@ fi
 
 ol_link_ldbm=no
 
-if test $ol_with_ldbm_api = auto \
-	-o $ol_with_ldbm_api = berkeley \
-	-o $ol_with_ldbm_api = bcompat ; then
+if test $ol_enable_ldbm_api = auto \
+	-o $ol_enable_ldbm_api = berkeley \
+	-o $ol_enable_ldbm_api = bcompat ; then
 
-	if test $ol_with_ldbm_api = bcompat; then \
+	if test $ol_enable_ldbm_api = bcompat; then \
 
 
 for ac_header in db_185.h db.h
@@ -43251,9 +43341,9 @@ _ACEOF
 
 
 		ol_link_ldbm=berkeley
-		ol_with_ldbm_api=berkeley
+		ol_enable_ldbm_api=berkeley
 
-		if test $ol_with_ldbm_type = hash ; then
+		if test $ol_enable_ldbm_type = hash ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define LDBM_USE_DBHASH 1
@@ -43329,13 +43419,13 @@ echo "$as_me: error: BDB/HDB: BerkeleyDB version incompatible" >&2;}
 	fi
 fi
 
-if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
+if test $ol_link_ldbm = no -a $ol_enable_ldbm_type = btree ; then
 	{ echo "$as_me:$LINENO: WARNING: Could not find LDBM with BTREE support" >&5
 echo "$as_me: WARNING: Could not find LDBM with BTREE support" >&2;}
-	ol_with_ldbm_api=none
+	ol_enable_ldbm_api=none
 fi
 
-if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then
+if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = mdbm ; then
 	echo "$as_me:$LINENO: checking for MDBM library" >&5
 echo $ECHO_N "checking for MDBM library... $ECHO_C" >&6
 if test "${ol_cv_lib_mdbm+set}" = set; then
@@ -43692,14 +43782,14 @@ _ACEOF
 
 	if test $ol_cv_mdbm = yes ; then
 		ol_link_ldbm=mdbm
-		ol_with_ldbm_api=mdbm
+		ol_enable_ldbm_api=mdbm
 		if test $ol_cv_lib_mdbm != yes ; then
 			LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_mdbm"
 		fi
 	fi
 fi
 
-if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
+if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = gdbm ; then
 	echo "$as_me:$LINENO: checking for GDBM library" >&5
 echo $ECHO_N "checking for GDBM library... $ECHO_C" >&6
 if test "${ol_cv_lib_gdbm+set}" = set; then
@@ -44056,7 +44146,7 @@ _ACEOF
 
 	if test $ol_cv_gdbm = yes ; then
 		ol_link_ldbm=gdbm
-		ol_with_ldbm_api=gdbm
+		ol_enable_ldbm_api=gdbm
 
 		if test $ol_cv_lib_gdbm != yes ; then
 			LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm"
@@ -44064,7 +44154,7 @@ _ACEOF
 	fi
 fi
 
-if test $ol_with_ldbm_api = ndbm ; then
+if test $ol_enable_ldbm_api = ndbm ; then
 	echo "$as_me:$LINENO: checking for NDBM library" >&5
 echo $ECHO_N "checking for NDBM library... $ECHO_C" >&6
 if test "${ol_cv_lib_ndbm+set}" = set; then
@@ -44491,7 +44581,7 @@ _ACEOF
 
 	if test $ol_cv_ndbm = yes ; then
 		ol_link_ldbm=ndbm
-		ol_with_ldbm_api=ndbm
+		ol_enable_ldbm_api=ndbm
 
 		if test $ol_cv_lib_ndbm != yes ; then
 			LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm"