devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
Conversation 6 Commits 407 Files Changed 303 +5002 -27411
200 changed files with 5002 additions and 27411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8e9c29e4f - Show all commits

12
configure.ac
View File

@@ -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])
@@ -345,9 +349,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])])