ITS#10163 - Regenerate configure

diff --git a/configure b/configure
index b44b84fcdc8f49dd3b06bab332748904f7bfda7a..8f234203e694924a8b287788e1c8794d5c482df0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: 53c44b8b8261a9f79021855cf33652bcfef5a380 .
+# From configure.ac Id: 49fd54c7b3ec18af1321c5146a9863d3660a697e .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -673,43 +673,14 @@ SLAPD_LIBS
 CLIENT_LIBS
 LDAP_LIBS
 BUILD_HARNESS
-BUILD_PW_ARGON2
 BUILD_BALANCER
-BUILD_VALSORT
-BUILD_UNIQUE
-BUILD_TRANSLUCENT
-BUILD_SYNCPROV
-BUILD_SSSVLV
-BUILD_SEQMOD
-BUILD_RWM
-BUILD_RETCODE
-BUILD_REMOTEAUTH
-BUILD_REFINT
-BUILD_PROXYCACHE
-BUILD_PPOLICY
-BUILD_OTP
-BUILD_MEMBEROF
-BUILD_HOMEDIR
-BUILD_LASTMOD
-BUILD_DYNLIST
-BUILD_DYNGROUP
-BUILD_DEREF
-BUILD_DENYOP
-BUILD_DDS
-BUILD_CONSTRAINT
-BUILD_COLLECT
-BUILD_AUTOCA
-BUILD_AUDITLOG
-BUILD_ACCESSLOG
 BUILD_WT
 BUILD_SQL
 BUILD_SOCK
-BUILD_SHELL
-BUILD_PERL
 BUILD_RELAY
+BUILD_PERL
 BUILD_PASSWD
 BUILD_NULL
-BUILD_NDB
 BUILD_ASYNCMETA
 BUILD_META
 BUILD_MDB
@@ -4716,44 +4687,14 @@ BUILD_LDAP=no
 BUILD_MDB=no
 BUILD_META=no
 BUILD_ASYNCMETA=no
-BUILD_NDB=no
 BUILD_NULL=no
 BUILD_PASSWD=no
 BUILD_PERL=no
 BUILD_RELAY=no
-BUILD_SHELL=no
 BUILD_SOCK=no
 BUILD_SQL=no
 BUILD_WT=no
 
-BUILD_ACCESSLOG=no
-BUILD_AUDITLOG=no
-BUILD_AUTOCA=no
-BUILD_CONSTRAINT=no
-BUILD_DDS=no
-BUILD_DENYOP=no
-BUILD_DEREF=no
-BUILD_DYNGROUP=no
-BUILD_DYNLIST=no
-BUILD_LASTMOD=no
-BUILD_HOMEDIR=no
-BUILD_MEMBEROF=no
-BUILD_OTP=no
-BUILD_PPOLICY=no
-BUILD_PROXYCACHE=no
-BUILD_REFINT=no
-BUILD_REMOTEAUTH=no
-BUILD_RETCODE=no
-BUILD_RWM=no
-BUILD_SEQMOD=no
-BUILD_SSSVLV=no
-BUILD_SYNCPROV=no
-BUILD_TRANSLUCENT=no
-BUILD_UNIQUE=no
-BUILD_VALSORT=no
-
-BUILD_PW_ARGON2=no
-
 BUILD_HARNESS=no
 
 SLAPD_STATIC_OVERLAYS=
@@ -25074,7 +25015,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_accesslog" != no ; then
-       BUILD_ACCESSLOG=$ol_enable_accesslog
        if test "$ol_enable_accesslog" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS accesslog.la"
@@ -25090,7 +25030,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_auditlog" != no ; then
-       BUILD_AUDITLOG=$ol_enable_auditlog
        if test "$ol_enable_auditlog" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS auditlog.la"
@@ -25110,7 +25049,6 @@ if test "$ol_enable_autoca" != no ; then
                as_fn_error $? "--enable-autoca=$ol_enable_autoca requires --with-tls=openssl" "$LINENO" 5
        fi
 
