From 34e8b1b2f072a0bcd8bed200703bdef8e57679fe Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 25 Oct 2025 13:42:27 +0100 Subject: [PATCH 1/2] Update compiler flags for homebrew packages on Apple silicon Add /opt/homebrew/{include,lib} flags for apple silicon macs, which are not included as default search paths by Clang/GCC. (Homebrew uses /usr/local/{include,lib} on intel macs) --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f9346fdf..b716a349 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,11 @@ AC_DEFINE_UNQUOTED([PACKAGE_STATUS], ["$PACKAGE_STATUS"], [Status of this build] AS_IF([test "x$PLATFORM" = xcygwin], [AC_DEFINE([PLATFORM_CYGWIN], [1], [Cygwin])]) AS_IF([test "x$PLATFORM" = xosx], - [AC_DEFINE([PLATFORM_OSX], [1], [OSx])]) + [AC_DEFINE([PLATFORM_OSX], [1], [OSx]) + # Apple silicon homebrew flags + AC_CHECK_FILE([/opt/homebrew/include], + [AM_CFLAGS="$AM_CFLAGS -I/opt/homebrew/include" + AM_LDFLAGS="$AM_LDFLAGS -L/opt/homebrew/lib"])]) ## Environment variables AC_ARG_VAR([PYTHON_FRAMEWORK], [Set base directory for Python Framework]) From 5ac6ab71a2ba3b6e4d5986b6f74df46a3582a4d6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Oct 2025 11:49:32 +0000 Subject: [PATCH 2/2] Use PKG_CHECK_MODULES to check for libgcrypt On macOS running ./configure --enable-omemo was failing to find gcrypt despite being installed. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b716a349..d9a5cc58 100644 --- a/configure.ac +++ b/configure.ac @@ -336,9 +336,9 @@ AM_CONDITIONAL([BUILD_OMEMO], [false]) if test "x$enable_omemo" != xno; then OMEMO_LIBS="" PKG_CHECK_MODULES([libsignal], [libsignal-protocol-c >= 2.3.2], - [OMEMO_LIBS="-lsignal-protocol-c" - AC_CHECK_LIB([gcrypt], [gcry_md_extract], - [OMEMO_LIBS="-lgcrypt $OMEMO_LIBS" + [OMEMO_LIBS="$libsignal_LIBS" + PKG_CHECK_MODULES([gcrypt], [libgcrypt >= 1.7.0], + [OMEMO_LIBS="$gcrypt_LIBS $OMEMO_LIBS" AM_CONDITIONAL([BUILD_OMEMO], [true])], [AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])], [AC_MSG_NOTICE([libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled])])