[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - configure.ac

[Michael Stahl]

 configure.ac |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f833183e9c2eeb323f85ca2d03f764228f9b14fa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 22 14:11:18 2016 +0200

    configure: remove mysterious NO_JAVA_HOME value
    
    This has been there since CVS import, but no reason is given why an
    empty JAVA_HOME value wouldn't work as well.
    
    This caused 086c13584dc672c4a07c6384ab7f08fa67ce0f95 to always invoke
    autogen.sh if one used --without-java.
    
    Change-Id: Ie72537ddd0247700fdcdb4126387935754c1bed5
    (cherry picked from commit a911b96bb10b41a7f97ad40c423d84388d6b7d96)
    Reviewed-on: https://gerrit.libreoffice.org/27438
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index eead24e..fc1e776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6960,7 +6960,8 @@ you must use the "--with-jdk-home" configure option explicitly])
     fi
 else
     dnl Java disabled
-    JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
+    JAVA_HOME=
+    export JAVA_HOME
 fi
 AC_SUBST([HAVE_JAVA6])
 AC_SUBST([HAVE_JAVA9])
@@ -12553,7 +12554,7 @@ fi
 ILIB1=
 if test "$build_os" = "cygwin"; then
     ILIB="."
-    if test -n "$JAVA_HOME" -a "$JAVA_HOME" != "NO_JAVA_HOME"; then
+    if test -n "$JAVA_HOME"; then
         ILIB="$ILIB;$JAVA_HOME/lib"
     fi
     ILIB1=-link