configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 86793aeed94d839251e1b1098d4c8389ab7a72ae
Author: Tomas Chvatal <tchva...@suse.cz>
Date: Sun Mar 18 12:28:44 2012 +0100
Add check for hamcrest even if it is not first in classpath.
diff --git a/configure.in b/configure.in
index 27b1813..b7c2276 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
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