-       BUILD_AUTOCA=$ol_enable_autoca
        if test "$ol_enable_autoca" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS autoca.la"
@@ -25126,14 +25064,13 @@ _ACEOF
 fi
 
 if test "$ol_enable_collect" != no ; then
-        BUILD_COLLECT=$ol_enable_collect
-        if test "$ol_enable_collect" = mod ; then
-                MFLAG=SLAPD_MOD_DYNAMIC
-                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS collect.la"
-        else
-                MFLAG=SLAPD_MOD_STATIC
-                SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS collect.o"
-        fi
+       if test "$ol_enable_collect" = mod ; then
+               MFLAG=SLAPD_MOD_DYNAMIC
+               SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS collect.la"
+       else
+               MFLAG=SLAPD_MOD_STATIC
+               SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS collect.o"
+       fi
 
 cat >>confdefs.h <<_ACEOF
 #define SLAPD_OVER_COLLECT $MFLAG
@@ -25142,7 +25079,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_constraint" != no ; then
-       BUILD_CONSTRAINT=$ol_enable_constraint
        if test "$ol_enable_constraint" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS constraint.la"
@@ -25158,7 +25094,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_dds" != no ; then
-       BUILD_DDS=$ol_enable_dds
        if test "$ol_enable_dds" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dds.la"
@@ -25174,7 +25109,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_deref" != no ; then
-       BUILD_DEREF=$ol_enable_deref
        if test "$ol_enable_deref" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS deref.la"
@@ -25190,7 +25124,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_dyngroup" != no ; then
-       BUILD_DYNGROUP=$ol_enable_dyngroup
        if test "$ol_enable_dyngroup" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dyngroup.la"
@@ -25206,7 +25139,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_dynlist" != no ; then
-       BUILD_DYNLIST=$ol_enable_dynlist
        if test "$ol_enable_dynlist" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dynlist.la"
@@ -25222,7 +25154,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_homedir" != no ; then
-       BUILD_HOMEDIR=$ol_enable_homedir
        if test "$ol_enable_homedir" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS homedir.la"
@@ -25238,7 +25169,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_memberof" != no ; then
-       BUILD_MEMBEROF=$ol_enable_memberof
        if test "$ol_enable_memberof" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS memberof.la"
@@ -25258,7 +25188,6 @@ if test "$ol_enable_otp" != no ; then
                as_fn_error $? "--enable-otp=$ol_enable_otp requires --with-tls" "$LINENO" 5
        fi
 
-       BUILD_OTP=$ol_enable_otp
        if test "$ol_enable_otp" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS otp.la"
@@ -25274,7 +25203,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_ppolicy" != no ; then
-       BUILD_PPOLICY=$ol_enable_ppolicy
        if test "$ol_enable_ppolicy" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS ppolicy.la"
@@ -25290,7 +25218,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_proxycache" != no ; then
-       BUILD_PROXYCACHE=$ol_enable_proxycache
        if test "$ol_enable_proxycache" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS pcache.la"
@@ -25304,9 +25231,10 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 fi
+ol_enable_pcache=$ol_enable_proxycache
+Overlays="`echo $Overlays | sed -e s,proxycache,pcache,`"
 
 if test "$ol_enable_refint" != no ; then
-       BUILD_REFINT=$ol_enable_refint
        if test "$ol_enable_refint" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS refint.la"
@@ -25322,7 +25250,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_remoteauth" != no ; then
-       BUILD_REMOTEAUTH=$ol_enable_remoteauth
        if test "$ol_enable_remoteauth" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS remoteauth.la"
@@ -25338,7 +25265,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_retcode" != no ; then
-       BUILD_RETCODE=$ol_enable_retcode
        if test "$ol_enable_retcode" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS retcode.la"
@@ -25354,7 +25280,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_rwm" != no ; then
-       BUILD_RWM=$ol_enable_rwm
        if test "$ol_enable_rwm" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS rwm.la"
