diff options
| author | rh <rh@pkgsrc.org> | 2004-09-27 04:11:52 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2004-09-27 04:11:52 +0000 |
| commit | 5c85b41f4f2d07417211ad697a87cc35fa47acce (patch) | |
| tree | 383be5f265bdf9a55e625028a70b569e24fcf7ce | |
| parent | a2ee0d0d058b14780a084dba3156842f98e00795 (diff) | |
| download | pkgsrc-5c85b41f4f2d07417211ad697a87cc35fa47acce.tar.gz | |
This version of openldap no longer builds against the old version of sasl,
so don't attempt to depend on it (always use cyrus-sasl2 for SASL support).
OK'ed by jlam.
| -rw-r--r-- | databases/openldap/options.mk | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk index 4aada900454..aeb2ce07d75 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2004/09/27 04:11:52 rh Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap PKG_SUPPORTED_OPTIONS= dynamic kerberos sasl slp @@ -26,19 +26,12 @@ PKG_OPTIONS+= sasl .endif ### -### SASL authentication +### SASL authentication (requires SASL2) ### .if !empty(PKG_OPTIONS:Msasl) -. if !defined(USE_SASL2) && !defined(USE_SASL) -. include "../../security/cyrus-sasl2/buildlink3.mk" -CONFIGURE_ARGS+= --with-cyrus-sasl -. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -. include "../../security/cyrus-sasl2/buildlink3.mk" -CONFIGURE_ARGS+= --with-cyrus-sasl -. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -. include "../../security/cyrus-sasl/buildlink3.mk" -CONFIGURE_ARGS+= --with-cyrus-sasl -. endif +CONFIGURE_ARGS+= --with-cyrus-sasl +BUILDLINK_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15 +. include "../../security/cyrus-sasl2/buildlink3.mk" .endif ### |