diff options
| author | Anatol Belski <ab@php.net> | 2013-12-25 23:30:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-12-25 23:30:59 +0100 |
| commit | 9f9179cc624073f8d47cfa283ef05dcad7ea7a0b (patch) | |
| tree | 597411759d8bd51345091fab89adc82bb35aefd4 | |
| parent | 43cfa7f12a225eb14a0e77d48dd1318c6276fd14 (diff) | |
| parent | 5b0620831c41687950f1f34a225bea060122b503 (diff) | |
| download | php-git-9f9179cc624073f8d47cfa283ef05dcad7ea7a0b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
brought the ext/sybase_ct/config.w32 up to date
| -rw-r--r-- | ext/sybase_ct/config.w32 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/sybase_ct/config.w32 b/ext/sybase_ct/config.w32 index bf56bd1402..c773b623af 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 { |