diff options
| author | Pierre Joye <pajoye@php.net> | 2010-07-26 22:28:38 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-07-26 22:28:38 +0000 |
| commit | ed4f6dbd36e14aa9af23e7fa37b7da7f18865e46 (patch) | |
| tree | e867a10ac8ffc4cb7498810397b96c9487d52cf6 | |
| parent | 94286b35e301681e7afcc1315293d7cd0c2505c2 (diff) | |
| download | php-git-ed4f6dbd36e14aa9af23e7fa37b7da7f18865e46.tar.gz | |
- make libsasl optional (as vc6 bins do not have it)
| -rw-r--r-- | ext/ldap/config.w32 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index 2fa05f4383..d9a270d298 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -11,16 +11,19 @@ if (PHP_LDAP != "no") { CHECK_LIB("ssleay32.lib", "ldap", PHP_LDAP) && CHECK_LIB("libeay32.lib", "ldap", PHP_LDAP) && CHECK_LIB("oldap32_a.lib", "ldap", PHP_LDAP) && - CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP)&& - CHECK_LIB("libsasl.lib", "ldap", PHP_LDAP)) { + CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP) + ) { + if (CHECK_LIB("libsasl.lib", "ldap", PHP_LDAP)) { + AC_DEFINE('HAVE_LDAP_SASL', 1); + AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1); + PHP_LDAP = 1; + } EXTENSION('ldap', 'ldap.c'); AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1); AC_DEFINE('HAVE_LDAP_PARSE_REFERENCE', 1); AC_DEFINE('HAVE_LDAP_START_TLS_S', 1); AC_DEFINE('HAVE_LDAP', 1); - AC_DEFINE('HAVE_LDAP_SASL', 1); - AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1); AC_DEFINE('LDAP_DEPRECATED', 1); } else { |