[Libreoffice-commits] core.git: configure.ac

Rene Engelhard (via logerrit) logerrit at kemper.freedesktop.org
Sat Mar 20 20:37:36 UTC 2021


 configure.ac |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit ad92c7dfa64c9e08aa2bcf612a9a4a68e9deae22
Author:     Rene Engelhard <rene at debian.org>
AuthorDate: Sat Mar 20 10:02:05 2021 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Mar 20 21:36:51 2021 +0100

    fix system zxing build
    
    Change-Id: I248471718def63f85525c49d46855340cde4b222
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112789
    Tested-by: René Engelhard <rene at debian.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/configure.ac b/configure.ac
index 851a8af76b6c..5e80cbfdb791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10812,6 +10812,7 @@ else
         AC_LANG_PUSH([C++])
         AC_CHECK_HEADER(ZXing/MultiFormatWriter.h, [],
             [AC_MSG_ERROR(zxing headers not found.)], [#include <stdexcept>])
+        ZXING_CFLAGS=-I/usr/include/ZXing
         AC_CHECK_LIB([ZXing], [main], [ZXING_LIBS=-lZXing],
             [ AC_CHECK_LIB([ZXingCore], [main], [ZXING_LIBS=-lZXingCore],
             [ AC_MSG_ERROR(zxing C++ library not found.) ])], [])


More information about the Libreoffice-commits mailing list