diff options
| -rwxr-xr-x | ext/pdo/package.xml | 7 | ||||
| -rwxr-xr-x | ext/pdo/pdo.c | 2 | ||||
| -rwxr-xr-x | ext/pdo_mysql/config.m4 | 22 | ||||
| -rw-r--r-- | ext/pdo_mysql/package.xml | 18 | ||||
| -rwxr-xr-x | ext/pdo_mysql/pdo_mysql.c | 2 |
5 files changed, 40 insertions, 11 deletions
diff --git a/ext/pdo/package.xml b/ext/pdo/package.xml index 1bdae93afc..24abb164d7 100755 --- a/ext/pdo/package.xml +++ b/ext/pdo/package.xml @@ -41,8 +41,8 @@ <license>PHP</license> <release> <state>beta</state> - <version>0.3</version> - <date>2005-03-09</date> + <version>0.9</version> + <date>2005-06-27</date> <notes> You need to install a PDO database driver to make use of PDO, @@ -60,6 +60,9 @@ http://snaps.php.net/win32/PECL_5_0/php_pdo.dll You can find additional PDO drivers at: http://snaps.php.net/win32/PECL_5_0/ +- Consult the PHP 5.1b3 release notes and http://netevil.org/node.php?nid=325 + for more recent changes. + - New fetch modes: PDO_FETCH_FUNC, PDO_FETCH_GROUP, PDO_FETCH_UNIQUE, PDO_FETCH_CLASSTYPE - New fetch mode for PHP 5.1 and higher: PDO_FETCH_SERIALIZE diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 685af03ee1..c12cef1ad6 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -112,7 +112,7 @@ zend_module_entry pdo_module_entry = { PHP_RINIT(pdo), PHP_RSHUTDOWN(pdo), PHP_MINFO(pdo), - "0.3", + "0.9", STANDARD_MODULE_PROPERTIES }; /* }}} */ diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index cbfe32f016..70b216a2a1 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -61,10 +61,28 @@ Note that the MySQL client library is not bundled anymore!]) AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate]) LDFLAGS=$_SAVE_LDFLAGS - PHP_CHECK_PDO_INCLUDES + ifdef([PHP_CHECK_PDO_INCLUDES], + [ + PHP_CHECK_PDO_INCLUDES + ],[ + AC_MSG_CHECKING([for PDO includes]) + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$prefix/include/php/ext + else + AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) + fi + AC_MSG_RESULT($pdo_inc_path) + ]) PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path) - PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) + ifdef([PHP_ADD_EXTENDION_DEP], + [ + PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo) + ]) PDO_MYSQL_MODULE_TYPE=external PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR diff --git a/ext/pdo_mysql/package.xml b/ext/pdo_mysql/package.xml index 77b3aa144a..d6317ca45e 100644 --- a/ext/pdo_mysql/package.xml +++ b/ext/pdo_mysql/package.xml @@ -16,18 +16,26 @@ <email>iliaa@php.net</email> <role>lead</role> </maintainer> + <maintainer> + <user>wez</user> + <name>Wez Furlong</name> + <email>wez@php.net</email> + <role>lead</role> + </maintainer> + </maintainers> <description> - This extension provides a Mysql 3.x/4.0 driver for PDO. + This extension provides a Mysql 3.x/4.x driver for PDO. </description> <license>PHP</license> <release> <state>beta</state> - <version>0.2</version> - <date>2005-02-09</date> + <version>0.9</version> + <date>2005-06-27</date> <notes> - Hope it works! + Much more robust, featuring native prepared statements and multi-rowset + query support. </notes> <filelist> @@ -43,7 +51,7 @@ </filelist> <deps> <dep type="php" rel="ge" version="5.0.3"/> - <dep type="ext" name="pdo" rel="ge" version="0.2"/> + <dep type="ext" name="pdo" rel="ge" version="0.9"/> </deps> </release> </package> diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 136b2dbe35..a224e6e012 100755 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -60,7 +60,7 @@ zend_module_entry pdo_mysql_module_entry = { NULL, NULL, PHP_MINFO(pdo_mysql), - "0.2", + "0.9", STANDARD_MODULE_PROPERTIES }; /* }}} */ |