[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_odbc config.w32

2009-04-23 Thread Pierre-Alain Joye 
pajoye  Thu Apr 23 18:03:05 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_odbc   config.w32 
  Log:
  - wrong var name
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.w32?r1=1.1.6.2&r2=1.1.6.3&diff_format=u
Index: php-src/ext/pdo_odbc/config.w32
diff -u php-src/ext/pdo_odbc/config.w32:1.1.6.2 
php-src/ext/pdo_odbc/config.w32:1.1.6.3
--- php-src/ext/pdo_odbc/config.w32:1.1.6.2 Mon Jun 23 18:40:29 2008
+++ php-src/ext/pdo_odbc/config.w32 Thu Apr 23 18:03:05 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.6.2 2008/06/23 18:40:29 pajoye Exp $
+// $Id: config.w32,v 1.1.6.3 2009/04/23 18:03:05 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-odbc", "ODBC support for PDO", "no");
@@ -13,7 +13,7 @@
 
} else {
WARNING("pdo_odbc support can't be enabled, headers or 
libraries are missing (SDK)")
-   PHP_LIBXML = "no"
+   PHP_PDO_ODBC = "no"
}
 }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_odbc config.w32 /ext/pdo_pgsql config.w32 /ext/pdo_sqlite config.w32 /ext/xml config.w32 /ext/xmlrpc config.w32

2008-06-22 Thread Pierre-Alain Joye 
pajoye  Sun Jun 22 23:17:22 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_odbc   config.w32 
/php-src/ext/pdo_pgsql  config.w32 
/php-src/ext/pdo_sqlite config.w32 
/php-src/ext/xmlconfig.w32 
/php-src/ext/xmlrpc config.w32 
  Log:
  - really check for the dependency, libs and header and don't enable the ext 
if something is missing
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.w32?r1=1.1&r2=1.1.6.1&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.1.6.1
--- php-src/ext/pdo_odbc/config.w32:1.1 Mon May 17 15:43:01 2004
+++ php-src/ext/pdo_odbc/config.w32 Sun Jun 22 23:17:22 2008
@@ -1,15 +1,21 @@
-// $Id: config.w32,v 1.1 2004/05/17 15:43:01 wez Exp $
+// $Id: config.w32,v 1.1.6.1 2008/06/22 23:17:22 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_FLAG('CFLAGS_PDO_ODBC', "/I ..\\pecl");
+   ADD_EXTENSION_DEP('pdo_odbc', 'pdo');
+
+   } else {
+   WARNING("pdo_odbc support can't be enabled, header or library 
are missing (SDK)")
+   PHP_LIBXML = "no"
}
-   ADD_EXTENSION_DEP('pdo_odbc', 'pdo');
 }
 
+
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4.2.1.2.3&r2=1.4.2.1.2.3.2.1&diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3 
php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.1
--- php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3Wed Oct 11 11:00:03 2006
+++ php-src/ext/pdo_pgsql/config.w32Sun Jun 22 23:17:22 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.1.2.3 2006/10/11 11:00:03 edink Exp $
+// $Id: config.w32,v 1.4.2.1.2.3.2.1 2008/06/22 23:17:22 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no");
@@ -14,8 +14,8 @@
 
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PQPARAMETERSTATUS=1 /D 
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D 
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1 /D 
HAVE_PQESCAPE_BYTEA_CONN=1");
+   ADD_EXTENSION_DEP('pdo_pgsql', 'pdo');
} else {
WARNING("pdo_pgsql not enabled; libraries and headers not 
found");
}
-   ADD_EXTENSION_DEP('pdo_pgsql', 'pdo');
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.1&r2=1.6.2.1.2.3.2.2&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.1 
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.2
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.1   Fri Mar  7 10:47:23 2008
+++ php-src/ext/pdo_sqlite/config.w32   Sun Jun 22 23:17:22 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6.2.1.2.3.2.1 2008/03/07 10:47:23 scottmac Exp $
+// $Id: config.w32,v 1.6.2.1.2.3.2.2 2008/06/22 23:17:22 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
@@ -32,8 +32,12 @@
 
 ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", 
"no");
 if (PHP_PDO_SQLITE_EXTERNAL != "no") {
-   CHECK_HEADER_ADD_INCLUDE("sqlite3.h", "CFLAGS_PDO_SQLITE_EXTERNAL", 
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\include\\sqlite3");
-   CHECK_LIB("sqlite3-import.lib", "pdo_sqlite_external", 
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\lib");
-   EXTENSION("pdo_sqlite_external", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/I" + configure_module_dirname, null, 
"ext\\pdo_sqlite_external");
-   ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo');
+   if (CHECK_HEADER_ADD_INCLUDE("sqlite3.h", 
"CFLAGS_PDO_SQLITE_EXTERNAL", PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + 
"\\include\\sqlite3") &&
+   CHECK_LIB("sqlite3-import.lib", "pdo_sqlite_external", 
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\lib")) {
+   EXTENSION("pdo_sqlite_external", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/I" + configure_module_dirname, null, 
"ext\\pdo_sqlite_external");
+   ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo');
+   } else {
+   WARNING("pdo-