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/xml config.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.3 Wed Oct 11 11:00:03 2006
+++ php-src/ext/pdo_pgsql/config.w32 Sun 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-sqlite-external support can't be enabled, iconv or
libxml are missing")
+ PHP_PDO_SQLITE_EXTERNAL = "no"
+ }
}
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/config.w32?r1=1.3&r2=1.3.8.1&diff_format=u
Index: php-src/ext/xml/config.w32
diff -u php-src/ext/xml/config.w32:1.3 php-src/ext/xml/config.w32:1.3.8.1
--- php-src/ext/xml/config.w32:1.3 Mon Dec 22 13:16:42 2003
+++ php-src/ext/xml/config.w32 Sun Jun 22 23:17:22 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2003/12/22 13:16:42 wez Exp $
+// $Id: config.w32,v 1.3.8.1 2008/06/22 23:17:22 pajoye Exp $
// vim:ft=javascript
ARG_WITH("xml", "XML support", "yes");
@@ -11,5 +11,3 @@
}
ADD_EXTENSION_DEP('xml', 'libxml');
}
-
-
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.w32?r1=1.2&r2=1.2.8.1&diff_format=u
Index: php-src/ext/xmlrpc/config.w32
diff -u php-src/ext/xmlrpc/config.w32:1.2 php-src/ext/xmlrpc/config.w32:1.2.8.1
--- php-src/ext/xmlrpc/config.w32:1.2 Mon Dec 22 13:16:42 2003
+++ php-src/ext/xmlrpc/config.w32 Sun Jun 22 23:17:22 2008
@@ -1,14 +1,22 @@
-// $Id: config.w32,v 1.2 2003/12/22 13:16:42 wez Exp $
+// $Id: config.w32,v 1.2.8.1 2008/06/22 23:17:22 pajoye Exp $
// vim:ft=javascript
ARG_WITH("xmlrpc", "XMLRPC-EPI support", "no");
if (PHP_XMLRPC != "no") {
- CHECK_HEADER_ADD_INCLUDE("xmlrpc.h", "CFLAGS_XMLRPC",
configure_module_dirname + "/libxmlrpc");
- EXTENSION('xmlrpc', 'xmlrpc-epi-php.c', PHP_XMLRPC_SHARED,
"-DVERSION=\"0.50\"");
- ADD_SOURCES(configure_module_dirname + "/libxmlrpc", "base64.c
simplestring.c xml_to_dandarpc.c \
- xmlrpc_introspection.c encodings.c system_methods.c xml_to_xmlrpc.c \
- queue.c xml_element.c xmlrpc.c xml_to_soap.c", "xmlrpc");
- ADD_EXTENSION_DEP('xmlrpc', 'libxml');
+ if (CHECK_HEADER_ADD_INCLUDE("xmlrpc.h", "CFLAGS_XMLRPC",
configure_module_dirname + "/libxmlrpc")
+ && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS")) {
+ EXTENSION('xmlrpc', 'xmlrpc-epi-php.c', PHP_XMLRPC_SHARED,
"-DVERSION=\"0.50\"");
+ ADD_SOURCES(configure_module_dirname + "/libxmlrpc", "base64.c
simplestring.c xml_to_dandarpc.c \
+ xmlrpc_introspection.c encodings.c system_methods.c
xml_to_xmlrpc.c \
+ queue.c xml_element.c xmlrpc.c xml_to_soap.c", "xmlrpc");
+
+ if (!ADD_EXTENSION_DEP('xmlrpc', 'libxml')) {
+ PHP_XMLRPC = "no";
+ }
+ } else {
+ WARNING("xmlrpc support can't be enabled, libraries or headers
are missing")
+ PHP_XMLRPC = "no";
+ }
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
