[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - configure.ac

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 433cbb6a3bf2cb0587bc0c0da99c1bfb715da690
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Jun 1 16:26:57 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>
    (cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116456
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/configure.ac b/configure.ac
index a63669c584ec..e37fc0195c33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13217,6 +13217,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