cvs: php-src(PHP_5_3) /ext/dom config.w32 /ext/exif config.w32 /ext/libxml config.w32 /ext/mysql config.w32 /ext/mysqli config.w32 /ext/odbc
config.w32 /ext/pdo_odbc config.w32 /ext/pdo_sqlite config.w32 /ext/simplexml config.w32 /ext/soap config.w32 /ext/sockets config.w32 /ext/xml
config.w32
| From: | Pierre-Alain Joye | Date: | Mon, 23 Jun 2008 18:40:29 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/dom config.w32 /ext/exif config.w32 /ext/libxml config.w32 /ext/mysql config.w32 /ext/mysqli config.w32 /ext/odbc config.w32 /ext/pdo_odbc config.w32 /ext/pdo_sqlite config.w32 /ext/simplexml config.w32 /ext/soap config.w32 /ext/sockets config.w32 /ext/xml config.w32 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50598@lists.php.net to get a copy of this message | ||
pajoye Mon Jun 23 18:40:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/dom config.w32
/php-src/ext/exif config.w32
/php-src/ext/libxml config.w32
/php-src/ext/mysql config.w32
/php-src/ext/mysqli config.w32
/php-src/ext/odbc config.w32
/php-src/ext/pdo_odbc config.w32
/php-src/ext/pdo_sqlite config.w32
/php-src/ext/simplexml config.w32
/php-src/ext/soap config.w32
/php-src/ext/sockets config.w32
/php-src/ext/xml config.w32
Log:
- do not enable an ext when a lib/header fails
- use MESSAGE in mysql*
- use correct CFLAGS for ext/libxml headers
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/config.w32?r1=1.3&r2=1.3.8.1&diff_format=u Index: php-src/ext/dom/config.w32 diff -u php-src/ext/dom/config.w32:1.3 php-src/ext/dom/config.w32:1.3.8.1 --- php-src/ext/dom/config.w32:1.3 Mon Dec 22 13:16:39 2003 +++ php-src/ext/dom/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,22 +1,26 @@ -// $Id: config.w32,v 1.3 2003/12/22 13:16:39 wez Exp $ +// $Id: config.w32,v 1.3.8.1 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_WITH("dom", "DOM support", "yes"); -if (PHP_DOM == "yes" && PHP_LIBXML == "yes") { - EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \ - domstringlist.c domexception.c namelist.c processinginstruction.c \ - cdatasection.c documentfragment.c domimplementation.c element.c \ - node.c string_extend.c characterdata.c documenttype.c \ - domimplementationlist.c entity.c nodelist.c text.c comment.c \ - domconfiguration.c domimplementationsource.c entityreference.c \ - notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \ - domlocator.c namednodemap.c userdatahandler.c"); - AC_DEFINE("HAVE_DOM", 1, "DOM support"); - if (!PHP_DOM_SHARED) { - ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC "); - } - ADD_EXTENSION_DEP('dom', 'libxml'); -} +if (PHP_DOM == "yes") { + if (PHP_LIBXML == "yes" && ADD_EXTENSION_DEP('dom', 'libxml')) { + EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \ + domstringlist.c domexception.c namelist.c processinginstruction.c \ + cdatasection.c documentfragment.c domimplementation.c element.c \ + node.c string_extend.c characterdata.c documenttype.c \ + domimplementationlist.c entity.c nodelist.c text.c comment.c \ + domconfiguration.c domimplementationsource.c entityreference.c \ + notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \ + domlocator.c namednodemap.c userdatahandler.c"); + AC_DEFINE("HAVE_DOM", 1, "DOM support"); + if (!PHP_DOM_SHARED) { + ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC "); + } + } else { + WARNING("dom support can't be enabled, libxml is not enabled") + PHP_DOM = "no" + } +} http://cvs.php.net/viewvc.cgi/php-src/ext/exif/config.w32?r1=1.3&r2=1.3.6.1&diff_format=u Index: php-src/ext/exif/config.w32 diff -u php-src/ext/exif/config.w32:1.3 php-src/ext/exif/config.w32:1.3.6.1 --- php-src/ext/exif/config.w32:1.3 Fri Feb 25 01:17:45 2005 +++ php-src/ext/exif/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,10 +1,14 @@ -// $Id: config.w32,v 1.3 2005/02/25 01:17:45 helly Exp $ +// $Id: config.w32,v 1.3.6.1 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("exif", "exif", "no"); if (PHP_EXIF == "yes") { - EXTENSION("exif", "exif.c"); - AC_DEFINE('HAVE_EXIF', 1, 'Have exif'); - ADD_EXTENSION_DEP('exif', 'mbstring'); + if (ADD_EXTENSION_DEP('exif', 'mbstring')) { + EXTENSION("exif", "exif.c"); + AC_DEFINE('HAVE_EXIF', 1, 'Have exif'); + } else { + WARNING("exif support can't be enabled, libxml is not enabled") + PHP_EXIF = "no" + } } http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config.w32?r1=1.8.6.3&r2=1.8.6.4&diff_format=u Index: php-src/ext/libxml/config.w32 diff -u php-src/ext/libxml/config.w32:1.8.6.3 php-src/ext/libxml/config.w32:1.8.6.4 --- php-src/ext/libxml/config.w32:1.8.6.3 Sun Jun 22 21:49:06 2008 +++ php-src/ext/libxml/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.8.6.3 2008/06/22 21:49:06 pajoye Exp $ +// $Id: config.w32,v 1.8.6.4 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_WITH("libxml", "LibXML support", "yes"); @@ -6,7 +6,8 @@ if (PHP_LIBXML == "yes") { if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") && CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") && - CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) { + CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_LIBXML") && + ADD_EXTENSION_DEP('libxml', 'iconv')) { EXTENSION("libxml", "libxml.c", false /* never shared */); AC_DEFINE("HAVE_LIBXML", 1, "LibXML support"); @@ -14,11 +15,8 @@ if (!PHP_LIBXML_SHARED) { ADD_DEF_FILE("ext\\libxml\\php_libxml2.def"); } - ADD_EXTENSION_DEP('libxml', 'iconv'); } else { WARNING("libxml support can't be enabled, iconv or libxml are missing") PHP_LIBXML = "no" } } - - http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.2.6.5&r2=1.2.6.6&diff_format=u Index: php-src/ext/mysql/config.w32 diff -u php-src/ext/mysql/config.w32:1.2.6.5 php-src/ext/mysql/config.w32:1.2.6.6 --- php-src/ext/mysql/config.w32:1.2.6.5 Tue Apr 8 07:45:49 2008 +++ php-src/ext/mysql/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,22 +1,26 @@ -// $Id: config.w32,v 1.2.6.5 2008/04/08 07:45:49 andrey Exp $ +// $Id: config.w32,v 1.2.6.6 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_WITH("mysql", "MySQL support", "no"); if (PHP_MYSQL != "no") { - if (PHP_MYSQL == "yes" || PHP_MYSQL == "mysqlnd") { + if ((PHP_MYSQL == "yes" || PHP_MYSQL == "mysqlnd")) { AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'Using MySQL native driver'); - ADD_EXTENSION_DEP('mysql', 'mysqlnd', true); - EXTENSION("mysql", "php_mysql.c"); - AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); - STDOUT.WriteLine("INFO: mysqlnd build"); + if (!ADD_EXTENSION_DEP('mysql', 'mysqlnd', true)) { + PHP_MYSQL = "no"; + WARNING("mysql not enabled; mysqlnd is not enabled"); + } else { + EXTENSION("mysql", "php_mysql.c"); + AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); + MESSAGE("\tusing mysqlnd build"); + } } else if (PHP_MYSQL != "") { if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { EXTENSION("mysql", "php_mysql.c"); AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); - STDOUT.WriteLine("INFO: libmysql build"); + MESSAGE("\tusing libmysql"); } else { WARNING("mysql not enabled; libraries and headers not found"); } http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.w32?r1=1.7.6.4&r2=1.7.6.5&diff_format=u Index: php-src/ext/mysqli/config.w32 diff -u php-src/ext/mysqli/config.w32:1.7.6.4 php-src/ext/mysqli/config.w32:1.7.6.5 --- php-src/ext/mysqli/config.w32:1.7.6.4 Tue Apr 8 07:45:49 2008 +++ php-src/ext/mysqli/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.7.6.4 2008/04/08 07:45:49 andrey Exp $ +// $Id: config.w32,v 1.7.6.5 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript // Note: The extension name is "mysqli", you enable it with "--with-mysqli". @@ -26,7 +26,7 @@ AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver'); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); - STDOUT.WriteLine("INFO: mysqlnd build"); + MESSAGE("\tmysqlnd build"); } else { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + @@ -34,9 +34,10 @@ "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); - STDOUT.WriteLine("INFO: libmysql build"); + MESSAGE("\tlibmysql build"); } else { WARNING("mysqli not enabled; libraries and headers not found"); + PHP_MYSQLI = "no" } } } http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.w32?r1=1.1&r2=1.1.8.1&diff_format=u Index: php-src/ext/odbc/config.w32 diff -u php-src/ext/odbc/config.w32:1.1 php-src/ext/odbc/config.w32:1.1.8.1 --- php-src/ext/odbc/config.w32:1.1 Tue Dec 2 23:16:54 2003 +++ php-src/ext/odbc/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,12 +1,16 @@ -// $Id: config.w32,v 1.1 2003/12/02 23:16:54 wez Exp $ +// $Id: config.w32,v 1.1.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("odbc", "ODBC support", "yes"); if (PHP_ODBC == "yes") { - EXTENSION("odbc", "php_odbc.c"); - AC_DEFINE("HAVE_UODBC", 1, "ODBC support"); - ADD_FLAG('LIBS_ODBC', 'odbc32.lib odbccp32.lib'); -} - - + if (CHECK_LIB("odbc32.lib", "odbc") && CHECK_LIB("odbccp32.lib", "odbc") + && CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_ODBC") + && CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_ODBC")) { + EXTENSION("odbc", "php_odbc.c"); + AC_DEFINE("HAVE_UODBC", 1, "ODBC support"); + } else { + WARNING("odbc support can't be enabled, libraries or header are missing (SDK)") + PHP_ODBC = "no" + } +} \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.w32?r1=1.1.6.1&r2=1.1.6.2&diff_format=u Index: php-src/ext/pdo_odbc/config.w32 diff -u php-src/ext/pdo_odbc/config.w32:1.1.6.1 php-src/ext/pdo_odbc/config.w32:1.1.6.2 --- php-src/ext/pdo_odbc/config.w32:1.1.6.1 Sun Jun 22 23:17:22 2008 +++ php-src/ext/pdo_odbc/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.1.6.1 2008/06/22 23:17:22 pajoye Exp $ +// $Id: config.w32,v 1.1.6.2 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("pdo-odbc", "ODBC support for PDO", "no"); @@ -9,11 +9,10 @@ && CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_PDO_ODBC')) { EXTENSION("pdo_odbc", "pdo_odbc.c odbc_driver.c odbc_stmt.c"); - //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)") + WARNING("pdo_odbc support can't be enabled, headers or libraries are missing (SDK)") PHP_LIBXML = "no" } } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.2&r2=1.6.2.1.2.3.2.3&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.2 php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.3 --- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.2 Sun Jun 22 23:17:22 2008 +++ php-src/ext/pdo_sqlite/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.6.2.1.2.3.2.2 2008/06/22 23:17:22 pajoye Exp $ +// $Id: config.w32,v 1.6.2.1.2.3.2.3 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no"); @@ -32,12 +32,12 @@ ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", "no"); if (PHP_PDO_SQLITE_EXTERNAL != "no") { - 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")) { + 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") + && ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo') ) { 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") + WARNING("pdo-sqlite-external support can't be enabled, libraries or headers are missing") PHP_PDO_SQLITE_EXTERNAL = "no" } } http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4&r2=1.4.8.1&diff_format=u Index: php-src/ext/simplexml/config.w32 diff -u php-src/ext/simplexml/config.w32:1.4 php-src/ext/simplexml/config.w32:1.4.8.1 --- php-src/ext/simplexml/config.w32:1.4 Thu Jan 8 21:53:48 2004 +++ php-src/ext/simplexml/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,16 +1,18 @@ -// $Id: config.w32,v 1.4 2004/01/08 21:53:48 wez Exp $ +// $Id: config.w32,v 1.4.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("simplexml", "Simple XML support", "yes"); -if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes") { +if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes" + && ADD_EXTENSION_DEP('simplexml', 'libxml')) { EXTENSION("simplexml", "simplexml.c"); AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support"); if (!PHP_SIMPLEXML_SHARED) { ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC"); } - ADD_EXTENSION_DEP('simplexml', 'libxml'); - ADD_EXTENSION_DEP('simplexml', 'spl', true); + if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) { + MESSAGE("\tSPL support in simplexml disabled"); + } } http://cvs.php.net/viewvc.cgi/php-src/ext/soap/config.w32?r1=1.5&r2=1.5.8.1&diff_format=u Index: php-src/ext/soap/config.w32 diff -u php-src/ext/soap/config.w32:1.5 php-src/ext/soap/config.w32:1.5.8.1 --- php-src/ext/soap/config.w32:1.5 Mon Feb 9 09:31:12 2004 +++ php-src/ext/soap/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,15 +1,19 @@ -// $Id: config.w32,v 1.5 2004/02/09 09:31:12 dmitry Exp $ +// $Id: config.w32,v 1.5.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("soap", "SOAP support", "no"); if (PHP_SOAP != "no" && PHP_LIBXML == "yes") { - EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c'); - AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support"); + if (ADD_EXTENSION_DEP('soap', 'libxml')) { + EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c'); + AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support"); - if (!PHP_SOAP_SHARED) { - ADD_FLAG('CFLAGS_SOAP', "/D LIBXML_STATIC "); + if (!PHP_SOAP_SHARED) { + ADD_FLAG('CFLAGS_SOAP', "/D LIBXML_STATIC "); + } + } else { + WARNING("soap not enabled, libxml not found"); + PHP_SOAP = "no" } - ADD_EXTENSION_DEP('soap', 'libxml'); } http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/config.w32?r1=1.1&r2=1.1.8.1&diff_format=u Index: php-src/ext/sockets/config.w32 diff -u php-src/ext/sockets/config.w32:1.1 php-src/ext/sockets/config.w32:1.1.8.1 --- php-src/ext/sockets/config.w32:1.1 Fri Dec 19 17:00:12 2003 +++ php-src/ext/sockets/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,11 +1,11 @@ -// $Id: config.w32,v 1.1 2003/12/19 17:00:12 wez Exp $ +// $Id: config.w32,v 1.1.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("sockets", "SOCKETS support", "no"); if (PHP_SOCKETS != "no") { - - if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS)) { + if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS) + && CHECK_HEADER_ADD_INCLUDE("winsock.h", "CFLAGS_SOCKETS")) { EXTENSION('sockets', 'sockets.c php_sockets_win.c'); AC_DEFINE('HAVE_SOCKETS', 1); } else { http://cvs.php.net/viewvc.cgi/php-src/ext/xml/config.w32?r1=1.3.8.1&r2=1.3.8.2&diff_format=u Index: php-src/ext/xml/config.w32 diff -u php-src/ext/xml/config.w32:1.3.8.1 php-src/ext/xml/config.w32:1.3.8.2 --- php-src/ext/xml/config.w32:1.3.8.1 Sun Jun 22 23:17:22 2008 +++ php-src/ext/xml/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,13 +1,18 @@ -// $Id: config.w32,v 1.3.8.1 2008/06/22 23:17:22 pajoye Exp $ +// $Id: config.w32,v 1.3.8.2 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("xml", "XML support", "yes"); -if (PHP_XML == "yes" && PHP_LIBXML == "yes") { - EXTENSION("xml", "xml.c compat.c"); - AC_DEFINE("HAVE_XML", 1, "XML support"); - if (!PHP_XML_SHARED) { - ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC "); +if (PHP_XML == "yes") { + if (PHP_LIBXML == "yes" + && ADD_EXTENSION_DEP('xml', 'libxml')) { + EXTENSION("xml", "xml.c compat.c"); + AC_DEFINE("HAVE_XML", 1, "XML support"); + if (!PHP_XML_SHARED) { + ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC "); + } + } else { + WARNING("xml support can't be enabled, libraries or headers are missing") + PHP_ZLIB = "no" } - ADD_EXTENSION_DEP('xml', 'libxml'); -} +} \ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/config.w32?r1=1.3&r2=1.3.8.1&diff_format=u Index: php-src/ext/dom/config.w32 diff -u php-src/ext/dom/config.w32:1.3 php-src/ext/dom/config.w32:1.3.8.1 --- php-src/ext/dom/config.w32:1.3 Mon Dec 22 13:16:39 2003 +++ php-src/ext/dom/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,22 +1,26 @@ -// $Id: config.w32,v 1.3 2003/12/22 13:16:39 wez Exp $ +// $Id: config.w32,v 1.3.8.1 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_WITH("dom", "DOM support", "yes"); -if (PHP_DOM == "yes" && PHP_LIBXML == "yes") { - EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \ - domstringlist.c domexception.c namelist.c processinginstruction.c \ - cdatasection.c documentfragment.c domimplementation.c element.c \ - node.c string_extend.c characterdata.c documenttype.c \ - domimplementationlist.c entity.c nodelist.c text.c comment.c \ - domconfiguration.c domimplementationsource.c entityreference.c \ - notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \ - domlocator.c namednodemap.c userdatahandler.c"); - AC_DEFINE("HAVE_DOM", 1, "DOM support"); - if (!PHP_DOM_SHARED) { - ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC "); - } - ADD_EXTENSION_DEP('dom', 'libxml'); -} +if (PHP_DOM == "yes") { + if (PHP_LIBXML == "yes" && ADD_EXTENSION_DEP('dom', 'libxml')) { + EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \ + domstringlist.c domexception.c namelist.c processinginstruction.c \ + cdatasection.c documentfragment.c domimplementation.c element.c \ + node.c string_extend.c characterdata.c documenttype.c \ + domimplementationlist.c entity.c nodelist.c text.c comment.c \ + domconfiguration.c domimplementationsource.c entityreference.c \ + notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \ + domlocator.c namednodemap.c userdatahandler.c"); + AC_DEFINE("HAVE_DOM", 1, "DOM support"); + if (!PHP_DOM_SHARED) { + ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC "); + } + } else { + WARNING("dom support can't be enabled, libxml is not enabled") + PHP_DOM = "no" + } +} http://cvs.php.net/viewvc.cgi/php-src/ext/exif/config.w32?r1=1.3&r2=1.3.6.1&diff_format=u Index: php-src/ext/exif/config.w32 diff -u php-src/ext/exif/config.w32:1.3 php-src/ext/exif/config.w32:1.3.6.1 --- php-src/ext/exif/config.w32:1.3 Fri Feb 25 01:17:45 2005 +++ php-src/ext/exif/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,10 +1,14 @@ -// $Id: config.w32,v 1.3 2005/02/25 01:17:45 helly Exp $ +// $Id: config.w32,v 1.3.6.1 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("exif", "exif", "no"); if (PHP_EXIF == "yes") { - EXTENSION("exif", "exif.c"); - AC_DEFINE('HAVE_EXIF', 1, 'Have exif'); - ADD_EXTENSION_DEP('exif', 'mbstring'); + if (ADD_EXTENSION_DEP('exif', 'mbstring')) { + EXTENSION("exif", "exif.c"); + AC_DEFINE('HAVE_EXIF', 1, 'Have exif'); + } else { + WARNING("exif support can't be enabled, libxml is not enabled") + PHP_EXIF = "no" + } } http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config.w32?r1=1.8.6.3&r2=1.8.6.4&diff_format=u Index: php-src/ext/libxml/config.w32 diff -u php-src/ext/libxml/config.w32:1.8.6.3 php-src/ext/libxml/config.w32:1.8.6.4 --- php-src/ext/libxml/config.w32:1.8.6.3 Sun Jun 22 21:49:06 2008 +++ php-src/ext/libxml/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.8.6.3 2008/06/22 21:49:06 pajoye Exp $ +// $Id: config.w32,v 1.8.6.4 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_WITH("libxml", "LibXML support", "yes"); @@ -6,7 +6,8 @@ if (PHP_LIBXML == "yes") { if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") && CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") && - CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) { + CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_LIBXML") && + ADD_EXTENSION_DEP('libxml', 'iconv')) { EXTENSION("libxml", "libxml.c", false /* never shared */); AC_DEFINE("HAVE_LIBXML", 1, "LibXML support"); @@ -14,11 +15,8 @@ if (!PHP_LIBXML_SHARED) { ADD_DEF_FILE("ext\\libxml\\php_libxml2.def"); } - ADD_EXTENSION_DEP('libxml', 'iconv'); } else { WARNING("libxml support can't be enabled, iconv or libxml are missing") PHP_LIBXML = "no" } } - - http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.2.6.5&r2=1.2.6.6&diff_format=u Index: php-src/ext/mysql/config.w32 diff -u php-src/ext/mysql/config.w32:1.2.6.5 php-src/ext/mysql/config.w32:1.2.6.6 --- php-src/ext/mysql/config.w32:1.2.6.5 Tue Apr 8 07:45:49 2008 +++ php-src/ext/mysql/config.w32 Mon Jun 23 18:40:28 2008 @@ -1,22 +1,26 @@ -// $Id: config.w32,v 1.2.6.5 2008/04/08 07:45:49 andrey Exp $ +// $Id: config.w32,v 1.2.6.6 2008/06/23 18:40:28 pajoye Exp $ // vim:ft=javascript ARG_WITH("mysql", "MySQL support", "no"); if (PHP_MYSQL != "no") { - if (PHP_MYSQL == "yes" || PHP_MYSQL == "mysqlnd") { + if ((PHP_MYSQL == "yes" || PHP_MYSQL == "mysqlnd")) { AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'Using MySQL native driver'); - ADD_EXTENSION_DEP('mysql', 'mysqlnd', true); - EXTENSION("mysql", "php_mysql.c"); - AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); - STDOUT.WriteLine("INFO: mysqlnd build"); + if (!ADD_EXTENSION_DEP('mysql', 'mysqlnd', true)) { + PHP_MYSQL = "no"; + WARNING("mysql not enabled; mysqlnd is not enabled"); + } else { + EXTENSION("mysql", "php_mysql.c"); + AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); + MESSAGE("\tusing mysqlnd build"); + } } else if (PHP_MYSQL != "") { if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { EXTENSION("mysql", "php_mysql.c"); AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); - STDOUT.WriteLine("INFO: libmysql build"); + MESSAGE("\tusing libmysql"); } else { WARNING("mysql not enabled; libraries and headers not found"); } http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.w32?r1=1.7.6.4&r2=1.7.6.5&diff_format=u Index: php-src/ext/mysqli/config.w32 diff -u php-src/ext/mysqli/config.w32:1.7.6.4 php-src/ext/mysqli/config.w32:1.7.6.5 --- php-src/ext/mysqli/config.w32:1.7.6.4 Tue Apr 8 07:45:49 2008 +++ php-src/ext/mysqli/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.7.6.4 2008/04/08 07:45:49 andrey Exp $ +// $Id: config.w32,v 1.7.6.5 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript // Note: The extension name is "mysqli", you enable it with "--with-mysqli". @@ -26,7 +26,7 @@ AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver'); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); - STDOUT.WriteLine("INFO: mysqlnd build"); + MESSAGE("\tmysqlnd build"); } else { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + @@ -34,9 +34,10 @@ "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); - STDOUT.WriteLine("INFO: libmysql build"); + MESSAGE("\tlibmysql build"); } else { WARNING("mysqli not enabled; libraries and headers not found"); + PHP_MYSQLI = "no" } } } http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.w32?r1=1.1&r2=1.1.8.1&diff_format=u Index: php-src/ext/odbc/config.w32 diff -u php-src/ext/odbc/config.w32:1.1 php-src/ext/odbc/config.w32:1.1.8.1 --- php-src/ext/odbc/config.w32:1.1 Tue Dec 2 23:16:54 2003 +++ php-src/ext/odbc/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,12 +1,16 @@ -// $Id: config.w32,v 1.1 2003/12/02 23:16:54 wez Exp $ +// $Id: config.w32,v 1.1.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("odbc", "ODBC support", "yes"); if (PHP_ODBC == "yes") { - EXTENSION("odbc", "php_odbc.c"); - AC_DEFINE("HAVE_UODBC", 1, "ODBC support"); - ADD_FLAG('LIBS_ODBC', 'odbc32.lib odbccp32.lib'); -} - - + if (CHECK_LIB("odbc32.lib", "odbc") && CHECK_LIB("odbccp32.lib", "odbc") + && CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_ODBC") + && CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_ODBC")) { + EXTENSION("odbc", "php_odbc.c"); + AC_DEFINE("HAVE_UODBC", 1, "ODBC support"); + } else { + WARNING("odbc support can't be enabled, libraries or header are missing (SDK)") + PHP_ODBC = "no" + } +} \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.w32?r1=1.1.6.1&r2=1.1.6.2&diff_format=u Index: php-src/ext/pdo_odbc/config.w32 diff -u php-src/ext/pdo_odbc/config.w32:1.1.6.1 php-src/ext/pdo_odbc/config.w32:1.1.6.2 --- php-src/ext/pdo_odbc/config.w32:1.1.6.1 Sun Jun 22 23:17:22 2008 +++ php-src/ext/pdo_odbc/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.1.6.1 2008/06/22 23:17:22 pajoye Exp $ +// $Id: config.w32,v 1.1.6.2 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("pdo-odbc", "ODBC support for PDO", "no"); @@ -9,11 +9,10 @@ && CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_PDO_ODBC')) { EXTENSION("pdo_odbc", "pdo_odbc.c odbc_driver.c odbc_stmt.c"); - //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)") + WARNING("pdo_odbc support can't be enabled, headers or libraries are missing (SDK)") PHP_LIBXML = "no" } } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.2&r2=1.6.2.1.2.3.2.3&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.2 php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.3 --- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.2 Sun Jun 22 23:17:22 2008 +++ php-src/ext/pdo_sqlite/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.6.2.1.2.3.2.2 2008/06/22 23:17:22 pajoye Exp $ +// $Id: config.w32,v 1.6.2.1.2.3.2.3 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no"); @@ -32,12 +32,12 @@ ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", "no"); if (PHP_PDO_SQLITE_EXTERNAL != "no") { - 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")) { + 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") + && ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo') ) { 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") + WARNING("pdo-sqlite-external support can't be enabled, libraries or headers are missing") PHP_PDO_SQLITE_EXTERNAL = "no" } } http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4&r2=1.4.8.1&diff_format=u Index: php-src/ext/simplexml/config.w32 diff -u php-src/ext/simplexml/config.w32:1.4 php-src/ext/simplexml/config.w32:1.4.8.1 --- php-src/ext/simplexml/config.w32:1.4 Thu Jan 8 21:53:48 2004 +++ php-src/ext/simplexml/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,16 +1,18 @@ -// $Id: config.w32,v 1.4 2004/01/08 21:53:48 wez Exp $ +// $Id: config.w32,v 1.4.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("simplexml", "Simple XML support", "yes"); -if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes") { +if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes" + && ADD_EXTENSION_DEP('simplexml', 'libxml')) { EXTENSION("simplexml", "simplexml.c"); AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support"); if (!PHP_SIMPLEXML_SHARED) { ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC"); } - ADD_EXTENSION_DEP('simplexml', 'libxml'); - ADD_EXTENSION_DEP('simplexml', 'spl', true); + if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) { + MESSAGE("\tSPL support in simplexml disabled"); + } } http://cvs.php.net/viewvc.cgi/php-src/ext/soap/config.w32?r1=1.5&r2=1.5.8.1&diff_format=u Index: php-src/ext/soap/config.w32 diff -u php-src/ext/soap/config.w32:1.5 php-src/ext/soap/config.w32:1.5.8.1 --- php-src/ext/soap/config.w32:1.5 Mon Feb 9 09:31:12 2004 +++ php-src/ext/soap/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,15 +1,19 @@ -// $Id: config.w32,v 1.5 2004/02/09 09:31:12 dmitry Exp $ +// $Id: config.w32,v 1.5.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("soap", "SOAP support", "no"); if (PHP_SOAP != "no" && PHP_LIBXML == "yes") { - EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c'); - AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support"); + if (ADD_EXTENSION_DEP('soap', 'libxml')) { + EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c'); + AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support"); - if (!PHP_SOAP_SHARED) { - ADD_FLAG('CFLAGS_SOAP', "/D LIBXML_STATIC "); + if (!PHP_SOAP_SHARED) { + ADD_FLAG('CFLAGS_SOAP', "/D LIBXML_STATIC "); + } + } else { + WARNING("soap not enabled, libxml not found"); + PHP_SOAP = "no" } - ADD_EXTENSION_DEP('soap', 'libxml'); } http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/config.w32?r1=1.1&r2=1.1.8.1&diff_format=u Index: php-src/ext/sockets/config.w32 diff -u php-src/ext/sockets/config.w32:1.1 php-src/ext/sockets/config.w32:1.1.8.1 --- php-src/ext/sockets/config.w32:1.1 Fri Dec 19 17:00:12 2003 +++ php-src/ext/sockets/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,11 +1,11 @@ -// $Id: config.w32,v 1.1 2003/12/19 17:00:12 wez Exp $ +// $Id: config.w32,v 1.1.8.1 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_ENABLE("sockets", "SOCKETS support", "no"); if (PHP_SOCKETS != "no") { - - if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS)) { + if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS) + && CHECK_HEADER_ADD_INCLUDE("winsock.h", "CFLAGS_SOCKETS")) { EXTENSION('sockets', 'sockets.c php_sockets_win.c'); AC_DEFINE('HAVE_SOCKETS', 1); } else { http://cvs.php.net/viewvc.cgi/php-src/ext/xml/config.w32?r1=1.3.8.1&r2=1.3.8.2&diff_format=u Index: php-src/ext/xml/config.w32 diff -u php-src/ext/xml/config.w32:1.3.8.1 php-src/ext/xml/config.w32:1.3.8.2 --- php-src/ext/xml/config.w32:1.3.8.1 Sun Jun 22 23:17:22 2008 +++ php-src/ext/xml/config.w32 Mon Jun 23 18:40:29 2008 @@ -1,13 +1,18 @@ -// $Id: config.w32,v 1.3.8.1 2008/06/22 23:17:22 pajoye Exp $ +// $Id: config.w32,v 1.3.8.2 2008/06/23 18:40:29 pajoye Exp $ // vim:ft=javascript ARG_WITH("xml", "XML support", "yes"); -if (PHP_XML == "yes" && PHP_LIBXML == "yes") { - EXTENSION("xml", "xml.c compat.c"); - AC_DEFINE("HAVE_XML", 1, "XML support"); - if (!PHP_XML_SHARED) { - ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC "); +if (PHP_XML == "yes") { + if (PHP_LIBXML == "yes" + && ADD_EXTENSION_DEP('xml', 'libxml')) { + EXTENSION("xml", "xml.c compat.c"); + AC_DEFINE("HAVE_XML", 1, "XML support"); + if (!PHP_XML_SHARED) { + ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC "); + } + } else { + WARNING("xml support can't be enabled, libraries or headers are missing") + PHP_ZLIB = "no" } - ADD_EXTENSION_DEP('xml', 'libxml'); -} +} \ No newline at end of file