]>
Commit | Line | Data |
---|---|---|
1cb0206a JR |
1 | --- libreoffice-4.3.2.2/configure.ac.orig 2014-10-12 14:42:16.760723674 +0200 |
2 | +++ libreoffice-4.3.2.2/configure.ac 2014-10-12 14:59:04.195877183 +0200 | |
5893fec7 JR |
3 | @@ -12315,6 +12315,10 @@ |
4 | if test "$_os" = "WINNT"; then | |
5 | OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"` | |
6 | fi | |
7 | + # hamcrest is a dependency of junit, add it to the classpath if found | |
8 | + if test -e /usr/share/java/hamcrest-core.jar; then | |
9 | + OOO_JUNIT_JAR=$OOO_JUNIT_JAR:/usr/share/java/hamcrest-core.jar | |
10 | + fi | |
11 | printf 'import org.junit.Before; import org.hamcrest.BaseDescription;' \ | |
12 | > conftest.java | |
13 | if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then |