From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 16 Apr 2024 16:09:35 +0000 (+0000)
Subject: ITS#10161 - regenerate configure
X-Git-Tag: OPENLDAP_REL_ENG_2_6_8~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66a961aaa357dfc585ff2df3aa341adf8d495bff;p=thirdparty%2Fopenldap.git

ITS#10161 - regenerate configure
---

diff --git a/configure b/configure
index 728af9d0c7..f2c75d2b74 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: 9d37fff6d98b298663abe1f15cf9cc44b936f43c .
+# From configure.ac Id: 20de381444a398cd36df98bf3a9e5f3ab79ce24f .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -885,6 +885,7 @@ enable_dyngroup
 enable_dynlist
 enable_homedir
 enable_memberof
+enable_nestgroup
 enable_otp
 enable_ppolicy
 enable_proxycache
@@ -1590,6 +1591,7 @@ SLAPD Overlay Options:
   --enable-dynlist        Dynamic List overlay no|yes|mod [no]
   --enable-homedir        Home Directory Management overlay no|yes|mod [no]
   --enable-memberof       Reverse Group Membership overlay no|yes|mod [no]
+  --enable-nestgroup      Nested Group overlay no|yes|mod [no]
   --enable-otp            OTP 2-factor authentication overlay no|yes|mod [no]
   --enable-ppolicy        Password Policy overlay no|yes|mod [no]
   --enable-proxycache     Proxy Cache overlay no|yes|mod [no]
@@ -3818,6 +3820,7 @@ Overlays="accesslog \
 	dynlist \
 	homedir \
 	memberof \
+	nestgroup \
 	otp \
 	ppolicy \
 	proxycache \
@@ -4101,6 +4104,28 @@ fi
 
 # end --enable-memberof
 
+# OpenLDAP --enable-nestgroup
+
+	# Check whether --enable-nestgroup was given.
+if test "${enable_nestgroup+set}" = set; then :
+  enableval=$enable_nestgroup;
+	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-nestgroup" "$LINENO" 5
+	fi
+	ol_enable_nestgroup="$ol_arg"
+
+else
+  	ol_enable_nestgroup=${ol_enable_overlays:-no}
+fi
+
+# end --enable-nestgroup
+
 # OpenLDAP --enable-otp
 
 	# Check whether --enable-otp was given.
@@ -13826,8 +13851,22 @@ fi
 		fi
 
 	else
-		PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
-		PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/ -lc / /' -e 's/ -lc$//'`"
+		PERL_CPPFLAGS=""
+		for opt in `$PERLBIN -MExtUtils::Embed -e ccopts`; do
+			case "$opt" in
+			"-flto=auto" | "-Wall" )
+				continue;;
+			esac
+			PERL_CPPFLAGS="$PERL_CPPFLAGS $opt"
+		done
+		PERL_LDFLAGS=""
+		for opt in `$PERLBIN" -MExtUtils::Embed -e ldopts`; do
+			case "$opt" in
+			"-lc" )
+				continue;;
+			esac
+			PERL_LDFLAGS="$PERL_LDFLAGS $opt"
+		done
 
 		if test x"$ol_enable_perl" = "xyes" ; then
 			SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS"
@@ -25121,6 +25160,21 @@ _ACEOF
 
 fi
 
+if test "$ol_enable_nestgroup" != no ; then
+	if test "$ol_enable_nestgroup" = mod ; then
+		MFLAG=SLAPD_MOD_DYNAMIC
+		SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS nestgroup.la"
+	else
+		MFLAG=SLAPD_MOD_STATIC
+		SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS nestgroup.o"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define SLAPD_OVER_NESTGROUP $MFLAG
+_ACEOF
+
+fi
+
 if test "$ol_enable_otp" != no ; then
 	if test $ol_with_tls = no ; then
 		as_fn_error $? "--enable-otp=$ol_enable_otp requires --with-tls" "$LINENO" 5
diff --git a/include/portable.hin b/include/portable.hin
index e8ac8a037b..008be73ab3 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -987,6 +987,9 @@
 /* define for Reverse Group Membership overlay */
 #undef SLAPD_OVER_MEMBEROF
 
+/* define for Nested Group overlay */
+#undef SLAPD_OVER_NESTGROUP
+
 /* define for OTP 2-factor Authentication overlay */
 #undef SLAPD_OVER_OTP