Also find zxcvbn headers in /usr/include/zxcvbn

configure only looked in /usr/include while Fedora packages put
the headers in /usr/include/zxcvbn/

Change-Id: I905e00840075af093307f56f7e6038840d3e91ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204533
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>

RepositoryExternal.mk

@@ -4492,6 +4492,7 @@ define gb_LinkTarget__use_zxcvbn-c
 $(call gb_LinkTarget_set_include,$(1),\
 	-DSYSTEM_ZXCVBN \
 	$$(INCLUDE) \
+	$(ZXCVBN_CFLAGS) \
 )
 $(call gb_LinkTarget_add_libs,$(1),-lzxcvbn)
 endef

config_host.mk.in

@@ -821,6 +821,7 @@ MD4C_LIBS=$(gb_SPACE)@MD4C_LIBS@
 export ZMF_CFLAGS=$(gb_SPACE)@ZMF_CFLAGS@
 export ZMF_LIBS=$(gb_SPACE)@ZMF_LIBS@
 export GET_TASK_ALLOW_ENTITLEMENT=@GET_TASK_ALLOW_ENTITLEMENT@
+export ZXCVBN_CFLAGS=$(gb_SPACE)@ZXCVBN_CFLAGS@
 
 # lang-related stuff
 include $(BUILDDIR)/config_$(gb_Side)_lang.mk

configure.ac

@@ -12050,7 +12050,10 @@ 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 found.)], [])
+       [ AC_CHECK_HEADER(zxcvbn/zxcvbn.h,
+          [ ZXCVBN_CFLAGS="-I/usr/include/zxcvbn" ],
+          [ AC_MSG_ERROR(zxcvbn headers not found.)], [])
+    ])
     AC_CHECK_LIB(zxcvbn, ZxcvbnMatch, [],
         [ AC_MSG_ERROR(zxcvbn library not found.)], [])
 else
@@ -12059,6 +12062,7 @@ else
    SYSTEM_ZXCVBN=
 fi
 AC_SUBST(SYSTEM_ZXCVBN)
+AC_SUBST(ZXCVBN_CFLAGS)
 
 dnl ===================================================================
 dnl Check for system zxing