cvs: php-src /ext/pdo_odbc config.w32

pajoye Thu Apr 23 18:03:42 2009 UTC Modified files: /php-src/ext/pdo_odbc config.w32 Log: - MFB http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.w32?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/pdo_odbc/config.w32 diff -u php-src/ext/pdo_odbc/config.w32:1.1 php-src/ext/pdo_odbc/config.w32:1.2 --- php-src/ext/pdo_odbc/config.w32:1.1 Mon May 17 15:43:01 2004 +++ php-src/ext/pdo_odbc/config.w32 Thu Apr 23 18:03:42 2009 @@ -1,15 +1,19 @@ -// $Id: config.w32,v 1.1 2004/05/17 15:43:01 wez Exp $ +// $Id: config.w32,v 1.2 2009/04/23 18:03:42 pajoye Exp $ // vim:ft=javascript 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'); }