configure.ac | 7 -------
1 file changed, 7 deletions(-)
New commits:
commit 2462947feb8d56e8eb576c2071e3642e730d360e
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Dec 22 09:29:13 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sun Feb 7 12:56:43 2021 +0100
That wasn't a reliable way to detect Apple JDK
The check had been introduced with 16c0807d75cfd9ecbca9c703ed0eadda80529aab
"configure: reject Apple JDK", but with
7db048f62929a9d267b63db3a6ea2b58b47ec757
"Manually select JDK outside /Library/Java/JavaVirtualMachines on macOS" it
works fine to configure --with-jdk-home= a (non-Apple) JDK installed outside
/Library/Java/JavaVirtualMachines. If anybody thinks a check to reject
Apple
JDK would still be useful, and knows a reliable way to detect it, feel free
to
add back a fixed check.
Change-Id: I18910d992e3d1fc6fd8fc4b9d522aec0cce3e652
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108144
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 8ba7c3b63f87a443139c9104b02e3864dd31daf9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110438
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/configure.ac b/configure.ac
index 6a74bd3c6060..cf7d10dc01de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8275,13 +8275,6 @@ _ACEOF
# now check if $JAVA_HOME is really valid
if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
- case "${JAVA_HOME}" in
- /Library/Java/JavaVirtualMachines/*)
- ;;
- *)
- AC_MSG_ERROR([JDK in $JAVA_HOME cannot be used in CppUnit
tests - install Oracle JDK])
- ;;
- esac
if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
AC_MSG_WARN([JAVA_HOME was not explicitly informed with
--with-jdk-home. the configure script])
AC_MSG_WARN([attempted to find JAVA_HOME automatically, but
apparently it failed])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
