X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=523d0d02c6d1a2c5ff2829796c2313cb4951a7c4;hb=ef0163c198f54e82b1f8cd7b6b44e29b39fa16aa;hp=e0d3d28f5304ffb7335b41df90c30203beafabea;hpb=4b8485c47aecdbab39db77a4ec21bf61d18ca0cf;p=openldap

diff --git a/configure.in b/configure.in
index e0d3d28f53..523d0d02c6 100644
--- a/configure.in
+++ b/configure.in
@@ -242,8 +242,6 @@ OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl	  with Cyrus SASL support],
 	auto, [auto yes no] )
 OL_ARG_WITH(fetch,[  --with-fetch		  with fetch(3) URL support],
 	auto, [auto yes no] )
-OL_ARG_WITH(gssapi,[  --with-gssapi		  with GSSAPI support],
-	auto, [auto yes no] )
 OL_ARG_WITH(threads,[  --with-threads	  with threads],
 	auto, [auto nt posix mach pth lwp yes no manual] )
 OL_ARG_WITH(tls,[  --with-tls		  with TLS/SSL support auto|openssl|gnutls|moznss],
@@ -348,6 +346,7 @@ Overlays="accesslog \
 	retcode \
 	rwm \
 	seqmod \
+	sssvlv \
 	syncprov \
 	translucent \
 	unique \
@@ -387,7 +386,9 @@ OL_ARG_ENABLE(retcode,[    --enable-retcode	  Return Code testing overlay],
 OL_ARG_ENABLE(rwm,[    --enable-rwm       	  Rewrite/Remap overlay],
 	no, [no yes mod], ol_enable_overlays)
 OL_ARG_ENABLE(seqmod,[    --enable-seqmod	  Sequential Modify overlay],
-	yes, [no yes mod], ol_enable_overlays)
+	no, [no yes mod], ol_enable_overlays)
+OL_ARG_ENABLE(sssvlv,[    --enable-sssvlv	  ServerSideSort/VLV overlay],
+	no, [no yes mod], ol_enable_overlays)
 OL_ARG_ENABLE(syncprov,[    --enable-syncprov	  Syncrepl Provider overlay],
 	yes, [no yes mod], ol_enable_overlays)
 OL_ARG_ENABLE(translucent,[    --enable-translucent  Translucent Proxy overlay],
@@ -556,6 +557,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
@@ -581,7 +583,6 @@ SLAPD_SQL_INCLUDES=
 KRB4_LIBS=
 KRB5_LIBS=
 SASL_LIBS=
-GSSAPI_LIBS=
 TLS_LIBS=
 MODULES_LIBS=
 SLAPI_LIBS=
@@ -1145,63 +1146,6 @@ if test $ol_enable_local != no ; then
 	fi
 fi
 
-dnl ----------------------------------------------------------------
-dnl GSSAPI
-ol_link_gssapi=no
-
-case $ol_with_gssapi in yes | auto)
-
-	ol_header_gssapi=no
-	AC_CHECK_HEADERS(gssapi/gssapi.h)
-	if test $ac_cv_header_gssapi_gssapi_h = yes ; then
-		ol_header_gssapi=yes
-	else
-		AC_CHECK_HEADERS(gssapi.h)
-		if test $ac_cv_header_gssapi_h = yes ; then
-			ol_header_gssapi=yes
-		fi
-
-		dnl## not every gssapi has gss_oid_to_str()
-		dnl## as it's not defined in the GSSAPI V2 API
-		dnl## anymore
-		saveLIBS="$LIBS"
-		LIBS="$LIBS $GSSAPI_LIBS"
-		AC_CHECK_FUNCS(gss_oid_to_str)
-		LIBS="$saveLIBS"
-	fi
-
-	if test $ol_header_gssapi = yes ; then
-		dnl## we check for gss_wrap
-		dnl## as it's new to the GSSAPI V2 API
-		AC_CHECK_LIB(gssapi, gss_wrap,
-		             [ol_link_gssapi=yes;GSSAPI_LIBS="-lgssapi"],
-		             [ol_link_gssapi=no])
-		if test $ol_link_gssapi != yes ; then
-			AC_CHECK_LIB(gssapi_krb5, gss_wrap,
-			             [ol_link_gssapi=yes;GSSAPI_LIBS="-lgssapi_krb5"],
-			             [ol_link_gssapi=no])
-		fi
-		if test $ol_link_gssapi != yes ; then
-			AC_CHECK_LIB(gss, gss_wrap,
-			             [ol_link_gssapi=yes;GSSAPI_LIBS="-lgss"],
-			             [ol_link_gssapi=no])
-		fi
-	fi
-
-	;;
-esac
-
-WITH_GSSAPI=no
-if test $ol_link_gssapi = yes; then
-	AC_DEFINE(HAVE_GSSAPI, 1, [define if you have GSSAPI])
-	WITH_GSSAPI=yes
-elif test $ol_with_gssapi = auto ; then
-	AC_MSG_WARN([Could not locate GSSAPI package])
-	AC_MSG_WARN([GSSAPI authentication not supported!])
-elif test $ol_with_gssapi = yes ; then
-	AC_MSG_ERROR([GSSAPI detection failed])
-fi
-
 dnl ----------------------------------------------------------------
 dnl TLS/SSL
 	
@@ -2477,7 +2421,6 @@ AC_CHECK_FUNCS(			\
 	geteuid			\
 	getgrgid		\
 	gethostname		\
-	getpass			\
 	getpassphrase		\
 	getpwuid		\
 	getpwnam		\
@@ -3022,6 +2965,18 @@ if test "$ol_enable_seqmod" != no ; then
 	AC_DEFINE_UNQUOTED(SLAPD_OVER_SEQMOD,$MFLAG,[define for Sequential Modify overlay])
 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"
+	else
+		MFLAG=SLAPD_MOD_STATIC
+		SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS sssvlv.o"
+	fi
+	AC_DEFINE_UNQUOTED(SLAPD_OVER_SSSVLV,$MFLAG,[define for ServerSideSort/VLV overlay])
+fi
+
 if test "$ol_enable_syncprov" != no ; then
 	BUILD_SYNCPROV=$ol_enable_syncprov
 	if test "$ol_enable_syncprov" = mod ; then
@@ -3140,6 +3095,7 @@ dnl overlays
   AC_SUBST(BUILD_RETCODE)
   AC_SUBST(BUILD_RWM)
   AC_SUBST(BUILD_SEQMOD)
+  AC_SUBST(BUILD_SSSVLV)
   AC_SUBST(BUILD_SYNCPROV)
   AC_SUBST(BUILD_TRANSLUCENT)
   AC_SUBST(BUILD_UNIQUE)
@@ -3170,7 +3126,6 @@ AC_SUBST(MOD_PERL_LDFLAGS)
 AC_SUBST(KRB4_LIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(SASL_LIBS)
-AC_SUBST(GSSAPI_LIBS)
 AC_SUBST(TLS_LIBS)
 AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)