From: Pierre Joye <pajoye@php.net>
Date: Mon, 26 Jul 2010 22:28:38 +0000 (+0000)
Subject: -  make libsasl optional (as vc6 bins do not have it)
X-Git-Tag: php-5.3.4RC1~412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed4f6dbd36e14aa9af23e7fa37b7da7f18865e46;p=php

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

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 {