cvs: php-src(PHP_5_3) /ext/ldap config.w32
| From: | Pierre-Alain Joye | Date: | Thu, 31 Jul 2008 18:04:49 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/ldap config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-51824@lists.php.net to get a copy of this message | ||
pajoye Thu Jul 31 18:04:49 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ldap config.w32
Log:
- MFH: add detection for newer libs
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/config.w32?r1=1.2.4.1&r2=1.2.4.1.2.1&diff_format=u
Index: php-src/ext/ldap/config.w32
diff -u php-src/ext/ldap/config.w32:1.2.4.1 php-src/ext/ldap/config.w32:1.2.4.1.2.1
--- php-src/ext/ldap/config.w32:1.2.4.1 Thu Aug 9 08:42:43 2007
+++ php-src/ext/ldap/config.w32 Thu Jul 31 18:04:49 2008
@@ -1,15 +1,17 @@
-// $Id: config.w32,v 1.2.4.1 2007/08/09 08:42:43 jani Exp $
+// $Id: config.w32,v 1.2.4.1.2.1 2008/07/31 18:04:49 pajoye Exp $
// vim:ft=javascript
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);