migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv

3 files changed, 321 insertions, 382 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 5a7d880bdd5a..850539c9a58f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -267,6 +267,8 @@ export OPENSSL_LIBS="@OPENSSL_LIBS@"
 export OS="@OS@"
 export OSVERSION="@OSVERSION@"
 export OS_FOR_BUILD="@OS_FOR_BUILD@"
+export OUTDIR="@OUTDIR@"
+export OUTDIR_FOR_BUILD="@OUTDIR_FOR_BUILD@"
 export OUTPATH="@OUTPATH@"
 export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"
 export OXYGENOFFICE_PACK="@OXYGENOFFICE_PACK@"
@@ -287,6 +289,7 @@ export PROGRESSBARCOLOR="@PROGRESSBARCOLOR@"
 export PROGRESSFRAMECOLOR="@PROGRESSFRAMECOLOR@"
 export PROGRESSPOSITION="@PROGRESSPOSITION@"
 export PROGRESSSIZE="@PROGRESSSIZE@"
+export PROEXT="@PROEXT@"
 export PSPRINT="TRUE"
 export PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
 export PTHREAD_LIBS="@PTHREAD_LIBS@"
@@ -310,6 +313,11 @@ export SIZEOF_LONG="@SIZEOF_LONG@"
 export SIZEOF_LONGLONG="@SIZEOF_LONGLONG@"
 export SIZEOF_POINTER="@SIZEOF_POINTER@"
 export SIZEOF_SHORT="@SIZEOF_SHORT@"
+export SOLAREXTRALIB="@SOLAREXTRALIB@"
+export SOLARINC="@SOLARINC@"
+export SOLARINC_FOR_BUILD="@SOLARINC_FOR_BUILD@"
+export SOLARLIB="@SOLARLIB@"
+export SOLARLIB_FOR_BUILD="@SOLARLIB_FOR_BUILD@"
 export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@"
 export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@"
 export SRCDIR="@SRC_ROOT@"
@@ -428,6 +436,8 @@ export WITH_OPENLDAP="@WITH_OPENLDAP@"
 export WITH_STLPORT="@WITH_STLPORT@"
 export WITH_THEMES="@WITH_THEMES@"
 export WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
+export WORKDIR="@WORKDIR@"
+export WORKDIR_FOR_BUILD="@WORKDIR_FOR_BUILD@"
 export WORK_STAMP="@SOURCEVERSION@"
 export WPD_CFLAGS="@WPD_CFLAGS@"
 export WPD_LIBS="@WPD_LIBS@"
diff --git a/configure.in b/configure.in
index f77df27d1443..7fb6f0a24885 100644
--- a/configure.in
+++ b/configure.in
@@ -2656,6 +2656,7 @@ AC_SUBST(SHOWINCLUDES_PREFIX)
 # determine CPU, CPUNAME, GUI, GUIBASE, ...
 #
 LIB64="lib"
+SOLARINC=
 
 case "$host_os" in
 
@@ -2668,6 +2669,10 @@ aix*)
     OS=AIX
     OUTPATH=unxaigppc
     P_SEP=:
+    SOLAREXTRALIB="-L../$LIB64"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
     ;;
 
 cygwin*)
@@ -2694,7 +2699,9 @@ cygwin*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-	SCPDEFS="$SCPDEFS -D_MSC_VER"
+    SCPDEFS="$SCPDEFS -D_MSC_VER"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
     ;;
 
 darwin*)
@@ -2726,6 +2733,7 @@ darwin*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLARLIB="-L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
     ;;
 
 dragonfly*)
@@ -2749,6 +2757,10 @@ dragonfly*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLAREXTRALIB="-L../$LIB64"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
     ;;
 
 freebsd*)
@@ -2773,6 +2785,10 @@ freebsd*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLAREXTRALIB="-L../$LIB64"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
     ;;
 
 linux-gnu*)
@@ -2877,6 +2893,10 @@ linux-gnu*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLAREXTRALIB="-L../$LIB64"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
     ;;
 
 linux-androideabi*)
@@ -2922,6 +2942,9 @@ mingw*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
     ;;
 
 *netbsd*)
@@ -2954,6 +2977,10 @@ mingw*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLAREXTRALIB="-L../$LIB64"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
     ;;
 
 openbsd*)
