diff options
| author | Mathias Michel <matm@gmx.fr> | 2012-12-04 03:35:14 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2012-12-04 10:53:36 +0000 |
| commit | a0c53a961a0af21f69f592b43799cd635c994810 (patch) | |
| tree | 202006572b8daba3a5b9e2a974f36bb281e2b6cf /config_host.mk.in | |
| parent | 7afb54926b55e02ccd9bbb80679e2591d73dc0ca (diff) | |
First fix for fdo#56902
Restrict moz to windows, and build vars also
impacts nss, connectivity
Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282
Reviewed-on: https://gerrit.libreoffice.org/1233
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index f2e4a1df87d9..03972128af9a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -39,7 +39,6 @@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ export BSH_JAR=@BSH_JAR@ export BUILD_DMAKE=@BUILD_DMAKE@ -export BUILD_MOZAB=@BUILD_MOZAB@ export BUILD_PLATFORM=@build@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ export BUILD_TYPE=@BUILD_TYPE@ @@ -91,7 +90,6 @@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@ export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@ export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@ export debug=@ENABLE_DEBUG@ -export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@ export DEFAULT_TO_ENGLISH_FOR_PACKING=yes export DEVINSTALLDIR=@DEVINSTALLDIR@ export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@ @@ -170,6 +168,7 @@ export ENABLE_ZENITY=@ENABLE_ZENITY@ export EPM=@EPM@ export EPM_FLAGS=@EPM_FLAGS@ export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@ +export EXTMSV80=$(gb_Space)@EXTMSV80@ @x_Cygwin@ export FIND=@WIN_FIND@ export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@ export FLEX=@FLEX@ @@ -387,15 +386,11 @@ export MKDEPENDSOLVER=TRUE export ML_EXE=@ML_EXE@ export MOC4=@MOC4@ export MOC=@MOC@ -export MOZILLABUILD=@MOZILLABUILD@ export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@ -export MOZILLA_VERSION=@MOZILLA_VERSION@ -export MOZ_FLAVOUR=@MOZ_FLAVOUR@ -export MOZ_INC=@MOZ_INC@ -export MOZ_LIB=@MOZ_LIB@ -export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@ export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@ +export MSVC80_MNFST=@MSVC80_MNFST@ +export MSVC80_DLL_DIR=@MSVC80_DLL_DIR@ export MYSQL_DEFINES=@MYSQL_DEFINES@ export MYSQL_INC=@MYSQL_INC@ export MYSQL_LIB=@MYSQL_LIB@ @@ -408,6 +403,7 @@ export NM=@NM@ export nodep=@nodep@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@ export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@ +export NSSBUILDTOOLS=@NSSBUILDTOOLS@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@ @@ -444,7 +440,6 @@ export POPPLER_CFLAGS=$(gb_SPACE)@POPPLER_CFLAGS@ export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@ export POSTGRESQL_INC=@POSTGRESQL_INC@ export POSTGRESQL_LIB=@POSTGRESQL_LIB@ -export PREBUILD_MOZAB=@PREBUILD_MOZAB@ export PREFIXDIR=@PREFIXDIR@ export PRODUCT=@PRODUCT@ export PRODUCTNAME=@PRODUCTNAME@ @@ -548,7 +543,6 @@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@ export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@ export SYSTEM_MDDS=@SYSTEM_MDDS@ export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@ -export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@ export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@ export SYSTEM_MYSQL=@SYSTEM_MYSQL@ export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@ @@ -611,7 +605,7 @@ export WITH_KRB5=@WITH_KRB5@ export WITH_LANG=@WITH_LANG@ export WITH_LANG_LIST=@WITH_LANG_LIST@ export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@ -export WITH_MOZILLA=@WITH_MOZILLA@ +export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@ export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@ export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@ export WITH_STLPORT=@WITH_STLPORT@ |