diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-07-17 16:28:24 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:31 +0200 |
| commit | b40ba3f8c5e69408e3250fadd8ac0b79d5b98187 (patch) | |
| tree | 471f2b450a924846178793eec9b173cc46d9b097 /distro-configs | |
| parent | 6825870a23d41837320bde5b92166b6672d2e211 (diff) | |
Linux and Win builds use mergelibs starting with 5.0
(cherry picked from commit 094f894bace181708bc5c826f86c9a8e9f126675)
Change-Id: I7cdcdcbbbbdc4ba44b3fb8014f93cc522b61f5fc
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 1 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeWin32.conf | 1 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeWin64.conf | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 2ab94d49c705..fcd7746c24a6 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -36,3 +36,4 @@ --disable-gio --disable-randr-link --disable-kde4 +--enable-mergelibs diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index fac986456d13..c231ccdcc31b 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -11,3 +11,4 @@ --with-help --with-myspell-dicts --with-package-format=msi +--enable-mergelibs diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 5fa640dca1ae..cc8211f4d450 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -12,3 +12,4 @@ --with-help --with-myspell-dicts --with-package-format=msi +--enable-mergelibs |