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

Make qrencode optional and add to CI

Browse Source
This commit is contained in:
Michael Vetter
2022-05-30 18:06:13 +02:00
parent 42fb8f86d9
commit 0c7350e2e6
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@@ -347,11 +347,16 @@ AS_IF([test "x$with_themes" = xno -o "x$with_themes" = xyes -o "x$with_themes" =
AC_SUBST(THEMES_PATH)
AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL")
dnl feature: omemo qrcode
AS_IF([test "x$omemo_qrcode" != xno],
[PKG_CHECK_MODULES([libqrencode], [libqrencode],
[AC_DEFINE([HAVE_QRENCODE], [1], [qrcode module])]
[LIBS="-lqrencode $LIBS"]], []))
if test "x$enable_omemo_qrcode" != xno; then
AC_DEFINE([HAVE_QRENCODE], [1], [Have QRencode])
PKG_CHECK_MODULES([libqrencode], [libqrencode],
[LIBS="$libqrencode_LIBS $LIBS" CFLAGS="$libqrencode_CFLAGS $cflags"],
[AC_DEFINE([HAVE_QRENCODE], [0], [Dont have QRencode])
AS_IF([test "x$enable_qrcode" = xyes],
[AC_MSG_ERROR([libqrencode not found])],
[AC_MSG_NOTICE([librencode not found])])])
fi
## Tests