@@ -2977,6 +3004,13 @@ openbsd*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLAREXTRALIB="-L../$LIB64"
+    SOLARINC="$SOLARINC -I/usr/local/include"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L/usr/local/lib"
+
     ;;
 
 solaris*)
@@ -3002,6 +3036,15 @@ solaris*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
+    SOLAREXTRALIB="-L../$LIB -L$SRC_ROOT/solenv/$OUTPATH/lib.solaris.2.6"
+    SOLAREXTRALIB="$SOLAREXTRALIB -L/lib -L/usr/lib"
+    SOLAREXTRALIB="$SOLAREXTRALIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
+    SOLARINC="$SOLARINC -I/usr/local/include"
+    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="$SOLARLIB -L$COMPATH/lib"
+    SOLARLIB="$SOLARLIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
     ;;
 
 *)
@@ -3009,7 +3052,10 @@ solaris*)
     ;;
 esac
 
-INPATH=${OUTPATH}${PROEXT}
+INPATH="${OUTPATH}${PROEXT}"
+OUTDIR="$SRC_ROOT/solver/$INPATH"
+SOLARINC="-I. -I$SRC_ROOT/solver/$INPATH/inc/stl -I$SRC_ROOT/solver/$INPATH/inc/external -I$SRC_ROOT/solver/$INPATH/inc -I$SRC_ROOT/solenv/inc/$OUTPATH -I$SRC_ROOT/solenv/inc -I$SRC_ROOT/res $SOLARINC"
+WORKDIR="$SRC_ROOT/workdir/$INPATH"
 AC_SUBST(COM)
 AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
@@ -3018,8 +3064,11 @@ AC_SUBST(GUI)
 AC_SUBST(GUIBASE)
 AC_SUBST(INPATH)
 AC_SUBST(OS)
+AC_SUBST(OUTDIR)
 AC_SUBST(OUTPATH)
 AC_SUBST(P_SEP)
+AC_SUBST(SOLAREXTRALIB)
+AC_SUBST(WORKDIR)
 
 dnl ===================================================================
 dnl Set up a different compiler to produce tools to run on the build
@@ -3115,9 +3164,11 @@ else
     GUIBASE_FOR_BUILD="$GUIBASE"
     GUI_FOR_BUILD="$GUI"
     INPATH_FOR_BUILD="$INPATH"
+    MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="$MACOSX_DEPLOYMENT_TARGET"
     OS_FOR_BUILD="$OS"
+    OUTDIR_FOR_BUILD="$OUTDIR"
     OUTPATH_FOR_BUILD="$OUTPATH"
-    MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="$MACOSX_DEPLOYMENT_TARGET"
+    WORKDIR_FOR_BUILD="$WORKDIR"
 fi
 AC_SUBST(COM_FOR_BUILD)
 AC_SUBST(GUI_FOR_BUILD)
@@ -3135,8 +3186,6 @@ AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
 
 AC_SUBST(OUTDIR_FOR_BUILD)
 AC_SUBST(PATH_FOR_BUILD)
-AC_SUBST(SOLARINC_FOR_BUILD)
-AC_SUBST(SOLARLIB_FOR_BUILD)
 AC_SUBST(WORKDIR_FOR_BUILD)
 
 UPD="`echo AC_PACKAGE_VERSION | sed "s/\.//"`0"
@@ -4845,6 +4894,8 @@ if test "$SOLAR_JAVA" != ""; then
     AC_SUBST(AWTLIB)
 fi
 
+
+if test "$SOLAR_JAVA" != "" ; then
 #
 # Determine JAVALIB
 # If your platform follow the common pattern
@@ -4853,240 +4904,280 @@ fi
 # if you don't want JAVALIB to be exported at all
 # define x_JAVALIB=[\#]
 #
