configure.ac | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 9fdf51275beb617abd67a82a76efe1d1f6fdf0a6
Author: Thorsten Behrens <[email protected]>
AuthorDate: Fri Jan 12 15:02:45 2024 +0100
Commit: Thorsten Behrens <[email protected]>
CommitDate: Sat Jan 13 14:01:28 2024 +0100
system zxing cannot be used with dbgutil
Change-Id: I0b0c646f64ce103e706d8e4b1cc50f9120c4799a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161975
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <[email protected]>
diff --git a/configure.ac b/configure.ac
index b73437ade406..299fcba5b011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4691,6 +4691,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" !=
"no"; then
else
with_system_gpgmepp=no
fi
+ if test "$with_system_zxing" = "yes"; then
+ AC_MSG_ERROR([--with-system-zxing conflicts with --enable-dbgutil])
+ else
+ with_system_zxing=no
+ fi
# As mixing system libwps and non-system libnumbertext or vice versa
likely causes trouble (see
# 603074c5f2b84de8a24593faf807da784b040625 "Pass _GLIBCXX_DEBUG into
external/libwps" and the
# mail thread starting at
<https://gcc.gnu.org/ml/gcc/2018-05/msg00057.html> "libstdc++: ODR