configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b70a8d72bbf9cad94a7efa871f684d70f6bba80f
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Apr 23 11:16:52 2024 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:44:26 2024 +0200
Support --with-junit/hamcrest in WSL_ONLY_AS_HELPER mode
...where it failed with
> checking for JUnit 4... ./configure: line 47354: cygpath: command not
found
Change-Id: I56c930b6c8b738b39f26766f90476c32efb383e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166508
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174249
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index bec99703c502..94e2ebb21379 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14232,7 +14232,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"
-a "$cross_compiling" != "
OOO_JUNIT_JAR=$with_junit
fi
if test "$_os" = "WINNT"; then
- OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
+ PathFormat "$OOO_JUNIT_JAR"
+ OOO_JUNIT_JAR="$formatted_path"
fi
printf 'import org.junit.Before;' > conftest.java
if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then
@@ -14268,7 +14269,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"
-a "$cross_compiling" != "
HAMCREST_JAR=$with_hamcrest
fi
if test "$_os" = "WINNT"; then
- HAMCREST_JAR=`cygpath -m "$HAMCREST_JAR"`
+ PathFormat "$HAMCREST_JAR"
+ HAMCREST_JAR="$formatted_path"
fi
if "$JAVACOMPILER" -classpath "$HAMCREST_JAR" conftest.java >&5 2>&5;
then
AC_MSG_RESULT([$HAMCREST_JAR])
