]> granicus.if.org Git - php/commitdiff
brought the ext/sybase_ct/config.w32 up to date
authorAnatol Belski <ab@php.net>
Wed, 25 Dec 2013 22:29:42 +0000 (23:29 +0100)
committerAnatol Belski <ab@php.net>
Wed, 25 Dec 2013 22:29:42 +0000 (23:29 +0100)
ext/sybase_ct/config.w32

index bf56bd140298998f5aa976515aa28c7d2d7cc8d1..c773b623af28457729b7a4d56c3a620580cec1fe 100644 (file)
@@ -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 {