[Libreoffice-commits] core.git: 2 commits - configure.ac

[Michael Stahl]

 configure.ac |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 16c0807d75cfd9ecbca9c703ed0eadda80529aab
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 27 11:53:56 2016 +0200

    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

diff --git a/configure.ac b/configure.ac
index 10c987b..e02559d 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
commit 9a5b10544a11df3c0b08532a9143cd9adced4a4d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 27 11:32:08 2016 +0200

    configure: non-working ant is an error, not a warning
    
    For example ant 1.8.4 doesn't work with JDK 1.8.
    
    Change-Id: I709fd0591c330cbfe6542976eb2fa0c3aec1e63f

diff --git a/configure.ac b/configure.ac
index 9622255..10c987b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11928,9 +11928,7 @@ EOF
             echo "configure: Ant test failed" >&5
             cat conftest.java >&5
             cat conftest.xml >&5
-            AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
-            ANT_HOME=""
-            add_warning "Ant does not work - Some Java projects will not build!"
+            AC_MSG_ERROR([Ant does not work - Some Java projects will not build!])
         fi
         rm -f conftest* core core.* *.core
     fi