summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-05-31 13:30:37 +0200
committerSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2022-02-23 11:04:08 +0100
commit081520aabe12475fb1b760ab3cbd63de03479591 (patch)
tree743945d10cf1fdc1349b4d848454fd01bbb64332 /configure.ac
parentsw: layout: fix overlapped table rows in --convert-to pdf (diff)
downloadcore-081520aabe12475fb1b760ab3cbd63de03479591.tar.gz
core-081520aabe12475fb1b760ab3cbd63de03479591.zip
Adapt to hamcrest-2.2-3.fc35.noarch.rpm
Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116506 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index d5841860c1c0..dcdd9c5f6fd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12064,6 +12064,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then
HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
elif test -e /usr/share/java/hamcrest/core.jar; then
HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
+ elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
+ HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
else
HAMCREST_JAR=/usr/share/java/hamcrest.jar
fi