edink Tue Mar 14 11:04:13 2006 UTC Modified files: /php-src/ext/pdo_pgsql config.w32 pdo_pgsql.c Log: MFB: more verbose phpinfo() output http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pdo_pgsql/config.w32 diff -u php-src/ext/pdo_pgsql/config.w32:1.4 php-src/ext/pdo_pgsql/config.w32:1.5 --- php-src/ext/pdo_pgsql/config.w32:1.4 Mon May 16 17:34:44 2005 +++ php-src/ext/pdo_pgsql/config.w32 Tue Mar 14 11:04:13 2006 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.4 2005/05/16 17:34:44 edink Exp $ +// $Id: config.w32,v 1.5 2006/03/14 11:04:13 edink Exp $ // vim:ft=javascript ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no"); @@ -7,6 +7,11 @@ if (CHECK_LIB("libpq.lib", "pdo_pgsql", PHP_PDO_PGSQL) && CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) { EXTENSION("pdo_pgsql", "pdo_pgsql.c pgsql_driver.c pgsql_statement.c"); + + if (CHECK_HEADER_ADD_INCLUDE("pg_config.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) { + ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_CONFIG_H"); + } + ADD_FLAG('CFLAGS_PDO_PGSQL', "/I ..\\pecl"); 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"); http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_pgsql/pdo_pgsql.c?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/pdo_pgsql/pdo_pgsql.c diff -u php-src/ext/pdo_pgsql/pdo_pgsql.c:1.12 php-src/ext/pdo_pgsql/pdo_pgsql.c:1.13 --- php-src/ext/pdo_pgsql/pdo_pgsql.c:1.12 Sun Jan 1 13:09:53 2006 +++ php-src/ext/pdo_pgsql/pdo_pgsql.c Tue Mar 14 11:04:13 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_pgsql.c,v 1.12 2006/01/01 13:09:53 sniper Exp $ */ +/* $Id: pdo_pgsql.c,v 1.13 2006/03/14 11:04:13 edink Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,6 +30,10 @@ #include "php_pdo_pgsql.h" #include "php_pdo_pgsql_int.h" +#ifdef HAVE_PG_CONFIG_H +#include <pg_config.h> +#endif + /* {{{ pdo_pgsql_functions[] */ zend_function_entry pdo_pgsql_functions[] = { {NULL, NULL, NULL} @@ -115,6 +119,12 @@ { php_info_print_table_start(); php_info_print_table_header(2, "PDO Driver for PostgreSQL", "enabled"); +#ifdef HAVE_PG_CONFIG_H + php_info_print_table_row(2, "PostgreSQL(libpq) Version", PG_VERSION); +#endif + php_info_print_table_row(2, "Module version", pdo_pgsql_module_entry.version); + php_info_print_table_row(2, "Revision", " $Id: pdo_pgsql.c,v 1.13 2006/03/14 11:04:13 edink Exp $ "); + php_info_print_table_end(); } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php