[Libreoffice-commits] .: Branch 'libreoffice-3-3' - distro-configs/LibreOfficeLinux.conf.in distro-configs/LibreOfficeWin32.conf.in

[Fridrich Strba]

 distro-configs/LibreOfficeLinux.conf.in |   91 +++++++++++++++++---------------
 distro-configs/LibreOfficeWin32.conf.in |   20 +++++--
 2 files changed, 66 insertions(+), 45 deletions(-)

New commits:
commit 93478c1aa0eb6f2b135f665c5504b4d38bc04772
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Jan 17 11:59:39 2011 +0100

    Putting relevant configure options into distro config files

diff --git a/distro-configs/LibreOfficeLinux.conf.in b/distro-configs/LibreOfficeLinux.conf.in
index ba9bb80..0f9ad9a 100644
--- a/distro-configs/LibreOfficeLinux.conf.in
+++ b/distro-configs/LibreOfficeLinux.conf.in
@@ -1,51 +1,58 @@
 --with-vendor=\"The Document Foundation\"
---disable-dbus
---disable-kde4
---enable-cairo
---without-system-cairo
---enable-gstreamer
---enable-odk
---enable-binfilter
---enable-gnome-vfs
---enable-hids
---enable-lockdown
---enable-opengl
---with-java-target-version=1.5
---with-jdk-home=$JAVA_HOME
---enable-epm
---enable-kde
+--with-system-dicts
+--with-package-format=\"rpm deb\"
+--without-unix-wrapper
+--without-system-zlib
+--without-system-xrender-headers
+--without-system-stdlibs
+--without-system-python
+--without-system-poppler
+--without-system-openssl
 --without-system-mozilla
---without-system-freetype
---without-system-jpeg
---without-system-libxml
+--without-system-mesa-headers
 --without-system-libxslt
---without-system-python
---without-system-zlib
+--without-system-libxml
+--without-system-libwps
+--without-system-libwpg
+--without-system-libwpd
+--without-system-jpeg
 --without-system-jars
---without-system-stdlibs
---disable-crypt-link
---disable-pam-link
---disable-xrender-link
---disable-randr-link
+--without-system-freetype
+--without-system-cairo
 --without-openldap
---without-system-xrender-headers
---without-system-mesa-headers
---without-unix-wrapper
---with-fonts
---enable-minimizer
---enable-presenter-console
---enable-pdfimport
---without-system-poppler
---enable-wiki-publisher
---enable-report-builder
---with-extension-integration
+--without-junit
+--without-helpppack-integration
+--with-nlpsolver
 --with-linker-hash-style=both
---with-ant-home=$BUILDDIR/$APACHE_ANT
---with-system-dicts
---with-external-dict-dir=/usr/share/hunspell
---with-external-hyph-dir=/usr/share/hyphen
+--with-jdk-home=$JAVA_HOME
+--with-java-target-version=1.5
+--with-fonts
 --with-external-thes-dir=/usr/share/mythes
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-dict-dir=/usr/share/hunspell
+--with-extension-integration
 --with-dict=ALL
---without-system-openssl
---disable-unix-qstart
+--with-ant-home=$BUILDDIR/$APACHE_ANT
+--enable-wiki-publisher
+--enable-report-builder
+--enable-presenter-console
+--enable-pdfimport
+--enable-opengl
+--enable-odk
+--enable-minimizer
+--enable-lockdown
+--enable-kde
+--enable-hids
+--enable-gstreamer
+--enable-gnome-vfs
+--enable-epm
+--enable-cairo
 --enable-broffice
+--enable-binfilter
+--disable-xrender-link
+--disable-unix-qstart
+--disable-randr-link
+--disable-pam-link
+--disable-kde4
+--disable-dbus
+--disable-crypt-link
diff --git a/distro-configs/LibreOfficeWin32.conf.in b/distro-configs/LibreOfficeWin32.conf.in
index 4dffa57..fbaccd1 100644
--- a/distro-configs/LibreOfficeWin32.conf.in
+++ b/distro-configs/LibreOfficeWin32.conf.in
@@ -1,7 +1,21 @@
 --with-vendor=\"The Document Foundation\"
+--without-system-mesa-headers
+--without-junit
+--without-helpppack-integration
+--without-helppack-integration
+--without-agfa-monotype-fonts
+--with-nlpsolver
 --with-java-target-version=1.5
+--with-extension-integration
+--enable-wiki-publisher
+--enable-report-builder
+--enable-presenter-console
+--enable-pdfimport
+--enable-nss-module
+--enable-minimizer
 --enable-hids
---disable-activex-component
---without-agfa-monotype-fonts
---disable-xrender-link
 --enable-broffice
+--enable-binfilter
+--disable-xrender-link
+--disable-build-mozilla
+--disable-activex-component