summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in3
-rw-r--r--distro-configs/LibreOfficeLinux.conf1
-rw-r--r--distro-configs/LibreOfficeOpenBSD.conf1
-rw-r--r--distro-configs/OxygenOfficeLinux.conf1
-rw-r--r--distro-configs/OxygenOfficeWin32.conf1
5 files changed, 1 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index 7069b5e57c63..d5a75ae6e609 100644
--- a/configure.in
+++ b/configure.in
@@ -1260,7 +1260,7 @@ AC_ARG_WITH(system-icu,
[Use icu already on system.]),,
[with_system_icu="$with_system_libs"])
-AC_ARG_WITH(system_openldap,
+AC_ARG_WITH(system-openldap,
AS_HELP_STRING([--with-system-openldap],
[Use the OpenLDAP LDAP SDK already on system.]),,
[with_system_openldap="$with_system_libs"])
@@ -7777,7 +7777,6 @@ AC_SUBST(MOZ_FLAVOUR)
AC_SUBST(MOZ_INC)
AC_SUBST(MOZ_LIB)
AC_SUBST(MOZ_LIB_XPCOM)
-AC_SUBST(MOZ_LDAP_CFLAGS)
dnl ===================================================================
dnl Check for system NSS only with xmlsec or mozilla build enabled
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 499d30a80b31..647001ea2158 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -12,7 +12,6 @@
--without-system-jars
--without-system-cairo
--without-system-postgresql
---without-openldap
--without-junit
--without-helppack-integration
--with-linker-hash-style=both
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index f55550a30bc0..8315fe328126 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -47,7 +47,6 @@
--with-system-zlib
--with-vendor=The OpenBSD project
--without-junit
---without-openldap
--without-system-mozilla
--without-unix-wrapper
--without-system-libwpd
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index a9203f2e1a65..b4e27b91aaec 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -77,7 +77,6 @@
--enable-graphite
--enable-dependency-tracking
--enable-python=internal
---with-openldap
--enable-oxygenoffice
--enable-ccache
--enable-crashdump
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index 04b92ddb2f58..3faac6d9f952 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -41,4 +41,3 @@
--enable-dependency-tracking
--enable-mozilla
--with-system-mozilla=mozilla
---with-openldap