From e7df19fd5a2f4923923a33d4b5695bf471719afb Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 13 Jul 2009 15:45:49 +0000 Subject: [PATCH] Add sssvlv overlay --- configure | 72 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 1c2f20f069..7aa149bd9d 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.699 2009/07/04 23:42:26 hyc Exp . +# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.701 2009/07/13 13:45:25 hyc Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -918,6 +918,7 @@ BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD +BUILD_SSSVLV BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE @@ -1599,7 +1600,8 @@ SLAPD Overlay Options: --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 [yes] + --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] @@ -3753,6 +3755,7 @@ Overlays="accesslog \ retcode \ rwm \ seqmod \ + sssvlv \ syncprov \ translucent \ unique \ @@ -4140,11 +4143,35 @@ echo "$as_me: error: bad value $enableval for --enable-seqmod" >&2;} ol_enable_seqmod="$ol_arg" else - ol_enable_seqmod=${ol_enable_overlays:-yes} + ol_enable_seqmod=${ol_enable_overlays:-no} fi # end --enable-seqmod +# OpenLDAP --enable-sssvlv + + # Check whether --enable-sssvlv was given. +if test "${enable_sssvlv+set}" = set; then + enableval=$enable_sssvlv; + 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 + { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-sssvlv" >&5 +echo "$as_me: error: bad value $enableval for --enable-sssvlv" >&2;} + { (exit 1); exit 1; }; } + fi + ol_enable_sssvlv="$ol_arg" + +else + ol_enable_sssvlv=${ol_enable_overlays:-no} +fi + +# end --enable-sssvlv + # OpenLDAP --enable-syncprov # Check whether --enable-syncprov was given. @@ -4464,6 +4491,7 @@ BUILD_REFINT=no BUILD_RETCODE=no BUILD_RWM=no BUILD_SEQMOD=no +BUILD_SSSVLV=no BUILD_SYNCPROV=no BUILD_TRANSLUCENT=no BUILD_UNIQUE=no @@ -6436,7 +6464,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6439 "configure"' > conftest.$ac_ext + echo '#line 6467 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8505,11 +8533,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:8508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8536: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8512: \$? = $ac_status" >&5 + echo "$as_me:8540: \$? = $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. @@ -8767,11 +8795,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:8770: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8798: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8774: \$? = $ac_status" >&5 + echo "$as_me:8802: \$? = $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. @@ -8829,11 +8857,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:8832: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8860: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8836: \$? = $ac_status" >&5 + echo "$as_me:8864: \$? = $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 @@ -11040,7 +11068,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_SSSVLV $MFLAG +_ACEOF + +fi + if test "$ol_enable_syncprov" != no ; then BUILD_SYNCPROV=$ol_enable_syncprov if test "$ol_enable_syncprov" = mod ; then @@ -38875,6 +38919,7 @@ fi + # Check whether --with-xxinstall was given. @@ -39701,6 +39746,7 @@ BUILD_REFINT!$BUILD_REFINT$ac_delim BUILD_RETCODE!$BUILD_RETCODE$ac_delim BUILD_RWM!$BUILD_RWM$ac_delim BUILD_SEQMOD!$BUILD_SEQMOD$ac_delim +BUILD_SSSVLV!$BUILD_SSSVLV$ac_delim BUILD_SYNCPROV!$BUILD_SYNCPROV$ac_delim BUILD_TRANSLUCENT!$BUILD_TRANSLUCENT$ac_delim BUILD_UNIQUE!$BUILD_UNIQUE$ac_delim @@ -39741,7 +39787,7 @@ SLAPD_SQL_INCLUDES!$SLAPD_SQL_INCLUDES$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -- 2.39.5