migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv

1 files changed, 311 insertions, 194 deletions

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