-JAVA_ARCH=
-JAVA_TOOLKIT=
-x_JAVALIB=
-
-case "$host_os" in
-
-aix*)
-    JAVA_ARCH="ppc"
-    JAVA_TOOLKIT="classic"
-    ;;
+    JAVA_ARCH=
+    JAVA_TOOLKIT=
+    x_JAVALIB=
+    x_JDKLIB=[\#]
 
-cygwin*|darwin*)
-    x_JAVALIB=[\#]
-    ;;
+    case "$host_os" in
 
-dragonfly*)
-    case "$host_cpu" in
-    i*86)
-        JAVA_ARCH="i386"
-        JAVA_TOOLKIT="client"
+    aix*)
+        JAVA_ARCH="ppc"
+        JAVA_TOOLKIT="classic"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/aix"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
         ;;
-    x86_64)
-        JAVA_ARCH="amd64"
-        JAVA_TOOLKIT="server"
+
+    cygwin*)
+        x_JDKLIB=
+        JDKLIB="$JAVA_HOME/lib"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/win32"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
         ;;
-    esac
-    ;;
 
-freebsd*)
-    case "$host_cpu" in
-    i*86)
-        JAVA_ARCH="i386"
-        JAVA_TOOLKIT="client"
+    darwin*)
+        x_JAVALIB=[\#]
+        SOLARINC="$SOLARINC -I$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers -I$FRAMEWORKSHOME/JavaVM/Headers"
         ;;
-    x86_64)
-        if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux" ; then
+
+    dragonfly*)
+        case "$host_cpu" in
+        i*86)
             JAVA_ARCH="i386"
             JAVA_TOOLKIT="client"
-        else
+            ;;
+        x86_64)
             JAVA_ARCH="amd64"
             JAVA_TOOLKIT="server"
-        fi
+            ;;
+        esac
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
         ;;
-    esac
-    ;;
 
-k*bsd*-gnu*)
-    case "$host_cpu" in
-    i*86)
-        JAVA_ARCH="i386"
-        JAVA_TOOLKIT="client"
+    freebsd*)
+        case "$host_cpu" in
+        i*86)
+            JAVA_ARCH="i386"
+            JAVA_TOOLKIT="client"
+            ;;
+        x86_64)
+            if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux" ; then
+                JAVA_ARCH="i386"
+                JAVA_TOOLKIT="client"
+            else
+                JAVA_ARCH="amd64"
+                JAVA_TOOLKIT="server"
+            fi
+            ;;
+        esac
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/freebsd"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/bsd"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
         ;;
-    x86_64)
-        JAVA_ARCH="amd64"
-        JAVA_TOOLKIT="server"
+
+    k*bsd*-gnu*)
+        case "$host_cpu" in
+        i*86)
+            JAVA_ARCH="i386"
+            JAVA_TOOLKIT="client"
+            ;;
+        x86_64)
+            JAVA_ARCH="amd64"
+            JAVA_TOOLKIT="server"
+            ;;
+        esac
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
         ;;
-    esac
-    ;;
 
-linux-gnu*)
+    linux-gnu*)
 
-    case "$host_cpu" in
+        case "$host_cpu" in
 
-    alpha)
-        JAVA_ARCH="alpha"
-        JAVA_TOOLKIT="server"
-        ;;
-    arm*)
-        JAVA_ARCH="arm"
-        JAVA_TOOLKIT="server"
-        ;;
-    hppa)
-        JAVA_ARCH="hppa"
-        JAVA_TOOLKIT="server"
-        ;;
-    i*86)
-        JAVA_ARCH="i386"
-        case "$JDK" in
-        [Ii][Bb][Mm]*)
-            JAVA_ARCH=
-            JRE_BASE_DIR="$JAVA_HOME/jre/bin"
-            JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/classic -L $JRE_BASE_DIR/native_thread"
+        alpha)
+            JAVA_ARCH="alpha"
+            JAVA_TOOLKIT="server"
             ;;
-        [Bb][Ee][Aa]*)
-            JAVA_TOOLKIT="jrockit";
+        arm*)
+            JAVA_ARCH="arm"
+            JAVA_TOOLKIT="server"
             ;;
-        *)
-            JAVA_TOOLKIT="client";
+        hppa)
+            JAVA_ARCH="hppa"
+            JAVA_TOOLKIT="server"
             ;;
