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

[Stephan Bergmann]

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

New commits:
commit af30252902520375255ed01ba9d8fae3706fd691
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 23 15:55:24 2015 +0100

    Related rhbz#1185307: One more location to look for Hamcrest jar
    
    Change-Id: I307a009c14dd5cd946b39fbfb80ffc3962a7739b
    (cherry picked from commit 8419fa8c28dd9c5f64a72d28d561b3817d781232)
    Reviewed-on: https://gerrit.libreoffice.org/14143
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 4a1ac6f..42dc3b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12059,6 +12059,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then
         if test "$with_hamcrest" = "yes"; then
             if test -e /usr/share/lib/java/hamcrest.jar; 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
             else
                 HAMCREST_JAR=/usr/share/java/hamcrest.jar
             fi