configure.ac | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 54b81f8e6c6b4578a57571b57f56a4e4c84c2e97
Author: Jan Holesovsky <[email protected]>
AuthorDate: Mon Oct 21 10:02:59 2024 +0200
Commit: Tomaž Vajngerl <[email protected]>
CommitDate: Tue Dec 2 08:45:46 2025 +0100
pkg-config from Homebrew seems not to cause trouble
Change-Id: I26e00cffe1eead5b6313bcf471aeecbfddba3388
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194561
Reviewed-by: Tomaž Vajngerl <[email protected]>
Tested-by: Jenkins CollaboraOffice <[email protected]>
diff --git a/configure.ac b/configure.ac
index 4e83ec170c8b..be46fe02fa18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6978,6 +6978,8 @@ if test $_os = Darwin; then
if test -n "$PKG_CONFIG"; then
if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l
/usr/bin/pkg-config | $GREP -q Mono.framework; then
AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please
remove or hide $PKG_CONFIG])
+ elif test "$PKG_CONFIG" = "/opt/homebrew/bin/pkg-config"; then
+ AC_MSG_RESULT([yes, from Homebrew. This is OK.])
else
if test "$enable_bogus_pkg_config" = "yes"; then
AC_MSG_RESULT([yes, user-approved from unknown origin.])
