summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTomas Chvatal <tchvatal@suse.cz>2012-03-18 12:28:44 +0100
committerTomas Chvatal <tchvatal@suse.cz>2012-03-18 12:29:27 +0100
commit86793aeed94d839251e1b1098d4c8389ab7a72ae (patch)
tree5a55eba3dec79a67419873a76b49a6b4136bafe9 /configure.in
parentsal_osl_module depends on Module_DLL (uses the library) (diff)
downloadcore-86793aeed94d839251e1b1098d4c8389ab7a72ae.tar.gz
core-86793aeed94d839251e1b1098d4c8389ab7a72ae.zip
Add check for hamcrest even if it is not first in classpath.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 27b181334131..b7c22760fed4 100644
--- a/configure.in
+++ b/configure.in
@@ -10424,7 +10424,7 @@ if test "$SOLAR_JAVA" != "" -a "$with_junit" != "no"; then
# check if either class-path entry is available for hamcrest or
# it's bundled
if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \
- "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP -q 'Class-Path: hamcrest'; then
+ "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP 'Class-Path:' | $GREP -q 'hamcrest'; then
AC_MSG_RESULT([$OOO_JUNIT_JAR])
else
AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please