move COMPATH,EPM_FLAGS and connex variables out of set_soenv.in

1 files changed, 9 insertions, 0 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 7087cb4b20ac..bd26074f94e5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -14,6 +14,8 @@ export ANCIENT_BISON="@ANCIENT_BISON@"
 export ANDROID_NDK_HOME="@ANDROID_NDK_HOME@"
 export ANDROID_SDK_HOME="@ANDROID_SDK_HOME@"
 export AR="@AR@"
+export ATL_INCLUDE="@ATL_INCLUDE@"
+export ATL_LIB="@ATL_LIB@"
 export AWTLIB='@AWTLIB@'
 export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@"
 export BSH_JAR="@BSH_JAR@"
@@ -23,6 +25,7 @@ export BUILD_MOZAB="@BUILD_MOZAB@"
 export BUILD_NCPUS="@BUILD_NCPUS@"
 export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@"
 export BUILD_STAX="@BUILD_STAX@"
+export BUILD_TYPE="@BUILD_TYPE@"
 export BUILD_UNOWINREG="@BUILD_UNOWINREG@"
 export BUILD_VER_STRING="@BUILD_VER_STRING@"
 export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
@@ -31,10 +34,12 @@ export CDR_CFLAGS="@CDR_CFLAGS@"
 export CDR_LIBS="@CDR_LIBS@"
 export CL_X64="@CL_X64@"
 export COM="@COM@"
+export COMEX="@COMEX@"
 export COMMONS_CODEC_JAR="@COMMONS_CODEC_JAR@"
 export COMMONS_HTTPCLIENT_JAR="@COMMONS_HTTPCLIENT_JAR@"
 export COMMONS_LANG_JAR="@COMMONS_LANG_JAR@"
 export COMMONS_LOGGING_JAR="@COMMONS_LOGGING_JAR@"
+export COMPATH="@COMPATH@"
 export COM_FOR_BUILD="@COM_FOR_BUILD@"
 export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@"
 export CPPUNIT_LIBS="@CPPUNIT_LIBS@"
@@ -109,6 +114,7 @@ export ENABLE_UGLY="@ENABLE_UGLY@"
 export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
 export ENABLE_ZENITY="@ENABLE_ZENITY@"
 export EPM="@EPM@"
+export EPM_FLAGS="@EPM_FLAGS@"
 export FLUTE_JAR="@FLUTE_JAR@"
 export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
 export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
@@ -210,6 +216,8 @@ export LUCENE_CORE_JAR="@LUCENE_CORE_JAR@"
 export MANDIR="@MANDIR@"
 export MDDS_CPPFLAGS="@MDDS_CPPFLAGS@"
 export MERGELIBS="@MERGELIBS@"
+export MFC_INCLUDE="@MFC_INCLUDE@"
+export MFC_LIB="@MFC_LIB@"
 export MINGWCXX="@MINGWCXX@"
 export MINGWSTRIP="@MINGWSTRIP@"
 export MINGW_EXTERNAL_DLLS="@MINGW_EXTERNAL_DLLS@"
@@ -249,6 +257,7 @@ export OOO_VENDOR="@OOO_VENDOR@"
 export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
 export OPENSSL_LIBS="@OPENSSL_LIBS@"
 export OS="@OS@"
+export OSVERSION="@OSVERSION@"
 export OS_FOR_BUILD="@OS_FOR_BUILD@"
 export OUTPATH="@OUTPATH@"
 export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"