X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=5bb273375cf646eaddfa45dbbcc703f4ca0f19e2;hb=340503583a766c3cc743d4d8b31cabe17956a0ea;hp=0386502f7e0ca180b18422908ddbf1b46846a46e;hpb=4a3b04966c227db1a19de0c0a32d792ab6351542;p=openldap

diff --git a/configure.in b/configure.in
index 0386502f7e..5bb273375c 100644
--- a/configure.in
+++ b/configure.in
@@ -244,7 +244,6 @@ OL_ARG_ENABLE(sql,[    --enable-sql	  enable sql backend no|yes|mod],
 dnl ----------------------------------------------------------------
 dnl SLAPD Overlay Options
 Overlays="accesslog \
-	allop \
 	denyop \
 	dyngroup \
 	dynlist \
@@ -257,7 +256,8 @@ Overlays="accesslog \
 	rwm \
 	syncprov \
 	translucent \
-	unique"
+	unique \
+	valsort"
 
 AC_ARG_WITH(xxslapoverlays,[
 SLAPD Overlay Options:])
@@ -267,8 +267,6 @@ OL_ARG_ENABLE(overlays,[    --enable-overlays	  enable all available overlays no
 test -n "$ol_enable_overlays" && ol_dflt_overlays="$ol_enable_overlays"
 OL_ARG_ENABLE(accesslog,[    --enable-accesslog	  In-Directory Access Logging overlay no|yes|mod],
 	${ol_dflt_overlays-no}, [no yes mod])
-OL_ARG_ENABLE(allop,[    --enable-allop    	  All Operational attributes overlay no|yes|mod],
-	${ol_dflt_overlays-no}, [no yes mod])
 OL_ARG_ENABLE(denyop,[    --enable-denyop  	  Deny Operation overlay no|yes|mod],
 	${ol_dflt_overlays-no}, [no yes mod])
 OL_ARG_ENABLE(dyngroup,[    --enable-dyngroup	  Dynamic Group overlay no|yes|mod],
@@ -295,6 +293,8 @@ OL_ARG_ENABLE(translucent,[    --enable-translucent  Translucent Proxy overlay n
 	${ol_dflt_overlays-no}, [no yes mod])
 OL_ARG_ENABLE(unique,[    --enable-unique       Attribute Uniqueness overlay no|yes|mod],
 	${ol_dflt_overlays-no}, [no yes mod])
+OL_ARG_ENABLE(valsort,[    --enable-valsort      Value Sorting overlay no|yes|mod],
+	${ol_dflt_overlays-no}, [no yes mod])
 
 
 dnl ----------------------------------------------------------------
@@ -536,6 +536,7 @@ BUILD_RWM=no
 BUILD_SYNCPROV=no
 BUILD_TRANSLUCENT=no
 BUILD_UNIQUE=no
+BUILD_VALSORT=no
 
 SLAPD_STATIC_OVERLAYS=
 SLAPD_DYNAMIC_OVERLAYS=
@@ -2741,7 +2742,7 @@ if test "$ol_enable_relay" != no ; then
 fi
 
 if test "$ol_enable_shell" != no ; then
-	if test "$ol_link_thread" != no ; then
+	if test "$ol_link_threads" != no ; then
 		AC_MSG_WARN([Use of --without-threads is recommended with back-shell])
 	fi
 	BUILD_SLAPD=yes
@@ -2781,18 +2782,6 @@ if test "$ol_enable_accesslog" != no ; then
 	AC_DEFINE_UNQUOTED(SLAPD_OVER_ACCESSLOG,$MFLAG,[define for In-Directory Access Logging overlay])
 fi
 
-if test "$ol_enable_allop" != no ; then
-	BUILD_ALLOP=$ol_enable_allop
-	if test "$ol_enable_aallop" = mod ; then
-		MFLAG=SLAPD_MOD_DYNAMIC
-		SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS allop.la"
-	else
-		MFLAG=SLAPD_MOD_STATIC
-		SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS allop.o"
-	fi
-	AC_DEFINE_UNQUOTED(SLAPD_OVER_ALLOP,$MFLAG,[define for All Operational Attributes overlay])
-fi
-
 if test "$ol_enable_denyop" != no ; then
 	BUILD_DENYOP=$ol_enable_denyop
 	if test "$ol_enable_denyop" = mod ; then
@@ -2950,6 +2939,18 @@ if test "$ol_enable_unique" != no ; then
 	AC_DEFINE_UNQUOTED(SLAPD_OVER_UNIQUE,$MFLAG,[define for Attribute Uniqueness overlay])
 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"
+	else
+		MFLAG=SLAPD_MOD_STATIC
+		SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS valsort.o"
+	fi
+	AC_DEFINE_UNQUOTED(SLAPD_OVER_VALSORT,$MFLAG,[define for Value Sorting overlay])
+fi
+
 if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
 	$BUILD_SLAPD = yes ; then
 	BUILD_SLURPD=yes
@@ -3020,6 +3021,7 @@ dnl overlays
   AC_SUBST(BUILD_SYNCPROV)
   AC_SUBST(BUILD_TRANSLUCENT)
   AC_SUBST(BUILD_UNIQUE)
+  AC_SUBST(BUILD_VALSORT)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)