Regenerate

diff --git a/configure b/configure
index bf1db86d6a87366ae1ebd23f9265a014b969d0cd..4d3b0b7e054f4a4e2524e1a9f2e8c6c344447670 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: 2ad531a4ba542cdb01a5f2242c38c034b7ad46a1 .
+# From configure.in Id: 24b557375703efe20373a424f6f186bd237f286e .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68.
 #
@@ -979,9 +979,9 @@ enable_slp
 enable_wrappers
 enable_xxslapbackends
 enable_backends
-enable_deprecated_bdb
+enable_bdb
 enable_dnssrv
-enable_deprecated_hdb
+enable_hdb
 enable_ldap
 enable_mdb
 enable_meta
@@ -1679,9 +1679,9 @@ SLAPD (Standalone LDAP Daemon) Options:
 
 SLAPD Backend Options:
     --enable-backends    enable all available backends no|yes|mod
-    --enable-deprecated-bdb      enable deprecated Berkeley DB backend. Will be removed in OpenLDAP 2.6 no|yes|mod [no]
+    --enable-bdb         enable Berkeley DB backend no|yes|mod [no]
     --enable-dnssrv      enable dnssrv backend no|yes|mod [no]
-    --enable-deprecated-hdb      enable deprecated Hierarchical DB backend. Will be removed in OpenLDAP 2.6 no|yes|mod [no]
+    --enable-hdb         enable Hierarchical DB backend no|yes|mod [no]
     --enable-ldap        enable ldap backend no|yes|mod [no]
     --enable-mdb         enable mdb database backend no|yes|mod [yes]
     --enable-meta        enable metadirectory backend no|yes|mod [no]
@@ -4102,11 +4102,11 @@ if test "${enable_backends+set}" = set; then :
 fi
 
 # end --enable-backends
-# OpenLDAP --enable-deprecated_bdb
+# OpenLDAP --enable-bdb
 
-       # Check whether --enable-deprecated_bdb was given.
-if test "${enable_deprecated_bdb+set}" = set; then :
-  enableval=$enable_deprecated_bdb;
+       # Check whether --enable-bdb was given.
+if test "${enable_bdb+set}" = set; then :
+  enableval=$enable_bdb;
        ol_arg=invalid
        for ol_val in no yes mod ; do
                if test "$enableval" = "$ol_val" ; then
@@ -4114,15 +4114,15 @@ if test "${enable_deprecated_bdb+set}" = set; then :
                fi
        done
        if test "$ol_arg" = "invalid" ; then
-               as_fn_error $? "bad value $enableval for --enable-deprecated_bdb" "$LINENO" 5
+               as_fn_error $? "bad value $enableval for --enable-bdb" "$LINENO" 5
        fi
-       ol_enable_deprecated_bdb="$ol_arg"
+       ol_enable_bdb="$ol_arg"
 
 else
-       ol_enable_deprecated_bdb=${ol_enable_backends:-no}
+       ol_enable_bdb=${ol_enable_backends:-no}
 fi
 
-# end --enable-deprecated_bdb
+# end --enable-bdb
 # OpenLDAP --enable-dnssrv
 
        # Check whether --enable-dnssrv was given.
@@ -4144,11 +4144,11 @@ else
 fi
 
 # end --enable-dnssrv
-# OpenLDAP --enable-deprecated_hdb
+# OpenLDAP --enable-hdb
 
-       # Check whether --enable-deprecated_hdb was given.
-if test "${enable_deprecated_hdb+set}" = set; then :
-  enableval=$enable_deprecated_hdb;
+       # Check whether --enable-hdb was given.
+if test "${enable_hdb+set}" = set; then :
+  enableval=$enable_hdb;
        ol_arg=invalid
        for ol_val in no yes mod ; do
                if test "$enableval" = "$ol_val" ; then
@@ -4156,15 +4156,15 @@ if test "${enable_deprecated_hdb+set}" = set; then :
                fi
        done
        if test "$ol_arg" = "invalid" ; then
-               as_fn_error $? "bad value $enableval for --enable-deprecated_hdb" "$LINENO" 5
+               as_fn_error $? "bad value $enableval for --enable-hdb" "$LINENO" 5
        fi
-       ol_enable_deprecated_hdb="$ol_arg"
+       ol_enable_hdb="$ol_arg"
 
 else
-       ol_enable_deprecated_hdb=${ol_enable_backends:-no}
+       ol_enable_hdb=${ol_enable_backends:-no}
 fi
 
-# end --enable-deprecated_hdb
+# end --enable-hdb
 # OpenLDAP --enable-ldap
 
        # Check whether --enable-ldap was given.
@@ -5029,9 +5029,9 @@ $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
        ol_enable_rewrite=no
 
 elif test $ol_enable_modules != yes &&
-       test $ol_enable_deprecated_bdb = no &&
+       test $ol_enable_bdb = no &&
        test $ol_enable_dnssrv = no &&
-       test $ol_enable_deprecated_hdb = no &&
+       test $ol_enable_hdb = no &&
        test $ol_enable_ldap = no &&
        test $ol_enable_mdb = no &&
        test $ol_enable_meta = no &&
@@ -20266,7 +20266,7 @@ fi
 
 ol_link_bdb=no
 
-if test $ol_enable_deprecated_bdb/$ol_enable_deprecated_hdb != no/no; then
+if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
        ol_cv_berkeley_db=no
 for ac_header in db.h
 do :
@@ -24146,10 +24146,10 @@ _ACEOF
 
 fi
 
-if test "$ol_enable_deprecated_bdb" != no ; then
+if test "$ol_enable_bdb" != no ; then
        BUILD_SLAPD=yes
-       BUILD_BDB=$ol_enable_deprecated_bdb
-       if test "$ol_enable_deprecated_bdb" = mod ; then
+       BUILD_BDB=$ol_enable_bdb
+       if test "$ol_enable_bdb" = mod ; then
                SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
                MFLAG=SLAPD_MOD_DYNAMIC
        else
@@ -24180,10 +24180,10 @@ _ACEOF
 
 fi
 
-if test "$ol_enable_deprecated_hdb" != no ; then
+if test "$ol_enable_hdb" != no ; then
        BUILD_SLAPD=yes
-       BUILD_HDB=$ol_enable_deprecated_hdb
-       if test "$ol_enable_deprecated_hdb" = mod ; then
+       BUILD_HDB=$ol_enable_hdb
+       if test "$ol_enable_hdb" = mod ; then
                SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb"
                MFLAG=SLAPD_MOD_DYNAMIC
        else