5 files changed, 2 insertions, 13 deletions
diff --git a/configure.in b/configure.in
index e4bf2b6a3fed..bbeda5a53d87 100755
--- a/configure.in
+++ b/configure.in
@@ -894,7 +894,7 @@ AC_ARG_WITH(system-sane,
     AS_HELP_STRING([--with-system-sane-header],
         [Use sane.h already on system.]))
 
-AC_ARG_WITH(system-xrender,
+AC_ARG_WITH(system-xrender-headers,
     AS_HELP_STRING([--with-system-xrender-headers],
         [Use XRender headers already on system.]))
 
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 7102c26579b4..799540dc7e19 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -1,8 +1,8 @@
 --with-vendor=The Document Foundation
 --with-system-dicts
 --without-unix-wrapper
---without-system-zlib
 --without-system-xrender-headers
+--without-system-zlib
 --without-system-stdlibs
 --without-system-python
 --without-system-poppler
@@ -13,7 +13,6 @@
 --without-system-libxml
 --without-system-jpeg
 --without-system-jars
---without-system-freetype
 --without-system-cairo
 --without-openldap
 --without-junit
@@ -25,12 +24,10 @@
 --with-external-hyph-dir=/usr/share/hyphen
 --with-external-dict-dir=/usr/share/hunspell
 --with-extension-integration
---with-dict=ALL
 --enable-opengl
 --enable-odk
 --enable-lockdown
 --enable-kde
---enable-hids
 --enable-gstreamer
 --enable-gnome-vfs
 --enable-ext-wiki-publisher
@@ -45,7 +42,5 @@
 --disable-xrender-link
 --disable-unix-qstart
 --disable-randr-link
---disable-pam-link
 --disable-kde4
 --disable-dbus
---disable-crypt-link
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index f862ad5b5e0b..336892fbd73b 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -1,5 +1,4 @@
 --disable-build-mozilla
---disable-crypt-link
 --disable-dbus
 --disable-epm
 --disable-kde
@@ -8,7 +7,6 @@
 --disable-nss-module
 --disable-odk
 --disable-opengl
---disable-pam-link
 --disable-randr-link
 --disable-unix-qstart
 --disable-xrender-link
@@ -17,7 +15,6 @@
 --enable-cairo
 --enable-gnome-vfs
 --enable-gstreamer
---enable-hids
 --enable-lockdown
 --enable-ext-presenter-minimizer
 --enable-ext-pdfimport
@@ -26,7 +23,6 @@
 --enable-ext-wiki-publisher
 --with-alloc=system
 --with-ant-home=/usr/local/ant/lib
---with-dict=ALL
 --with-extension-integration
 --with-fonts
 --with-java-target-version=1.5
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 5e78e22d8004..dd96ffd9d4f0 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -5,7 +5,6 @@
 --without-agfa-monotype-fonts
 --with-nlpsolver
 --with-java-target-version=1.5
---enable-hids
 --enable-broffice
 --disable-xrender-link
 --disable-activex-component
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 7bdf47d0816e..c8a2647fe620 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,7 +1,6 @@
 --with-vendor=The Document Foundation
 --without-agfa-monotype-fonts
 --with-java-target-version=1.5
---enable-hids
 --enable-cl-x64
 --enable-broffice
 --disable-xrender-link