From 82a955498bf1e0d4ca7a582425bd30866ca7eb75 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Mon, 30 Oct 2023 20:27:12 +0100 Subject: add --with-system-zxcvbn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9a90585d8eb498861a6ef4752ab85dcff8eeaab6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158674 Tested-by: René Engelhard Reviewed-by: René Engelhard --- configure.ac | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7b821c6343d5..c3a43716c6b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2499,6 +2499,11 @@ AC_ARG_WITH(system-zxing, [Use libzxing already on system.]),, [with_system_zxing="$with_system_libs"]) +AC_ARG_WITH(system-zxcvbn, + AS_HELP_STRING([--with-system-zxcvbn], + [Use libzxcvbn already on system.]),, + [with_system_zxcvbn="$with_system_libs"]) + AC_ARG_WITH(system-box2d, AS_HELP_STRING([--with-system-box2d], [Use box2d already on system.]),, @@ -5858,6 +5863,7 @@ if test "$cross_compiling" = "yes"; then PYTHON SCRIPTING ZLIB + ZXCVBN " # converts BUILD_TYPE and PERMITTED_BUILD_TARGETS into non-whitespace, # newlined lists, to use grep as a filter @@ -11198,6 +11204,24 @@ AC_SUBST(SYSTEM_HUNSPELL) AC_SUBST(HUNSPELL_CFLAGS) AC_SUBST(HUNSPELL_LIBS) +dnl =================================================================== +dnl Check for system zxcvbn +dnl =================================================================== +AC_MSG_CHECKING([which zxcvbn to use]) +if test "$with_system_zxcvbn" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_ZXCVBN=TRUE + AC_CHECK_HEADER(zxcvbn.h, [], + [ AC_MSG_ERROR(zxcvbn headers not foundd.)], []) + AC_CHECK_LIB(zxcvbn, ZxcvbnMatch, [], + [ AC_MSG_ERROR(zxcvbn library not found.)], []) +else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE ZXCVBN" + SYSTEM_ZXCVBN= +fi +AC_SUBST(SYSTEM_ZXCVBN) + dnl =================================================================== dnl Check for system zxing dnl =================================================================== -- cgit v1.2.3