diff options
| author | Vlad Glagolev | 2010-03-19 20:21:54 +0300 |
|---|---|---|
| committer | Eric Sandall | 2010-03-29 22:23:02 -0700 |
| commit | e10882d3f791ef4a4d830d94747c1b2f1d3cb5b9 (patch) | |
| tree | eb4934f222abbf1400c3b993d5b1004dd74e3bb6 | |
| parent | 5b8c5df8f987f22f3ddba92939249c82d7744740 (diff) | |
php: corrected libsasl dependency with openldap
| -rwxr-xr-x | php-pear/php/DEPENDS | 7 | ||||
| -rw-r--r-- | php-pear/php/HISTORY | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS index 057a9cef5f..74772a0618 100755 --- a/php-pear/php/DEPENDS +++ b/php-pear/php/DEPENDS @@ -181,11 +181,14 @@ optional_depends openldap \ "--with-ldap" "--without-ldap" \ "for LDAP support" && -if list_find "${PHP5_OPTS}" "--with-ldap"; then +if is_depends_enabled $SPELL openldap; then optional_depends LIBSASL \ "--with-ldap-sasl" "--without-ldap-sasl" \ "for LDAP with Cyrus SASL support" && - depends -sub openldap SASL + + if list_find "${PHP5_OPTS}" "--with-ldap-sasl"; then + depends -sub openldap SASL + fi fi && optional_depends mm \ diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index 55b0108ca8..1684814f79 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -1,3 +1,6 @@ +2010-03-19 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: corrected libsasl dependency for openldap + 2010-01-19 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated legacy to 5.2.12, SECURITY_PATCH++ * BUILD, CONFIGURE, DEPENDS: apache and cgi sapis are mutually exclusive |