[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e6c25186c8584f68b5f8074004556bd855200fff
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jun 1 08:54:55 2021 +0200

    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 at redhat.com>

diff --git a/configure.ac b/configure.ac
index a6cf3a72b538..736c772eebee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13430,6 +13430,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