From 16c0807d75cfd9ecbca9c703ed0eadda80529aab Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 27 Sep 2016 11:53:56 +0200
Subject: configure: reject Apple JDK

Since commit 32bc8ddbf335dd26019edcf12758643b4cff9913 the jvmfwk rejects
Apple JDK and while the Java code builds fine with it, various tests such as
CppunitTest_dbaccess_hsqldb_test fail if it is the only installed JRE.

The simplest way to avoid the problem is to not allow building with
Apple JDK.

Change-Id: I5701e38cffded4596ac94608867a038ff76f75ec
---
 configure.ac | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 10c987b87b6b..e02559d293e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7100,6 +7100,13 @@ _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
             JAVA_HOME_OK="NO"
         fi
-- 
cgit