-        esac
-        ;;
-    ia64)
-        JAVA_ARCH="ia64"
-        JAVA_TOOLKIT="server"
-        ;;
-    m68k)
-        JAVA_ARCH="mk68"
-        JAVA_TOOLKIT="server"
-        ;;
-    mips|mips64|mipsel|mips64el)
-        JAVA_ARCH="$host_cpu"
-        JAVA_TOOLKIT="server"
-        ;;
-    mips32)
-        JAVA_ARCH="$host_cpu"
-        JAVA_TOOLKIT="client"
-        ;;
-    powerpc)
-        JAVA_ARCH="ppc"
-        case "$JDK" in
-        [Ii][Bb][Mm]*)
-            JAVA_TOOLKIT="classic"
+        i*86)
+            JAVA_ARCH="i386"
+            case "$JDK" in
+            [Ii][Bb][Mm]*)
+                JAVA_ARCH=
+                JRE_BASE_DIR="$JAVA_HOME/jre/bin"
+                JAVALIB="-L$JAVA_HOME/$LIB64 -L$JRE_BASE_DIR -L$JRE_BASE_DIR/classic -L$JRE_BASE_DIR/native_thread"
+                ;;
+            [Bb][Ee][Aa]*)
+                JAVA_TOOLKIT="jrockit";
+                ;;
+            *)
+                JAVA_TOOLKIT="client";
+                ;;
+            esac
             ;;
-        gcj)
-            JAVA_TOOLKIT="client"
+        ia64)
+            JAVA_ARCH="ia64"
+            JAVA_TOOLKIT="server"
             ;;
-        *)
+        m68k)
+            JAVA_ARCH="mk68"
             JAVA_TOOLKIT="server"
             ;;
-        esac
-        ;;
-    powerpc64)
-        JAVA_ARCH="ppc64"
-        if test "$JDK" = "gcj" ; then
+        mips|mips64|mipsel|mips64el)
+            JAVA_ARCH="$host_cpu"
+            JAVA_TOOLKIT="server"
+            ;;
+        mips32)
+            JAVA_ARCH="$host_cpu"
             JAVA_TOOLKIT="client"
-        else
+            ;;
+        powerpc)
+            JAVA_ARCH="ppc"
+            case "$JDK" in
+            [Ii][Bb][Mm]*)
+                JAVA_TOOLKIT="classic"
+                ;;
+            gcj)
+                JAVA_TOOLKIT="client"
+                ;;
+            *)
+                JAVA_TOOLKIT="server"
+                ;;
+            esac
+            ;;
+        powerpc64)
+            JAVA_ARCH="ppc64"
+            if test "$JDK" = "gcj" ; then
+                JAVA_TOOLKIT="client"
+            else
+                JAVA_TOOLKIT="server"
+            fi
+            ;;
+        sparc)
+            JAVA_ARCH="sparc"
             JAVA_TOOLKIT="server"
-        fi
-        ;;
-    sparc)
-        JAVA_ARCH="sparc"
-        JAVA_TOOLKIT="server"
-        ;;
-    s390)
-        JAVA_ARCH="s390"
-        JAVA_TOOLKIT="server"
-        ;;
-    s390x)
-        JAVA_ARCH="s390x"
-        JAVA_TOOLKIT="server"
-        ;;
-    x86_64)
-        JAVA_ARCH="amd64"
-        JAVA_TOOLKIT="server"
-        ;;
-    *)
-        AC_MSG_ERROR([No JAVALIB definition host_cpu $host_cpu for host_os $host_os])
+            ;;
+        s390)
+            JAVA_ARCH="s390"
+            JAVA_TOOLKIT="server"
+            ;;
+        s390x)
+            JAVA_ARCH="s390x"
+            JAVA_TOOLKIT="server"
+            ;;
+        x86_64)
+            JAVA_ARCH="amd64"
+            JAVA_TOOLKIT="server"
+            ;;
+        *)
+            AC_MSG_ERROR([No JAVALIB definition host_cpu $host_cpu for host_os $host_os])
+            ;;
+        esac
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
         ;;
-    esac
-    ;;
 
-linux-androideabi*)
+    linux-androideabi*)
 
-    case "$host_cpu" in
+        case "$host_cpu" in
 
     arm|armel)
-        JAVA_ARCH="arm"
-        JAVA_TOOLKIT="server"
+            JAVA_ARCH="arm"
+            JAVA_TOOLKIT="server"
+            ;;
+        esac
         ;;
-    esac
-    ;;
 
