configure.ac | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7ac30b24429dcd7d9f59e21d34c4a19e3a22e1dc
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Jan 31 14:46:58 2022 +0100
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 <sberg...@redhat.com>
(cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129213
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 91f129ef76a1..5a355c9468d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12133,6 +12133,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
