summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-05-31 13:30:37 +0200
committerAndras Timar <andras.timar@collabora.com>2021-06-04 15:46:51 +0200
commitaa3bb43ce733ed16e59739dbc43f36d77fafa173 (patch)
tree694c68381910e4d3d0791aef8931cbe415c81ee0 /configure.ac
parent7836f2d4d0a4deb0a9a9bf240ec29fc934356d40 (diff)
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) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116456 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
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 583f3ce2820a..4ad5a31d76ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13220,6 +13220,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" -a "$cross_compiling" != "
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