summaryrefslogtreecommitdiffstats
path: root/config_host.mk.in
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@pefoley.com>2014-09-09 22:19:42 -0400
committerStephan Bergmann <sbergman@redhat.com>2014-09-19 09:06:41 +0000
commit4db2d600ebc541adfaaf0a1a176df1c74e3ae0e4 (patch)
tree46c93b42f787f25d17420e722f4a3786fdecd84a /config_host.mk.in
parentImprove test for inlined html image (diff)
downloadcore-4db2d600ebc541adfaaf0a1a176df1c74e3ae0e4.tar.gz
core-4db2d600ebc541adfaaf0a1a176df1c74e3ae0e4.zip
Add support for external hamcrest when using junit 4.11+
Starting with junit 4.11 hamcrest is no longer bundled, so add a --with-hamcrest option to support this. Change-Id: Icdae946af82b9c56bf25d37cbf88275fc6a6a1eb Reviewed-on: https://gerrit.libreoffice.org/11383 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'config_host.mk.in')
-rw-r--r--config_host.mk.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index e7177453503c..605bb6bf4693 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -239,6 +239,7 @@ export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@
export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
export GUIBASE=@GUIBASE@
+export HAMCREST_JAR=@HAMCREST_JAR@
export HARDLINKDELIVER=@HARDLINKDELIVER@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@