diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/openldap.in | 10 | ||||
| -rw-r--r-- | rules/openldap.make | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/rules/openldap.in b/rules/openldap.in index 25347cf78..b967d1dff 100644 --- a/rules/openldap.in +++ b/rules/openldap.in @@ -5,9 +5,9 @@ menuconfig OPENLDAP prompt "openldap " select ZLIB select LIBC_RESOLV + select LIBC_PTHREAD select OPENSSL if OPENLDAP_TLS_OPENSSL select GNUTLS if OPENLDAP_TLS_GNUTLS - select LIBC_PTHREAD if OPENLDAP_THREADS help OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol. The suite includes: @@ -24,14 +24,6 @@ config OPENLDAP_SLAPD help Enable/disable building and installation of slapd (the server). -config OPENLDAP_THREADS - bool - prompt "Build with multi-thread support (libldap_r)" - help - Enables the reentrant version of libldap. When this option is - enabled, libldap_r is built and installed. (The non-reentrant version - libldap is always installed and built.) - choice prompt "TLS/SSL support " diff --git a/rules/openldap.make b/rules/openldap.make index 21634c2a8..730cd1206 100644 --- a/rules/openldap.make +++ b/rules/openldap.make @@ -82,7 +82,7 @@ OPENLDAP_CONF_OPT := \ --without-cyrus-sasl \ --without-fetch \ --with-yielding_select=yes \ - --$(call ptx/wwo, PTXCONF_OPENLDAP_THREADS)-threads \ + --with-threads \ --with-tls=$(OPENLDAP_TLS_CONF_OPT-y) @@ -118,9 +118,7 @@ endif @$(call install_lib, openldap, 0, 0, 0644, liblber-$(OPENLDAP_LIBVERSION)) @$(call install_lib, openldap, 0, 0, 0644, libldap-$(OPENLDAP_LIBVERSION)) -ifdef PTXCONF_OPENLDAP_THREADS @$(call install_lib, openldap, 0, 0, 0644, libldap_r-$(OPENLDAP_LIBVERSION)) -endif # tools |