configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eb1400e33049b447869234134da59afe6553ad72 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. Conflicts: configure.in Signed-off-by: Bjoern Michaelsen <bjoern.michael...@canonical.com> diff --git a/configure.in b/configure.in index f7ee08f..ea959e6 100644 --- a/configure.in +++ b/configure.in @@ -9154,8 +9154,8 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then if test $? -eq 0; 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 + if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \ + "$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