@@ -25370,7 +25295,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_seqmod" != no ; then
-       BUILD_SEQMOD=$ol_enable_seqmod
        if test "$ol_enable_seqmod" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS seqmod.la"
@@ -25386,7 +25310,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_sssvlv" != no ; then
-       BUILD_SSSVLV=$ol_enable_sssvlv
        if test "$ol_enable_sssvlv" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS sssvlv.la"
@@ -25402,7 +25325,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_syncprov" != no ; then
-       BUILD_SYNCPROV=$ol_enable_syncprov
        if test "$ol_enable_syncprov" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS syncprov.la"
@@ -25418,7 +25340,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_translucent" != no ; then
-       BUILD_TRANSLUCENT=$ol_enable_translucent
        if test "$ol_enable_translucent" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS translucent.la"
@@ -25434,7 +25355,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_unique" != no ; then
-       BUILD_UNIQUE=$ol_enable_unique
        if test "$ol_enable_unique" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS unique.la"
@@ -25450,7 +25370,6 @@ _ACEOF
 fi
 
 if test "$ol_enable_valsort" != no ; then
-       BUILD_VALSORT=$ol_enable_valsort
        if test "$ol_enable_valsort" = mod ; then
                MFLAG=SLAPD_MOD_DYNAMIC
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS valsort.la"
@@ -25604,7 +25523,6 @@ $as_echo "#define HAVE_LIBSODIUM 1" >>confdefs.h
                as_fn_error $? "--enable_argon2=$ol_enable_argon2 requires --with-argon2" "$LINENO" 5
        fi
 
-       BUILD_PW_ARGON2=$ol_enable_argon2
        if test "$ol_enable_argon2" = "yes" ; then
                SLAPD_DYNAMIC_PWMODS="$SLAPD_DYNAMIC_PWMODS argon2.la"
        fi
@@ -25670,34 +25588,21 @@ else
        PLAT=UNIX
 fi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+BACKEND_ENABLES=
+for i in $Backends; do
+       eval "ol_tmp=\$ol_enable_$i"
+       BACKEND_ENABLES="$BACKEND_ENABLES AC""_${i}=${i}${ol_tmp}"
+done
+OVERLAY_ENABLES=
+for i in $Overlays; do
+       eval "ol_tmp=\$ol_enable_$i"
+       OVERLAY_ENABLES="$OVERLAY_ENABLES AC""_${i}=${i}${ol_tmp}"
+done
+PWMOD_ENABLES=
+for i in $Pwmods; do
+       eval "ol_tmp=\$ol_enable_$i"
+       PWMOD_ENABLES="$PWMOD_ENABLES AC""_${i}=${i}${ol_tmp}"
+done
 
 
 
@@ -26679,6 +26584,9 @@ fi
 
 STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS"
 STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS"
+BACKEND_ENABLES="$BACKEND_ENABLES"
+OVERLAY_ENABLES="$OVERLAY_ENABLES"
+PWMOD_ENABLES="$PWMOD_ENABLES"
 
 
 _ACEOF
@@ -27938,6 +27846,25 @@ fi
 /* end of generated file */
 ENDX
 
+TESTSMODULES="tests/AC""_defs.sh"
+echo "Making $TESTSMODULES"
+rm -f $TESTSMODULES
+echo "# This file is automatically generated by configure; please do not edit." > $TESTSMODULES
+echo "# Backends" >> $TESTSMODULES
+for i in $BACKEND_ENABLES; do
+       echo $i >> $TESTSMODULES
+done
+echo "" >> $TESTSMODULES
+echo "# Overlays" >> $TESTSMODULES
+for i in $OVERLAY_ENABLES; do
+       echo $i >> $TESTSMODULES
+done
+echo "" >> $TESTSMODULES
+echo "# Pwmods" >> $TESTSMODULES
+for i in $PWMOD_ENABLES; do
+       echo $i >> $TESTSMODULES
+done
+
 if test "${ol_cv_mkdep}" = no; then
        echo '(Do not "make depend"; we do not know how to build dependencies)'
 else