From 94eb59078731b2e4093d983bc618d051f4e31740 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 27 Nov 2019 15:29:50 +0100 Subject: android: Fix location of the built freetype library. Otherwise it is not found when the the fontconfig's ./configure is running, which leads to linking failure during the fontconfig's ./configure time, which leads to an undefined HAVE_FT_GET_NEXT_CHAR which leads to not using the actual FT_Get_Next_Char, but instead some dummy code that leads to an infinite loop on the app startup; huh. Change-Id: I40b7a403fbe75582bb98f15f1afe7a4050fd13aa Reviewed-on: https://gerrit.libreoffice.org/83922 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1d848685cfef..7f86fa5b321a 100644 --- a/configure.ac +++ b/configure.ac @@ -8108,7 +8108,11 @@ if test "$test_freetype" = "yes"; then SYSTEM_FREETYPE=TRUE else FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include" - FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype" + if test "x$ac_config_site_64bit_host" = xYES; then + FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64 -lfreetype" + else + FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype" + fi fi AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) -- cgit