diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-07-22 14:11:18 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-25 07:26:02 +0000 |
| commit | f833183e9c2eeb323f85ca2d03f764228f9b14fa (patch) | |
| tree | eed4a7f98181b4574d51da238147c33f7ed5a9a2 /configure.ac | |
| parent | 77421906467e93e06c90740fb4ff95e7b8f8834b (diff) | |
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@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index eead24e53c89..fc1e77663563 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 |