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

New commits:
commit 6c6b4dec2d001e54f7f420ffc7ade8e17f933efb
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Jan 31 13:34:03 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/+/129211
    Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/configure.ac b/configure.ac
index a5ff058240e0..b99299994e7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11899,6 +11899,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

Reply via email to