From: Pierre Joye <pajoye@php.net>
Date: Thu, 23 Apr 2009 18:03:42 +0000 (+0000)
Subject: - MFB
X-Git-Tag: php-5.4.0alpha1~191^2~3877
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ed2b6f638059286742dca114699b986a4bb8dca;p=php

- MFB
---

diff --git a/ext/pdo_odbc/config.w32 b/ext/pdo_odbc/config.w32
index d7cc443f17..337a3d1038 100755
--- 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');
 }