com php-src: brought the ext/sybase_ct/config.w32 up to date: ext/sybase_ct/config.w32
| From: | Anatol Belski | Date: | Wed, 25 Dec 2013 22:29:42 +0000 |
| Subject: | com php-src: brought the ext/sybase_ct/config.w32 up to date: ext/sybase_ct/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75464@lists.php.net to get a copy of this message | ||
Commit: 5b0620831c41687950f1f34a225bea060122b503
Author: Anatol Belski <ab@php.net> Wed, 25 Dec 2013 23:29:42 +0100
Parents: a2503c6af38d5a2de172a9a746719c4b12b53034
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5b0620831c41687950f1f34a225bea060122b503
Log:
brought the ext/sybase_ct/config.w32 up to date
Changed paths:
M ext/sybase_ct/config.w32
Diff:
diff --git a/ext/sybase_ct/config.w32 b/ext/sybase_ct/config.w32
index bf56bd1..c773b62 100644
--- a/ext/sybase_ct/config.w32
+++ b/ext/sybase_ct/config.w32
@@ -7,8 +7,11 @@ ARG_WITH("sybase-ct", "SYBASE_CT support", "no");
if (PHP_SYBASE_CT != "no") {
if (CHECK_HEADER_ADD_INCLUDE("ctpublic.h", "CFLAGS_SYBASE_CT", PHP_PHP_BUILD +
"\\sybase\\include;" + PHP_SYBASE_CT) &&
- CHECK_LIB("libcs.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT) &&
- CHECK_LIB("libct.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT)) {
+ (!X64 && CHECK_LIB("libsybcs.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT) &&
+ CHECK_LIB("libsybct.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT) ||
+ X64 && CHECK_LIB("libsybcs64.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT) &&
+ CHECK_LIB("libsybct64..lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT))
+ ) {
EXTENSION('sybase_ct', 'php_sybase_ct.c');
AC_DEFINE('HAVE_SYBASE_CT', 1);
} else {