From 0c4ee60aa80a89ac83f356f62f4536bb5cd32d70 Mon Sep 17 00:00:00 2001 From: Ryan Tandy Date: Wed, 22 Apr 2020 11:31:01 -0700 Subject: [PATCH] ITS#8224 Regenerate configure --- configure | 280 ++++++++++++++++++++++++------------------------------ 1 file changed, 123 insertions(+), 157 deletions(-) diff --git a/configure b/configure index cc8e629b6c..8ff7555758 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: 92eed6ee362cb73d2675172c868d5152c1b05965 . +# From configure.in Id: f5bb6f2fd1296e593be74bedf21cc3eed9adc2e3 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -1531,66 +1531,66 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-debug enable debugging no|yes|traditional [yes] - --enable-dynamic enable linking built binaries with dynamic libs [auto] - --enable-syslog enable syslog support [auto] - --enable-ipv6 enable IPv6 support [auto] - --enable-local enable AF_LOCAL (AF_UNIX) socket support [auto] + --enable-debug enable debugging no|yes|traditional [yes] + --enable-dynamic enable linking built binaries with dynamic libs [auto] + --enable-syslog enable syslog support [auto] + --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-dynacl enable run-time loadable ACL support (experimental) [no] - --enable-aci enable per-object ACIs (experimental) no|yes|mod [no] - --enable-cleartext enable cleartext passwords [yes] - --enable-crypt enable crypt(3) passwords [no] - --enable-spasswd enable (Cyrus) SASL password verification [no] - --enable-modules enable dynamic module support [no] - --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-slapd enable building slapd [yes] + --enable-dynacl enable run-time loadable ACL support (experimental) [no] + --enable-aci enable per-object ACIs (experimental) no|yes|mod [no] + --enable-cleartext enable cleartext passwords [yes] + --enable-crypt enable crypt(3) passwords [no] + --enable-spasswd enable (Cyrus) SASL password verification [no] + --enable-modules enable dynamic module support [no] + --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-dnssrv enable dnssrv 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] - --enable-asyncmeta enable asynchronous metadirectory backend no|yes|mod [no] - --enable-monitor enable monitor backend no|yes|mod [yes] - --enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] - --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-sock enable sock backend no|yes|mod [no] - --enable-sql enable sql backend no|yes|mod [no] - --enable-wt enable WiredTiger backend no|yes|mod [no] + --enable-backends enable all available backends no|yes|mod + --enable-dnssrv enable dnssrv 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] + --enable-asyncmeta enable asynchronous metadirectory backend no|yes|mod [no] + --enable-monitor enable monitor backend no|yes|mod [yes] + --enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] + --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-sock enable sock backend no|yes|mod [no] + --enable-sql enable sql backend no|yes|mod [no] + --enable-wt enable WiredTiger 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 [no] - --enable-auditlog Audit Logging overlay no|yes|mod [no] - --enable-autoca Automatic Certificate Authority overlay no|yes|mod [no] - --enable-collect Collect overlay no|yes|mod [no] - --enable-constraint Attribute Constraint overlay no|yes|mod [no] - --enable-dds Dynamic Directory Services overlay no|yes|mod [no] - --enable-deref Dereference overlay no|yes|mod [no] - --enable-dyngroup Dynamic Group overlay no|yes|mod [no] - --enable-dynlist Dynamic List overlay no|yes|mod [no] - --enable-memberof Reverse Group Membership 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-seqmod Sequential Modify overlay no|yes|mod [no] - --enable-sssvlv ServerSideSort/VLV 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] - --enable-valsort Value Sorting overlay no|yes|mod [no] + --enable-overlays enable all available overlays no|yes|mod + --enable-accesslog In-Directory Access Logging overlay no|yes|mod [no] + --enable-auditlog Audit Logging overlay no|yes|mod [no] + --enable-autoca Automatic Certificate Authority overlay no|yes|mod [no] + --enable-collect Collect overlay no|yes|mod [no] + --enable-constraint Attribute Constraint overlay no|yes|mod [no] + --enable-dds Dynamic Directory Services overlay no|yes|mod [no] + --enable-deref Dereference overlay no|yes|mod [no] + --enable-dyngroup Dynamic Group overlay no|yes|mod [no] + --enable-dynlist Dynamic List overlay no|yes|mod [no] + --enable-memberof Reverse Group Membership 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-seqmod Sequential Modify overlay no|yes|mod [no] + --enable-sssvlv ServerSideSort/VLV 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] + --enable-valsort Value Sorting overlay no|yes|mod [no] Library Generation & Linking Options --enable-static[=PKGS] build static libraries [default=yes] @@ -1603,13 +1603,15 @@ 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|openssl|gnutls [auto] + --with-cyrus-sasl with Cyrus SASL support [auto] + --with-fetch with fetch(3) URL support [auto] + --with-threads with threads library auto|nt|posix|pth|lwp|manual [auto] + --with-tls with TLS/SSL support auto|openssl|gnutls [auto] --with-yielding-select with implicitly yielding select [auto] - --with-mp with multiple precision statistics auto|longlong|long|bignum|gmp [auto] - --with-odbc with specific ODBC support iodbc|unixodbc|odbc32|auto [auto] + --with-mp with multiple precision statistics + auto|longlong|long|bignum|gmp [auto] + --with-odbc with specific ODBC support + iodbc|unixodbc|odbc32|auto [auto] --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-aix-soname=aix|svr4|both @@ -3113,7 +3115,7 @@ fi if test "${with_threads+set}" = set; then : withval=$with_threads; ol_arg=invalid - for ol_val in auto nt posix mach pth lwp yes no manual ; do + for ol_val in auto nt posix pth lwp yes no manual ; do if test "$withval" = "$ol_val" ; then ol_arg="$ol_val" fi @@ -3214,11 +3216,23 @@ fi +SlapdOptions="dynacl \ + aci \ + cleartext \ + crypt \ + spasswd \ + modules \ + rlookups \ + slapi \ + slp \ + wrappers" + # Check whether --enable-xxslapdoptions was given. if test "${enable_xxslapdoptions+set}" = set; then : enableval=$enable_xxslapdoptions; fi + # OpenLDAP --enable-slapd # Check whether --enable-slapd was given. @@ -4387,17 +4401,18 @@ fi -# validate options if test $ol_enable_slapd = no ; then - if test $ol_enable_slapi = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-slapi argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-slapi argument" >&2;} - fi - case "$ol_enable_backends" in yes | mod) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-backends argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-backends argument" >&2;} - esac - for i in $Backends; do + + for i in $SlapdOptions; do + eval "ol_tmp=\$ol_enable_$i" + if test $ol_tmp = yes ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-$i argument" >&5 +$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;} + eval "ol_enable_$i=no" + fi + done + + for i in $Backends $Overlays; do eval "ol_tmp=\$ol_enable_$i" if test $ol_tmp != no ; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-$i argument" >&5 @@ -4405,76 +4420,45 @@ $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;} eval "ol_enable_$i=no" fi done - if test $ol_enable_modules = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-modules argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-modules argument" >&2;} - fi - if test $ol_enable_wrappers = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-wrappers argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-wrappers argument" >&2;} - fi - if test $ol_enable_rlookups = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-rlookups argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-rlookups argument" >&2;} - fi - if test $ol_enable_dynacl = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-dynacl argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-dynacl argument" >&2;} - fi - if test $ol_enable_aci != no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-aci argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-aci argument" >&2;} - fi - case "$ol_enable_overlays" in yes | mod) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-overlays argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-overlays argument" >&2;} - esac - for i in $Overlays; do - eval "ol_tmp=\$ol_enable_$i" - if test $ol_tmp != no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-$i argument" >&5 -$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;} - eval "ol_enable_$i=no" +else + + if test $ol_enable_modules = no; then + ol_any_backend=no + for i in $Backends; do + eval "ol_tmp=\$ol_enable_$i" + if test $ol_tmp = yes; then + ol_any_backend=yes + fi + done + + if test $ol_any_backend = no; then + as_fn_error $? "slapd requires a backend" "$LINENO" 5 fi - done - - # force settings to no - ol_enable_slapi=no - - ol_enable_backends= - ol_enable_overlays= - ol_enable_modules=no - ol_enable_rlookups=no - ol_enable_dynacl=no - ol_enable_aci=no - ol_enable_wrappers=no - -elif test $ol_enable_modules != yes && - test $ol_enable_dnssrv = no && - test $ol_enable_ldap = no && - test $ol_enable_mdb = no && - test $ol_enable_meta = no && - test $ol_enable_asyncmeta = no && - test $ol_enable_monitor = no && - test $ol_enable_ndb = no && - test $ol_enable_null = no && - test $ol_enable_passwd = no && - test $ol_enable_perl = no && - test $ol_enable_relay = no && - test $ol_enable_shell = no && - test $ol_enable_sock = no && - test $ol_enable_sql = no && - test $ol_enable_wt = no ; then - - if test $ol_enable_slapd = yes ; then - as_fn_error $? "slapd requires a backend" "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: skipping slapd, no backend specified" >&5 -$as_echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;} - ol_enable_slapd=no fi fi +if test $ol_enable_aci = yes ; then + if test $ol_enable_dynacl = no ; then + as_fn_error $? "--enable-aci requires --enable-dynacl" "$LINENO" 5 + fi +elif test $ol_enable_aci = mod ; then + as_fn_error $? "ACI build as dynamic module not supported (yet)" "$LINENO" 5 +fi + +if test $ol_enable_modules = yes ; then + if test $ol_enable_dynamic = no ; then + as_fn_error $? "--enable-modules requires --enable-dynamic" "$LINENO" 5 + fi + ol_enable_dynamic=yes +fi + +if test $ol_enable_spasswd = yes ; then + if test $ol_with_cyrus_sasl = no ; then + as_fn_error $? "--enable-spasswd requires --with-cyrus-sasl" "$LINENO" 5 + fi + ol_with_cyrus_sasl=yes +fi + if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then as_fn_error $? "--enable-meta requires --enable-ldap" "$LINENO" 5 fi @@ -4483,13 +4467,6 @@ if test $ol_enable_asyncmeta/$ol_enable_ldap = yes/no ; then as_fn_error $? "--enable-asyncmeta requires --enable-ldap" "$LINENO" 5 fi -if test $ol_enable_spasswd = yes ; then - if test $ol_with_cyrus_sasl = no ; then - as_fn_error $? "options require --with-cyrus-sasl" "$LINENO" 5 - fi - ol_with_cyrus_sasl=yes -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 $as_echo "done" >&6; } @@ -14886,12 +14863,6 @@ esac ol_link_modules=no WITH_MODULES_ENABLED=no if test $ol_enable_modules != no ; then - if test $ol_enable_dynamic = no; then - as_fn_error $? "--enable-modules requires --enable-dynamic" "$LINENO" 5 - elif test $ol_enable_dynamic = auto; then - ol_enable_dynamic=yes - fi - for ac_header in ltdl.h do : ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default" @@ -24478,7 +24449,7 @@ $as_echo "#define OLD_DEBUG 1" >>confdefs.h $as_echo "#define LDAP_DEBUG 1" >>confdefs.h fi -if test "$ol_enable_syslog" = yes ; then +if test "$ol_enable_syslog" != no ; then $as_echo "#define LDAP_SYSLOG 1" >>confdefs.h @@ -24519,11 +24490,6 @@ $as_echo "#define SLAPD_RLOOKUPS 1" >>confdefs.h fi if test "$ol_enable_aci" != no ; then - if test $ol_enable_dynacl = no ; then - ol_enable_dynacl=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ACIs need dynacl" >&5 -$as_echo "$as_me: WARNING: ACIs need dynacl" >&2;} - fi if test "$ol_enable_aci" = mod ; then MFLAG=SLAPD_MOD_DYNAMIC as_fn_error $? "ACI build as dynamic module not supported (yet)" "$LINENO" 5