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

build: remove otr3 support

Browse Source 
All the distributions I checked have libotr 4.1.1 now.
This commit is contained in:
Michael Vetter
2022-02-18 10:09:29 +01:00
parent 3f8720d70f
commit 33106ecf9c
3 changed files with 9 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@@ -299,23 +299,17 @@ fi
dnl feature: otr
AM_CONDITIONAL([BUILD_OTR], [false])
AM_CONDITIONAL([BUILD_OTR3], [false])
AM_CONDITIONAL([BUILD_OTR4], [false])
if test "x$enable_otr" != xno; then
AM_CONDITIONAL([BUILD_OTR], [true])
PKG_CHECK_MODULES([libotr], [libotr >= 4.0],
[AM_CONDITIONAL([BUILD_OTR4], [true])],
[AC_MSG_NOTICE([libotr >= 4.0 not found, checking for libotr-3.x...])
PKG_CHECK_MODULES([libotr], [libotr >= 3.0],
[AM_CONDITIONAL([BUILD_OTR3], [true])],
[AM_CONDITIONAL([BUILD_OTR], [false])])])
AM_COND_IF([BUILD_OTR],
[LIBS="$libotr_LIBS $LIBS" CFLAGS="$CFLAGS $libotr_CFLAGS"
AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])],
[AS_IF([test "x$enable_otr" = xyes],
[AC_MSG_ERROR([libotr is required for otr encryption support])],
[AC_MSG_NOTICE([libotr not found, otr encryption support not enabled])])])
PKG_CHECK_MODULES([libotr], [libotr >= 4.0],
[LIBS="$libotr_LIBS $LIBS" CFLAGS="$libotr_CFLAGS $cflags"],
[AM_CONDITIONAL([BUILD_OTR], [false])
AS_IF([test "x$enable_otr" = xyes],
[AC_MSG_ERROR([libotr >= 4.0 is required for OTR support])],
[AC_MSG_NOTICE([libotr >= 4.0 not found, OTR support not enabled])])])
AM_COND_IF([BUILD_OTR], [AC_DEFINE([HAVE_LIBOTR], [1], [Have libotr])])
fi
dnl feature: omemo