From 20add4fc2bd37b9847a4812ce5cd4cf5454fb1aa Mon Sep 17 00:00:00 2001
From: "Erlend E. Aasland" <erlend.aasland@protonmail.com>
Date: Fri, 2 Jun 2023 14:25:24 +0200
Subject: [PATCH 1/2] gh-90005: Don't link with libbsd if not needed

Restore pre gh-29696 behaviour
---
 configure    | 8 ++++++--
 configure.ac | 5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index d2a667f62a8ebe..7f17fe42120a2c 100755
--- a/configure
+++ b/configure
@@ -18968,13 +18968,15 @@ fi
 printf "%s\n" "$ac_cv_flock_decl" >&6; }
 if test "x$ac_cv_flock_decl" = xyes
 then :
+
+  for ac_func in flock
+do :
   ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
 if test "x$ac_cv_func_flock" = xyes
 then :
   printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
 
-fi
-
+else $as_nop
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
 printf %s "checking for flock in -lbsd... " >&6; }
 if test ${ac_cv_lib_bsd_flock+y}
@@ -19015,7 +19017,9 @@ then :
   FCNTL_LIBS="-lbsd"
 fi
 
+fi
 
+done
 fi
 
 
diff --git a/configure.ac b/configure.ac
index f8f428aaaaf366..3d03fa6f611d38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4908,9 +4908,8 @@ AC_CACHE_CHECK([for flock declaration], [ac_cv_flock_decl],
 ])
 dnl Linking with libbsd may be necessary on AIX for flock function.
 AS_VAR_IF([ac_cv_flock_decl], [yes],
-  AC_CHECK_FUNCS([flock])
-  AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])
-)
+  [AC_CHECK_FUNCS([flock], [],
+    [AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])])])
 
 PY_CHECK_FUNC([getpagesize], [#include <unistd.h>])
 

From 6da38ed283cd3d450781e1199b5799d6d0748c69 Mon Sep 17 00:00:00 2001
From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 09:08:11 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?=
 =?UTF-8?q?rb=5Fit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst     | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst

diff --git a/Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst b/Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst
new file mode 100644
index 00000000000000..0a23fbf0c0fbdd
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst
@@ -0,0 +1 @@
+Fix a regression in :file:`configure` where we could end up unintentionally linking with ``libbsd``.