configure.ac |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b7c8cdb951c7521837e5e2d954a5f9ec85bfcc48
Author:     Jan Holesovsky <[email protected]>
AuthorDate: Mon Oct 21 10:02:59 2024 +0200
Commit:     Tor Lillqvist <[email protected]>
CommitDate: Fri Jan 9 23:01:10 2026 +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]>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196864
    Reviewed-by: Tor Lillqvist <[email protected]>
    Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 83e071ddfcdd..349eb50b29b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7110,6 +7110,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.])

Reply via email to