Skip to content

Commit e0809fe

Browse files
committed
remove checks for eol dependencies
yet one leftower, only FreeTDS is usable at the moment
1 parent b6ae363 commit e0809fe

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

ext/pdo_dblib/config.w32

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,52 +22,21 @@ if (PHP_PDO_DBLIB != "no") {
2222
ARG_WITH("pdo-mssql", "Native MS-SQL support for PDO", "no");
2323

2424
if (PHP_PDO_MSSQL != "no") {
25-
/* if they pointed us to a freetds dir, pick that up,
26-
* otherwise we'll poke around and look for MSSQL libs */
27-
28-
pdo_mssql_locations = new Array(
29-
PHP_PDO_MSSQL,
30-
"\\Program Files\\Microsoft SQL Server\\80",
31-
"\\MSSQL8",
32-
"\\MSSQL7",
33-
PHP_PHP_BUILD + "\\MSSQL80"
34-
);
3525
PDO_DBLIB_FLAVOUR = 0;
3626

3727
if (CHECK_LIB("sybdb.lib", "pdo_mssql", PHP_PDO_MSSQL) &&
3828
CHECK_HEADER_ADD_INCLUDE("sybfront.h", "CFLAGS_PDO_MSSQL",
3929
PHP_PDO_MSSQL, null, null, true)) {
4030
/* smells like FreeTDS (or maybe native sybase dblib) */
4131
PDO_DBLIB_FLAVOUR = "freetds";
42-
} else {
43-
44-
for (i = 0; i < pdo_mssql_locations.length; i++) {
45-
if (CHECK_LIB("ntwdblib.lib", "pdo_mssql",
46-
pdo_mssql_locations[i] + "\\DevTools\\Lib") &&
47-
CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_PDO_MSSQL",
48-
pdo_mssql_locations[i] + "\\DevTools\\Include",
49-
null, null, true)) {
50-
if (pdo_mssql_locations[i] == 'yes') {
51-
PDO_DBLIB_FLAVOUR = 70;
52-
} else {
53-
pdo_mssql_locations[i].match(new RegExp("(\\d)"));
54-
PDO_DBLIB_FLAVOUR = RegExp.$1 + 0;
55-
}
56-
break;
57-
}
58-
}
5932
}
6033

6134
if (PDO_DBLIB_FLAVOUR != 0) {
6235
EXTENSION("pdo_mssql", "pdo_dblib.c dblib_driver.c dblib_stmt.c", null, null, null, "ext\\pdo_mssql");
63-
if (PDO_DBLIB_FLAVOUR != "freetds") {
64-
ADD_FLAG("CFLAGS_PDO_MSSQL", "/DPHP_DBLIB_IS_MSSQL=1 /DDBNTWIN32=1 /DMSSQL" + PDO_DBLIB_FLAVOUR + "0=1 /DMSSQL_VERSION=\\\"" + PDO_DBLIB_FLAVOUR + ".0\\\"");
65-
ADD_FLAG("CFLAGS_PDO_MSSQL", "/DPDO_DBLIB_IS_MSSQL=" + PDO_DBLIB_FLAVOUR);
66-
PDO_DBLIB_FLAVOUR = "MSSQL_" + PDO_DBLIB_FLAVOUR;
67-
}
6836
ADD_FLAG('CFLAGS_PDO_MSSQL', "/D PDO_DBLIB_FLAVOUR=\\\"" + PDO_DBLIB_FLAVOUR + "\\\"");
6937
ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
7038
} else {
7139
WARNING("pdo_mssql not enabled, libraries or headers not found")
7240
}
7341
}
42+

0 commit comments

Comments
 (0)