diff options
| author | homeboy445 <akshitsan13@gmail.com> | 2021-03-18 22:31:06 +0530 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-20 21:36:24 +0100 |
| commit | 66e88f46f7b9ef7a0b3366805860fd581bed6146 (patch) | |
| tree | caaf51d89ff3e5bd758936593b2cdddc7c48b61d /configure.ac | |
| parent | cdeb5046be7f6259bd60f0951c51559edcab91c5 (diff) | |
tdf#139778 qrcodegen library removal.
It was replaced by ZXing library.
Change-Id: I49eb809586c7b4ba3a93fd77f804bfc93fead669
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112701
Reviewed-by: René Engelhard <rene@debian.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/configure.ac b/configure.ac index 8a7922119f5d..851a8af76b6c 100644 --- a/configure.ac +++ b/configure.ac @@ -2238,19 +2238,10 @@ AC_ARG_WITH(system-hunspell, [Use libhunspell already on system.]),, [with_system_hunspell="$with_system_libs"]) -libo_FUZZ_ARG_ENABLE(qrcodegen, - AS_HELP_STRING([--disable-qrcodegen], - [Disable use of qrcodegen external library.])) - libo_FUZZ_ARG_ENABLE(zxing, AS_HELP_STRING([--disable-zxing], [Disable use of zxing external library.])) -AC_ARG_WITH(system-qrcodegen, - AS_HELP_STRING([--with-system-qrcodegen], - [Use libqrcodegen already on system.]),, - [with_system_qrcodegen="$with_system_libs"]) - AC_ARG_WITH(system-zxing, AS_HELP_STRING([--with-system-zxing], [Use libzxing already on system.]),, @@ -10804,45 +10795,6 @@ AC_SUBST(HUNSPELL_CFLAGS) AC_SUBST(HUNSPELL_LIBS) dnl =================================================================== -dnl Check for system qrcodegen -dnl =================================================================== -AC_MSG_CHECKING([whether to use libqrcodegen]) -if test "$enable_qrcodegen" = "no"; then - AC_MSG_RESULT([no]) - ENABLE_QRCODEGEN= - SYSTEM_QRCODEGEN= -else - AC_MSG_RESULT([yes]) - ENABLE_QRCODEGEN=TRUE - AC_MSG_CHECKING([which libqrcodegen to use]) - if test "$with_system_qrcodegen" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_QRCODEGEN=TRUE - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [], - [AC_MSG_ERROR(qrcodegen headers not found.)], [#include <stdexcept>]) - AC_CHECK_LIB([qrcodegencpp], [main], [:], - [ AC_MSG_ERROR(qrcodegen C++ library not found.) ], []) - QRCODEGEN_LIBS=-lqrcodegencpp - AC_LANG_POP([C++]) - QRCODEGEN_CFLAGS=$(printf '%s' "$QRCODEGEN_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - FilterLibs "${QRCODEGEN_LIBS}" - QRCODEGEN_LIBS="${filteredlibs}" - else - AC_MSG_RESULT([internal]) - SYSTEM_QRCODEGEN= - BUILD_TYPE="$BUILD_TYPE QRCODEGEN" - fi - if test "$ENABLE_QRCODEGEN" = TRUE; then - AC_DEFINE(ENABLE_QRCODEGEN) - fi -fi -AC_SUBST(SYSTEM_QRCODEGEN) -AC_SUBST(ENABLE_QRCODEGEN) -AC_SUBST(QRCODEGEN_CFLAGS) -AC_SUBST(QRCODEGEN_LIBS) - -dnl =================================================================== dnl Check for system zxing dnl =================================================================== AC_MSG_CHECKING([whether to use zxing]) @@ -14135,7 +14087,6 @@ AC_CONFIG_HEADERS([config_host/config_mpl.h]) AC_CONFIG_HEADERS([config_host/config_oox.h]) AC_CONFIG_HEADERS([config_host/config_options.h]) AC_CONFIG_HEADERS([config_host/config_options_calc.h]) -AC_CONFIG_HEADERS([config_host/config_qrcodegen.h]) AC_CONFIG_HEADERS([config_host/config_zxing.h]) AC_CONFIG_HEADERS([config_host/config_skia.h]) AC_CONFIG_HEADERS([config_host/config_typesizes.h]) |