diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-01-13 17:01:32 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-01-16 19:37:27 +0000 |
| commit | 5a21b3ee198cefc1f4081ff4f99c1752c4bded8f (patch) | |
| tree | 5acacd3c585f104fbb4944d5ba77cb9755c50789 /config_host.mk.in | |
| parent | 5bf6064e69f1903f0d7682965b59fb5a0acb0af2 (diff) | |
AbiWord Import filter
Reviewed-on: https://gerrit.libreoffice.org/7411
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
(cherry picked from commit 10eaaac020e32f0bbb3869cecee94df0955b6a3b)
Conflicts:
external/Module_external.mk
writerperfect/util/wpftwriter.component
Change-Id: I90dc115044e5f81fa3a2b105d30d7d39e438b086
Fix a silly with ABW footnotes/endnotes
Change-Id: I026f9c664ff7dec51e511ad439ab563d2cc0c201
(cherry picked from commit 766f718ebb4deda1a294cc1cfe137a75dfb0f6f8)
Fix ABW list shapes
Change-Id: Ibbbfddf10677e8c5b654cee9c5fda1603a298a67
(cherry picked from commit f8bf3e3cd4b55099a1427d611af06a45460034e7)
Fix ABW embedded images
Change-Id: Ifd33ea9c1f91865d5ae5175eefa9b65107404bf0
(cherry picked from commit 7c3ca696543d0e9d6771d53f386086086d8b8643)
Uploading libabw-0.0.1 (support of zabw files too)
Change-Id: Ie04cae9b9a362cb43b671fe8986545865822a953
(cherry picked from commit 838c8889491b7e5b08f681b7f85740784c0c1a3b)
Reviewed-on: https://gerrit.libreoffice.org/7478
Reviewed-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Thorsten Behrens <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 49977f1833ca..5bc7b1455721 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -13,6 +13,8 @@ export SRC_ROOT=@SRC_ROOT@ export BUILDDIR=@BUILDDIR@ @x_AFLAGS@ export AFLAGS=@AFLAGS@ +export ABW_CFLAGS=$(gb_SPACE)@ABW_CFLAGS@ +export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@ export ALLOC=@ALLOC@ export ALL_LANGS=@ALL_LANGS@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ @@ -481,6 +483,7 @@ export SUNTEMPLATES_FR_PACK=@SUNTEMPLATES_FR_PACK@ export SUNTEMPLATES_HU_PACK=@SUNTEMPLATES_HU_PACK@ export SUNTEMPLATES_IT_PACK=@SUNTEMPLATES_IT_PACK@ export SYSBASE=@SYSBASE@ +export SYSTEM_ABW=@SYSTEM_ABW@ export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@ export SYSTEM_BOOST=@SYSTEM_BOOST@ export SYSTEM_BSH=@SYSTEM_BSH@ |