pajoye Mon, 26 Jul 2010 22:28:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301590
Log:
- make libsasl optional (as vc6 bins do not have it)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/ldap/config.w32
Modified: php/php-src/branches/PHP_5_3/ext/ldap/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/ldap/config.w32 2010-07-26 22:25:12 UTC
(rev 301589)
+++ php/php-src/branches/PHP_5_3/ext/ldap/config.w32 2010-07-26 22:28:38 UTC
(rev 301590)
@@ -11,16 +11,19 @@
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 {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
