- add detection for newer libs

diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32
index a0fbeb2741d5f20362b5f7d29e3f2fb0eca5fdc2..08ba64c38b4f224cecfd631d0325bbcf50a56b01 100644 (file)
--- 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);