Make qrencode optional and add to CI

Dockerfile.arch

@@ -27,7 +27,8 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   python \
   wget \
   sqlite \
-  gdk-pixbuf2
+  gdk-pixbuf2 \
+  qrencode
 
 RUN mkdir -p /usr/src/{stabber,profanity}
 

Dockerfile.debian

@@ -28,7 +28,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   python3-dev \
   python-dev-is-python3 \
   libsqlite3-dev \
-  libgdk-pixbuf-2.0-dev
+  libgdk-pixbuf-2.0-dev \
+  libqrencode-dev
 
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

Dockerfile.fedora

@@ -35,7 +35,8 @@ RUN dnf install -y \
   readline-devel \
   openssl-devel \
   sqlite-devel \
-  gdk-pixbuf2-devel
+  gdk-pixbuf2-devel \
+  qrencode-devel
 
 # https://github.com/openSUSE/docker-containers-build/issues/26
 ENV LANG en_US.UTF-8

Dockerfile.tumbleweed

@@ -35,7 +35,8 @@ RUN zypper --non-interactive in --no-recommends \
   python38-devel \
   readline-devel \
   sqlite3-devel \
-  gdk-pixbuf-devel
+  gdk-pixbuf-devel \
+  qrencode-devel
 
 # https://github.com/openSUSE/docker-containers-build/issues/26
 ENV LANG en_US.UTF-8

Dockerfile.ubuntu

@@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   python3-dev \
   python-dev-is-python3 \
   libsqlite3-dev \
-  libgdk-pixbuf-2.0-dev
+  libgdk-pixbuf-2.0-dev \
+  libqrencode-dev
 
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

ci-build.sh

@@ -44,7 +44,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
         tests=(
         "--enable-notifications --enable-icons-and-clipboard --enable-otr --enable-pgp
         --enable-omemo --enable-plugins --enable-c-plugins
-        --enable-python-plugins --with-xscreensaver --enable-gdk-pixbuf"
+        --enable-python-plugins --with-xscreensaver --enable-omemo-qrcode --enable-gdk-pixbuf"
         "--disable-notifications --disable-icons-and-clipboard --disable-otr --disable-pgp
         --disable-omemo --disable-plugins --disable-c-plugins
         --disable-python-plugins --without-xscreensaver"
@@ -52,7 +52,7 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
         "--disable-icons-and-clipboard"
         "--disable-otr"
         "--disable-pgp"
-        "--disable-omemo"
+        "--disable-omemo --disable-omemo-qrcode"
         "--disable-pgp --disable-otr"
         "--disable-pgp --disable-otr --disable-omemo"
         "--disable-plugins"

configure.ac

@@ -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