-mingw*)
-    x_JAVALIB=[\#]
-    ;;
-
-*netbsd*)
-
-    case "$host_cpu" in
-    i*86)
-        JAVA_ARCH="i386"
-        JAVA_TOOLKIT="client"
-        ;;
-    powerpc)
-        JAVA_ARCH="pcc"
-        JAVA_TOOLKIT="classic"
-        ;;
-    sparc)
-        JAVA_ARCH="sparc"
-        JAVA_TOOLKIT="client"
+    mingw*)
+        x_JAVALIB=[\#]
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
         ;;
-    x86_64)
-        JAVA_ARCH="amd64"
-        JAVA_TOOLKIT="client"
-        ;;
-    esac
-    ;;
 
-openbsd*)
-    case "$host_cpu" in
-    i*86)
-        JAVA_ARCH="i386"
-        JAVA_TOOLKIT="client"
-        ;;
-    x86_64)
-        JAVA_ARCH="amd64"
-        JAVA_TOOLKIT="server"
+    *netbsd*)
+
+        case "$host_cpu" in
+        i*86)
+            JAVA_ARCH="i386"
+            JAVA_TOOLKIT="client"
+            ;;
+        powerpc)
+            JAVA_ARCH="pcc"
+            JAVA_TOOLKIT="classic"
+            ;;
+        sparc)
+            JAVA_ARCH="sparc"
+            JAVA_TOOLKIT="client"
+            ;;
+        x86_64)
+            JAVA_ARCH="amd64"
+            JAVA_TOOLKIT="client"
+            ;;
+        esac
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/netbsd"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+       ;;
+
+    openbsd*)
+        case "$host_cpu" in
+        i*86)
+            JAVA_ARCH="i386"
+            JAVA_TOOLKIT="client"
+            ;;
+        x86_64)
+            JAVA_ARCH="amd64"
+            JAVA_TOOLKIT="server"
+            ;;
+        esac
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/openbsd"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
         ;;
-    esac
-    ;;
 
-solaris*)
+    solaris*)
 
-    JAVA_TOOLKIT="xawt"
-    case "$host_cpu" in
-    i*86)
-        JAVA_ARCH="i386"
-        ;;
-    sparc)
-        JAVA_ARCH="sparc"
+        JAVA_TOOLKIT="xawt"
+        case "$host_cpu" in
+        i*86)
+            JAVA_ARCH="i386"
+            ;;
+        sparc)
+            JAVA_ARCH="sparc"
+            ;;
+        esac
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/solaris"
+        SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
         ;;
     esac
-    ;;
-esac
 
