config_host/config_features.h.in | 5 +++++ configure.ac | 1 + 2 files changed, 6 insertions(+)
New commits: commit 439820feebec02ff347408337898ab5cc3b275e7 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Apr 16 16:44:43 2017 +0200 try to fix the tests that depend on fonts This should help with some of the RandomConfig tb failures. Reviewed-on: https://gerrit.libreoffice.org/36581 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> (cherry picked from commit d1a594686a704a7b0d255fd90f9c017b2318e560) Conflicts: config_host/config_features.h.in sc/qa/unit/subsequent_export-test.cxx Change-Id: I83af9c2c50fa2f3044e7507a1b902807536452dd diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index 0a389798116f..59bf2e5f6a83 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -166,4 +166,9 @@ */ #define HAVE_FEATURE_UI 1 +/* + * Whether extra fonts are available + */ +#define HAVE_MORE_FONTS 0 + #endif diff --git a/configure.ac b/configure.ac index 9bc526c6ed1c..256e3d5802ed 100644 --- a/configure.ac +++ b/configure.ac @@ -11505,6 +11505,7 @@ if test "$with_fonts" != "no"; then AC_MSG_RESULT([yes]) WITH_FONTS=TRUE BUILD_TYPE="$BUILD_TYPE MORE_FONTS" + AC_DEFINE(HAVE_MORE_FONTS) else AC_MSG_RESULT([no]) WITH_FONTS= _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits