summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-23 15:55:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-01-23 16:49:47 +0000
commitaf30252902520375255ed01ba9d8fae3706fd691 (patch)
tree39680d956d1e8db27345529ee6d1a2d54f145af3
parent726ffc4334112069d6cc65f908b1425a3cf9d69e (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--configure.ac2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 4a1ac6fb0dfb..42dc3b4ac63e 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