-if test -n "$JAVA_ARCH" ; then
-    JRE_BASE_DIR="$JAVA_HOME/jre/lib/$JAVA_ARCH"
-    JAVALIB="-L $JAVA_HOME/$LIB64"
-    test -d "$JRE_BASE_DIR" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR"
-    test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR/$JAVA_TOOLKIT"
-    test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR/native_thread"
+    if test -n "$JAVA_ARCH" ; then
+        JRE_BASE_DIR="$JAVA_HOME/jre/lib/$JAVA_ARCH"
+        JAVALIB="-L$JAVA_HOME/$LIB64"
+        test -d "$JRE_BASE_DIR" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR"
+        test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/$JAVA_TOOLKIT"
+        test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/native_thread"
+    fi
+else
+    x_JAVALIB=[\#]
+    x_JDKLIB=[\#]
 fi
 
-AC_SUBST(x_JAVALIB)
 AC_SUBST(JAVALIB)
-AC_SUBST(JAVA_HOME)
-AC_SUBST(JDK)
+AC_SUBST(JAVACOMPILER)
+AC_SUBST(JAVADOC)
 AC_SUBST(JAVAFLAGS)
-AC_SUBST(JAVA_SOURCE_VER)
-AC_SUBST(JAVA_TARGET_VER)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
-AC_SUBST(JAVACOMPILER)
-AC_SUBST(JAVADOC)
+AC_SUBST(JAVA_HOME)
+AC_SUBST(JAVA_SOURCE_VER)
+AC_SUBST(JAVA_TARGET_VER)
+AC_SUBST(JDK)
+AC_SUBST(JDKLIB)
+AC_SUBST(x_JAVALIB)
+AC_SUBST(x_JDKLIB)
 
 dnl ===================================================================
 dnl Checks for specific files.
@@ -5828,8 +5919,8 @@ if test $enable_python = system; then
         for python_sysroot in /usr/i686-w64-mingw32/sys-root/mingw ; do
             for python_version in 2.6 ; do
                 if test -f ${python_sysroot}/include/python${python_version}/Python.h; then
-                    PYTHON_CFLAGS="-I ${python_sysroot}/include/python$python_version"
-                    PYTHON_LIBS="-L ${python_sysroot}lib -lpython$python_version $python_libs"
+                    PYTHON_CFLAGS="-I${python_sysroot}/include/python$python_version"
+                    PYTHON_LIBS="-L${python_sysroot}lib -lpython$python_version $python_libs"
                     break
                 fi
             done
@@ -6932,6 +7023,11 @@ These files can be found at <http://dev-www.libreoffice.org/mozilla/>
         fi
     fi
 fi
+
+if test "$SYSTEM_MOZILLA" = "YES" ; then
+    SOLARLIB="$SOLARLIB -L$MOZ_LIB"
+fi
+
 AC_SUBST(BUILD_MOZAB)
 AC_SUBST(PREBUILT_MOZAB)
 AC_SUBST(MOZILLABUILD)
@@ -7237,6 +7333,12 @@ if test "$x_libraries" = "default_x_libraries"; then
 else
     XLIB="$x_libraries"
 fi
+if test "$XLIB" != "no_x_libraries" -a "$XLIB" != "/usr/lib" -a "$XLIB" != "/usr/lib64" ; then
+    SOLARLIB="$SOLARLIB -L$XLIB"
+fi
+if test "$XiNC" != "no_x_include" -a "$XINC" != "/usr/include" ; then
+    SOLARLIB="$SOLARLIB -I$XINC"
+fi
 AC_SUBST(XLIB)
 
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "Android" -a "$_os" != "iOS"; then
@@ -7616,6 +7718,7 @@ the  Windows SDK are installed.])
              -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe" ; then
             AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
         fi
+        SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/include"
     fi
 
     if test -z "$WINDOWS_SDK_HOME"; then
@@ -7654,6 +7757,7 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
     elif test -n "$with_directx_home"; then
         DIRECTXSDK_HOME="$with_directx_home"
     fi
+    SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
 
     if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
         HAVE_DIRECTXSDK_H="yes"
@@ -10583,6 +10687,19 @@ else
 fi
 AC_SUBST(MINGW_EXTERNAL_DLLS)
 
+AC_SUBST(SOLARINC)
+AC_SUBST(SOLARLIB)
+
+if test -z "$SOLARINC_FOR_BUILD" ; then
+    SOLARINC_FOR_BUILD="$SOLARINC"
+fi
+AC_SUBST(SOLARINC_FOR_BUILD)
+
+if test -z "$SOLARLIB_FOR_BUILD" ; then
+    SOLARLIB_FOR_BUILD="$SOLARLIB"
+fi
+AC_SUBST(SOLARLIB_FOR_BUILD)
+
 # make sure config.guess is +x; we execute config.guess, so it has to be so;
 chmod +x ./config.guess
 
diff --git a/set_soenv.in b/set_soenv.in
index 19d071c6f2f3..515ffe1227e2 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -273,9 +273,6 @@ $SOLARVER             = $SRC_ROOT.$SOLVER;
 #Location of Solar version.
 $SOLARVERSION         = '$SOLARVER';
 
-#Location of gnu make directories.
-$WORKDIR              = '$SRC_ROOT/workdir/$INPATH';
-$OUTDIR              = '$SOLARVER/$INPATH';
 #Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
 
 
@@ -311,27 +308,6 @@ foreach $language (@languages)
     }
 }
 
