summaryrefslogtreecommitdiff
path: root/distro-configs
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-07-17 16:28:24 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-07-17 16:28:24 +0200
commit094f894bace181708bc5c826f86c9a8e9f126675 (patch)
tree97b2b1360cb6ca643ce8f3b2fcbe41b19da777d9 /distro-configs
parentd9b2105e14b7f84c24ced4faea1795e32d8e21d1 (diff)
Linux and Win builds use mergelibs starting with 5.0
Change-Id: I7cdcdcbbbbdc4ba44b3fb8014f93cc522b61f5fc
Diffstat (limited to 'distro-configs')
-rw-r--r--distro-configs/LibreOfficeLinux.conf1
-rw-r--r--distro-configs/LibreOfficeWin32.conf1
-rw-r--r--distro-configs/LibreOfficeWin64.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 2824fb66df0f..0175ff98cd39 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -38,3 +38,4 @@
--disable-randr-link
--disable-kde4
--disable-gtk3
+--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 1c3ee2849561..e2d7aca80b8a 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -11,3 +11,4 @@
--with-help
--with-myspell-dicts
--with-package-format=msi
+--enable-mergelibs