- make libsasl optional (as vc6 bins do not have it)

diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32
index 2fa05f438347b1d4eeecfc51898696b2e7c2ed3d..d9a270d2984cb31a28856eb5ea83bb3f93de287c 100644 (file)
--- 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 {