-# Location used by the linker to create libraries.
-if ($platform =~ m/solaris/)
-{  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$ds."lib.solaris.2.6".
-                        $L.$LIB.
-                        $L.$USR.$LIB.
-                        $L.$USR.$LOCAL.$LIB.
-                        $L.$USR_DT.$LIB.
-                        $L.$USR_OPENWIN.$LIB;
-}
-elsif ($platform =~ m/linux|netbsd|freebsd|aix|openbsd|dragonfly/)
-{
-   $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
-}
-elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
-{
-  # Nothing should be needed
-}
-elsif ($platform !~ m/cygwin/ && $platform !~ m/mingw32/ && $platform !~ m/^arm-apple/)
-{  AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
-}
 
 # Windows NT only variables
 if ($platform =~ m/cygwin/)
@@ -513,155 +489,6 @@ else
 {  AddWarning( "set_soenv", "$platform not configured for general environment paths" );
 }
 
-# Linker library search directory paths.
-if ($platform =~ m/solaris/)
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB."solaris.2.6".
-                        $L.$LIB.
-                        $L.$USR_LIB;
-   if ( $CC =~ "gcc" ) {
-      $SOLARLIB      .= $L.$COMPATH.$LIB;
-   }
-   $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
-                        $L.$USR_DT.$LIB.
-                        $L.$USR_OPENWIN.$LIB.
-                        $L.$XLIB;
-
-}
-elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
-   if ($platform =~ m/openbsd/) {
-      $SOLARLIB       .= $L.$USR_LOCAL.$LIB;
-   }
-   if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" && $XLIB ne "no_x_libraries" ) {
-      $SOLARLIB       .= $L.$XLIB;
-   }
-}
-elsif ($platform =~ m/cygwin|mingw32/)
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
-}
-elsif ($platform =~ m/darwin/)
-{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
-}
-
-if ($SYSTEM_MOZILLA eq "YES")
-{
-       $SOLARLIB .= $L."@MOZ_LIB@"
-}
-
-# Location of the compiler include search directory paths.
-$SOLARINC             = $I.$cur_dir.
-                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."stl".
-                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".
-                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.
-                        $I.'$SOLARENV'.$INC.$ds.'$OUTPATH'.
-                        $I.'$SOLARENV'.$INC.
-                        $I.'$SRC_ROOT'.$ds."res";
-
-if ($platform =~ m/solaris|linux|freebsd|netbsd|aix|openbsd|dragonfly/ && '@CROSS_COMPILING@' ne 'YES')
-{
-    if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
-    {
-        $SOLARINC            .= '/SC5 ';
-    }
-    # Platform dependent include path at the top of this list of include paths
-    if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
-    {
-        $SOLARINC         .= $I.$COMPATH.$INCLUDE;
-    }
-
-	# pickup system jpeg over java jpeg on OpenBSD
-	if ($platform =~ m/openbsd/)
-	{   $SOLARINC  .= $I.$USR_LOCAL.$INCLUDE;
-	}
-    if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
-    {   $SOLARINC  .= $I.$JAVA_HOME.$INCLUDE;
-	}
-
-	#include system dependent Java include directory
-	if (!($JDK eq "gcj") && $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
-	{
-   		if ($platform =~ m/solaris/)
-   		{  $SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."solaris";
-   		}
-   		elsif  ($platform =~ m/linux/)
-   		{  $SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."linux";
-   		}
-   		elsif ($platform =~ m/freebsd/)
-   		{
-      		$SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."freebsd";
-      		$SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."bsd";
-      		$SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."linux";
-   		}
-   		elsif ($platform =~ m/netbsd/)
-   		{  $SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."netbsd";
-   		}
-		elsif ( $platform =~ m/aix/ )
-		{  $SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."aix";
-		}
-		elsif ($platform =~ m/openbsd/)
-		{  $SOLARINC   .=$I.$JAVA_HOME.$INCLUDE.$ds."openbsd";
-		}
-
-   		#java threads include path
-
-        $SOLARINC .=$I.$JAVA_HOME.$INCLUDE.$ds."native_threads".$INCLUDE;
-	}
-    #The tail, if needed
-    if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/)
-    {  if ( $XINC ne "/usr/include" && $XINC ne 'no_x_includes' ) {
-            $SOLARINC  .= $I.$XINC;
-       }
-    }
-}
-elsif ($platform =~ m/cygwin/)
-{  if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
-   {  $SOLARINC       .= $I.$JAVA_HOME.$INCLUDE.$ds."win32".
-                         $I.$JAVA_HOME.$INCLUDE;
-   }
-   $SOLARINC       .= $I.'$WINDOWS_SDK_HOME'.$INCLUDE.
-                      $I.'$COMPATH'.$INCLUDE;
-   if ( '@ENABLE_DIRECTX@' ne "" ) {
-       $SOLARINC   .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
-   }
-}
-elsif ($platform =~ m/mingw32/)
-{  if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
-   {  if (  '@build_os' eq 'cygwin' )
-      {  # Using MinGW from Cygwin. Use the normal Windows JDK
-         # headers
-         $SOLARINC       .= $I.$JAVA_HOME.$INCLUDE.$ds."win32".
-                            $I.$JAVA_HOME.$INCLUDE;
-      }
-      else
-      {  # Cross-compilation. Use our fake jni_md.h
-         # and othewise the build platform JDK headers
-         $SOLARINC       .= $I.$SOLARENVINC.$ds."win32".
-                            $I.$JAVA_HOME.$INCLUDE;
-      }
-   }
-}
-elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
-{  $SOLARINC         .= $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
-                        $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
-}
-elsif ($platform =~ m/^arm-apple/)
-{
-}
-elsif ($platform =~ m/linux-androideabi$/)
-{
-}
-else
-{  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
-}
 
 #
 # F. Setting the different aliases.
