diff options
| author | Rene Engelhard <rene@rene-engelhard.de> | 2023-10-30 20:27:12 +0100 |
|---|---|---|
| committer | René Engelhard <rene@debian.org> | 2023-11-06 20:02:07 +0100 |
| commit | 82a955498bf1e0d4ca7a582425bd30866ca7eb75 (patch) | |
| tree | 1473b2bef61f548bf0079124f55a79abfc0d0f61 /configure.ac | |
| parent | 061e48e607291c2992c81d3073a8c41387c56996 (diff) | |
add --with-system-zxcvbn
Change-Id: I9a90585d8eb498861a6ef4752ab85dcff8eeaab6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158674
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 24 insertions, 0 deletions
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 @@ -11199,6 +11205,24 @@ 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 =================================================================== AC_MSG_CHECKING([whether to use zxing]) |