[Libreoffice-commits] .: 2 commits - set_soenv.in solenv/inc

[Tor Lillqvist]

 set_soenv.in         |   10 +++++-----
 solenv/inc/wntmsc.mk |    1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit f80e22038b7f7ba74ba9dfb81c357bd280aa0ec5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jan 26 21:13:36 2011 +0200

    Don't hardcode SOLAR_JAVA always to TRUE, winenv.set.sh sets it or not

diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 4d7cd5d..64038fe 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -27,7 +27,6 @@
 
 # mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
 
-SOLAR_JAVA*=TRUE
 FULL_DESK=TRUE
 JAVAFLAGSDEBUG=-g
 
commit f53ddd4be9ef1409f6e4f2323284359f9d7adb1c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jan 26 20:49:49 2011 +0200

    Check also $JAVA_HOME being set to "NO_JAVA_HOME" by the configure script

diff --git a/set_soenv.in b/set_soenv.in
index 0533441..0fd7a17 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -963,7 +963,7 @@ if ($STLPORT4 ne $no_stl) {
 # Windows NT only variables
 if ($platform =~ m/cygwin/)
 {
-   if ( $JAVA_HOME ne "" )
+   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
    {
       $JAVA_LIB             = $JAVA_HOME.$LIB;
    }
@@ -980,7 +980,7 @@ if ($platform =~ m/cygwin/)
    $WIN_TOUCH            = '$CYGWIN_PATH'.$ds."touch.exe";
 }
 
-if ( $JAVA_HOME ne "" )
+if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
 {
    $JAVA_BIN             = $JAVA_HOME.$BIN;
    $JAVA_INCLUDE         = $JAVA_HOME.$ds."include";
@@ -1150,7 +1150,7 @@ if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris|openbsd/)
    $PATH             .= $ps.$oldPATH;
 
    my @javaBits;
-   if (( $JAVA_HOME ne "" ) && ( $JDK ne "gcj" )) {
+   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME"  &&  $JDK ne "gcj" ) {
       @javaBits = ( '$JAVA_HOME'.$BIN, 'javac' );
    } else {
       @javaBits = ();
@@ -1173,7 +1173,7 @@ elsif ($platform =~ m/cygwin/)
                         $ps.CygFormat($SOLARENV).$ds."bin".
                         $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
 
-   if ( $JAVA_HOME ne "" )
+   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
    {
       # hack either "hotspot" or "client" should be used, depending on the jdk version:
       # 1.2.x   -   no such directory, unsupported
@@ -1305,7 +1305,7 @@ elsif ($platform =~ m/os2/)
                         $ps.'$SOLARENV'.$ds."bin".
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN;
 
-   if ( $JAVA_HOME ne "" )
+   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
    {
       # hack either "hotspot" or "client" should be used, depending on the jdk version:
       # 1.2.x   -   no such directory, unsupported