From 49e61a23cdc1d082064c9c139f4662b9fa615232 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 18 Apr 2017 08:23:18 -0700 Subject: [PATCH] Regenerate configure --- configure | 64 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 9981177afc..620260ea05 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: 97a7d8d69c5231a056a85cedd1c591b0c2e46daa . +# From configure.in Id: 41cd0a5df892091d70e4deae4b86a9d022f4302b . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65. # @@ -803,6 +803,7 @@ BUILD_DENYOP BUILD_DDS BUILD_CONSTRAINT BUILD_COLLECT +BUILD_AUTOCA BUILD_AUDITLOG BUILD_ACCESSLOG BUILD_WT @@ -997,6 +998,7 @@ enable_xxslapoverlays enable_overlays enable_accesslog enable_auditlog +enable_autoca enable_collect enable_constraint enable_dds @@ -1699,6 +1701,7 @@ 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] @@ -4459,6 +4462,7 @@ fi Overlays="accesslog \ auditlog \ + autoca \ collect \ constraint \ dds \ @@ -4547,6 +4551,28 @@ fi # end --enable-auditlog +# OpenLDAP --enable-autoca + + # Check whether --enable-autoca was given. +if test "${enable_autoca+set}" = set; then : + enableval=$enable_autoca; + ol_arg=invalid + for ol_val in no yes mod ; do + if test "$enableval" = "$ol_val" ; then + ol_arg="$ol_val" + fi + done + if test "$ol_arg" = "invalid" ; then + as_fn_error "bad value $enableval for --enable-autoca" "$LINENO" 5 + fi + ol_enable_autoca="$ol_arg" + +else + ol_enable_autoca=${ol_enable_overlays:-no} +fi + +# end --enable-autoca + # OpenLDAP --enable-collect # Check whether --enable-collect was given. @@ -5155,6 +5181,7 @@ BUILD_WT=no BUILD_ACCESSLOG=no BUILD_AUDITLOG=no +BUILD_AUTOCA=no BUILD_CONSTRAINT=no BUILD_DDS=no BUILD_DENYOP=no @@ -6971,7 +6998,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6974 "configure"' > conftest.$ac_ext + echo '#line 7001 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8652,11 +8679,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8655: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8659: \$? = $ac_status" >&5 + echo "$as_me:8686: \$? = $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. @@ -8914,11 +8941,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8917: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8944: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8921: \$? = $ac_status" >&5 + echo "$as_me:8948: \$? = $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. @@ -8976,11 +9003,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8979: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9006: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8983: \$? = $ac_status" >&5 + echo "$as_me:9010: \$? = $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 @@ -10848,7 +10875,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<_ACEOF +#define SLAPD_OVER_AUTOCA $MFLAG +_ACEOF + +fi + if test "$ol_enable_collect" != no ; then BUILD_COLLECT=$ol_enable_collect if test "$ol_enable_collect" = mod ; then @@ -25077,6 +25120,7 @@ fi + # Check whether --with-xxinstall was given. -- 2.39.5