From: Pierre Joye <pajoye@php.net>
Date: Thu, 31 Jul 2008 18:04:21 +0000 (+0000)
Subject: - add detection for newer libs
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~936
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fb301bcc9d147fbdbd15ccb1bb13311f1ad5685;p=php

- add detection for newer libs
---

diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32
index a0fbeb2741..08ba64c38b 100644
--- a/ext/ldap/config.w32
+++ b/ext/ldap/config.w32
@@ -5,11 +5,13 @@ ARG_WITH("ldap", "LDAP support", "no");
 
 if (PHP_LDAP != "no") {
 
-	if (CHECK_HEADER_ADD_INCLUDE("ldap.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
+	if (CHECK_HEADER_ADD_INCLUDE("ldap.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
+			CHECK_HEADER_ADD_INCLUDE("lber.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP)
+			&&
 			CHECK_LIB("ssleay32.lib", "ldap", PHP_LDAP) &&
 			CHECK_LIB("libeay32.lib", "ldap", PHP_LDAP) &&
-			CHECK_LIB("oldap32.lib", "ldap", PHP_LDAP) &&
-			CHECK_LIB("olber32.lib", "ldap", PHP_LDAP)) {
+			CHECK_LIB("oldap32_a.lib", "ldap", PHP_LDAP) &&
+			CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP)) {
 		EXTENSION('ldap', 'ldap.c');
 
 		AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1);