From 9ce5442b40e7ae5725a306eafeff96951e7bdf29 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 30 Oct 2025 20:44:47 -0500 Subject: [PATCH] Adjusted cf3_with_library to handle case where --with-feature is not defined In the case of pam and lmdb, due to checks for brew, --with-pam and --with-lmdb, if not specified by the user, are not defined. This resulted in -R/lib being added to LMDB_LDFLAGS and PAM_LDFLAGS and by appending: CORE_LDFLAGS. This -R/lib adds an RPATH which rhel-10 rpmbuild complains about since it is a standard path that should not be included in RPATHS. Ticket: ENT-13016 Changelog: none (cherry picked from commit 2264624af9a47e85d6d44b92c8cb8fc2463b40ff) (cherry picked from commit 2f1ffa847958b23a237770fcebd2aff3bf7a631c) --- m4/cf3_with_library.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/cf3_with_library.m4 b/m4/cf3_with_library.m4 index ee47d7d11d..dde7181dfb 100644 --- a/m4/cf3_with_library.m4 +++ b/m4/cf3_with_library.m4 @@ -84,7 +84,8 @@ AC_DEFUN([CF3_WITH_LIBRARY], if test "x$with_[$1]" != xyes && test "x$with_[$1]" != xcheck && test "x$with_[$1]" != x/usr && - test "x$with_[$1]" != x/ + test "x$with_[$1]" != x/ && + test -n "$with_[$1]" then ULN[]_LDFLAGS="$ULN[]_LDFLAGS -R$with_[$1]/lib" fi