@@ -710,7 +537,6 @@ ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
 }
-ToFile( "PROEXT",            $PROEXT,            "e" );
 ToFile( "nodep",             "@nodep@",          "e" );
 ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
 
@@ -770,8 +596,6 @@ ToFile( "WITH_VC_REDIST", "TRUE",  "e" );
 ToFile( "PERL",              $PERL,              "e" );
 ToFile( "SOLARVER",          $SOLARVER,          "e" );
 ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );
-ToFile( "WORKDIR",           $WORKDIR,           "e" );
-ToFile( "OUTDIR",            $OUTDIR,            "e" );
 ToFile( "SOLARENV",          $SOLARENV,          "e" );
 ToFile( "SOLARENVINC",       $SOLARENVINC,       "e" );
 ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
@@ -795,8 +619,6 @@ if ( '@JDK@' ne '' )
    ToFile( "JAVADOC",         PathFormat("@JAVADOC@"), "e" );
    ToFile( "JVM_ONE_PATH_CHECK", "@JVM_ONE_PATH_CHECK@", "e" );
 }
-ToFile( "SOLAREXTRAINC",     $SOLAREXTRAINC,     "e" );
-ToFile( "SOLAREXTRALIB",     $SOLAREXTRALIB,     "e" );
 if ( '@CROSS_COMPILING@' eq 'YES' )
 {
    # Obviously we shouldn't set PATH to contain host binaries
@@ -806,8 +628,6 @@ else
 {
    ToFile( "PATH",           $PATH,              "e" );
 }
-ToFile( "SOLARLIB",          $SOLARLIB,          "e" );
-ToFile( "SOLARINC",          $SOLARINC,          "e" );
 ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
 ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 ToFile( "CC",                $CC,                "e" );
@@ -819,10 +639,6 @@ if ( '@CROSS_COMPILING@' eq 'YES' )
    ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
    ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
    ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" );
-   ToFile( "OUTDIR_FOR_BUILD",  "@OUTDIR_FOR_BUILD@", "e");
-   ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e");
-   ToFile( "SOLARLIB_FOR_BUILD", "@SOLARLIB_FOR_BUILD@", "e");
-   ToFile( "WORKDIR_FOR_BUILD", "@WORKDIR_FOR_BUILD@", "e");
 }
 else
 {
@@ -830,11 +646,7 @@ else
    ToFile( "CXX_FOR_BUILD",     $CXX,            "e" );
    ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
    ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT@", "e" );
-   ToFile( "OUTDIR_FOR_BUILD",  $OUTDIR,         "e" );
    ToFile( "PATH_FOR_BUILD",    $PATH,           "e" );
-   ToFile( "SOLARINC_FOR_BUILD", $SOLARINC,      "e" );
-   ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB,      "e" );
-   ToFile( "WORKDIR_FOR_BUILD", $WORKDIR,        "e" );
 }
 ToFile( "CXX",               $CXX,               "e" );
 if ( '@ENABLE_RPATH@' eq "no" ) {