From 5747936fd5163857a706871b5530b52bd613b88c Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 9 May 2024 17:09:19 +0000
Subject: [PATCH] ITS#10214 - Regenerate configure

---
 configure | 80 ++++++++-----------------------------------------------
 1 file changed, 11 insertions(+), 69 deletions(-)

diff --git a/configure b/configure
index 6a73d378e7..9b7c83fd1f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: 642b439ed2a275613000b083ad397d6db0b4b118 .
+# From configure.ac Id: 381cb601a24a5cba9f1a5a52472d1c5e6b748a76 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.71.
 #
@@ -669,7 +669,6 @@ SLAPD_SQL_LIBS
 SLAPD_SQL_LDFLAGS
 SLAPD_GMP_LIBS
 SLAPD_SLP_LIBS
-SYSTEMD_LIBS
 ARGON2_LIBS
 AUTH_LIBS
 LIBSLAPI
@@ -749,7 +748,6 @@ DO_VERSIONED_SYMBOLS
 OL_VERSIONED_SYMBOLS
 BUILD_LIBS_DYNAMIC
 BUILD_THREAD
-WITH_SYSTEMD
 WITH_ACI_ENABLED
 WITH_MODULES_ENABLED
 WITH_TLS
@@ -5203,7 +5201,6 @@ MODULES_LIBS=
 SLAPI_LIBS=
 LIBSLAPI=
 AUTH_LIBS=
-SYSTEMD_LIBS=
 
 SLAPD_SLP_LIBS=
 SLAPD_GMP_LIBS=
@@ -23736,9 +23733,7 @@ printf "%s\n" "$as_me: WARNING: Strong authentication not supported!" >&2;}
 	fi
 fi
 
-WITH_SYSTEMD=no
 systemdsystemunitdir=
-ol_link_systemd=no
 if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then
 	if test $ol_with_systemd != no ; then
 		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: servers disabled, ignoring --with-systemd=$ol_with_systemd argument" >&5
@@ -23746,7 +23741,8 @@ printf "%s\n" "$as_me: WARNING: servers disabled, ignoring --with-systemd=$ol_wi
 		ol_with_systemd=no
 	fi
 fi
-if test $ol_with_systemd != no ; then
+
+if test $ol_with_systemd = auto; then
 	ac_fn_c_check_header_compile "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
 if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes
 then :
@@ -23754,66 +23750,15 @@ then :
 
 fi
 
-
 	if test $ac_cv_header_systemd_sd_daemon_h = yes; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sd_notify in -lsystemd" >&5
-printf %s "checking for sd_notify in -lsystemd... " >&6; }
-if test ${ac_cv_lib_systemd_sd_notify+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsystemd  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char sd_notify ();
-int
-main (void)
-{
-return sd_notify ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_systemd_sd_notify=yes
-else $as_nop
-  ac_cv_lib_systemd_sd_notify=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_sd_notify" >&5
-printf "%s\n" "$ac_cv_lib_systemd_sd_notify" >&6; }
-if test "x$ac_cv_lib_systemd_sd_notify" = xyes
-then :
-  ol_link_systemd="-lsystemd"
-fi
-
+		ol_with_systemd=yes
 	fi
+fi
 
-	if test $ol_link_systemd = no ; then
-		if test $ol_with_systemd != auto ; then
-			as_fn_error $? "Could not locate systemd" "$LINENO" 5
-		else
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not locate systemd" >&5
-printf "%s\n" "$as_me: WARNING: Could not locate systemd" >&2;}
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: systemd service notification not supported!" >&5
-printf "%s\n" "$as_me: WARNING: systemd service notification not supported!" >&2;}
-		fi
-	else
+if test $ol_with_systemd = yes ; then
 
 printf "%s\n" "#define HAVE_SYSTEMD 1" >>confdefs.h
 
-		SYSTEMD_LIBS="$ol_link_systemd"
-		WITH_SYSTEMD=yes
-
 
 if test -n "$systemdsystemunitdir"; then
     pkg_cv_systemdsystemunitdir="$systemdsystemunitdir"
@@ -23838,12 +23783,11 @@ if test "x$systemdsystemunitdir" = x""
 then :
 
 fi
-		if test -z "$systemdsystemunitdir"; then
-			if test -d /usr/lib/systemd/system; then
-				systemdsystemunitdir=/usr/lib/systemd/system
-			else
-				systemdsystemunitdir=/lib/systemd/system
-			fi
+	if test -z "$systemdsystemunitdir"; then
+		if test -d /usr/lib/systemd/system; then
+			systemdsystemunitdir=/usr/lib/systemd/system
+		else
+			systemdsystemunitdir=/lib/systemd/system
 		fi
 	fi
 fi
@@ -26994,8 +26938,6 @@ fi
 
 
 
-
-