- MFB

diff --git a/ext/pdo_odbc/config.w32 b/ext/pdo_odbc/config.w32
index d7cc443f17ae22e24178ff5ec2ddb7be61f8e30b..337a3d1038e7a169984dc1adcfdab5b083902580 100755 (executable)
--- a/ext/pdo_odbc/config.w32
+++ b/ext/pdo_odbc/config.w32
@@ -4,12 +4,16 @@
 ARG_WITH("pdo-odbc", "ODBC support for PDO", "no");
 
 if (PHP_PDO_ODBC != "no") {
-       if (CHECK_LIB("odbc32.lib", "pdo_odbc") && CHECK_LIB("odbccp32.lib", "pdo_odbc")) {
+       if (CHECK_LIB("odbc32.lib", "pdo_odbc") && CHECK_LIB("odbccp32.lib", "pdo_odbc")
+       && CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_PDO_ODBC')
+       && CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_PDO_ODBC')) {
+
                EXTENSION("pdo_odbc", "pdo_odbc.c odbc_driver.c odbc_stmt.c");
-               CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_PDO_ODBC');
-               CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_PDO_ODBC');
-               ADD_FLAG('CFLAGS_PDO_ODBC', "/I ..\\pecl");
+               ADD_EXTENSION_DEP('pdo_odbc', 'pdo');
+
+       } else {
+               WARNING("pdo_odbc support can't be enabled, headers or libraries are missing (SDK)")
+               PHP_PDO_ODBC = "no"
        }
-       ADD_EXTENSION_DEP('pdo_odbc', 'pdo');
 }