cvs: php-src /ext/mysql config.w32 /ext/mysqli config.w32 /ext/pgsql config.w32

From: Date: Sun, 05 Jun 2005 19:25:02 +0000
Subject: cvs: php-src /ext/mysql config.w32 /ext/mysqli config.w32 /ext/pgsql config.w32
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-32112@lists.php.net to get a copy of this message
wez Sun Jun 5 15:25:02 2005 EDT Modified files: /php-src/ext/mysql config.w32 /php-src/ext/mysqli config.w32 /php-src/ext/pgsql config.w32 Log: fixes for #33251 http://cvs.php.net/diff.php/php-src/ext/mysql/config.w32?r1=1.1&r2=1.2&ty=u Index: php-src/ext/mysql/config.w32 diff -u php-src/ext/mysql/config.w32:1.1 php-src/ext/mysql/config.w32:1.2 --- php-src/ext/mysql/config.w32:1.1 Fri Dec 5 01:09:29 2003 +++ php-src/ext/mysql/config.w32 Sun Jun 5 15:25:00 2005 @@ -1,11 +1,12 @@ -// $Id: config.w32,v 1.1 2003/12/05 06:09:29 sebastian Exp $ +// $Id: config.w32,v 1.2 2005/06/05 19:25:00 wez Exp $ // vim:ft=javascript ARG_WITH("mysql", "MySQL support", "no"); if (PHP_MYSQL != "no") { if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && - CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", PHP_PHP_BUILD + "\\include\\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'); } else { http://cvs.php.net/diff.php/php-src/ext/mysqli/config.w32?r1=1.6&r2=1.7&ty=u Index: php-src/ext/mysqli/config.w32 diff -u php-src/ext/mysqli/config.w32:1.6 php-src/ext/mysqli/config.w32:1.7 --- php-src/ext/mysqli/config.w32:1.6 Fri Jan 7 11:23:13 2005 +++ php-src/ext/mysqli/config.w32 Sun Jun 5 15:25:01 2005 @@ -1,11 +1,11 @@ -// $Id: config.w32,v 1.6 2005/01/07 16:23:13 sebastian Exp $ +// $Id: config.w32,v 1.7 2005/06/05 19:25:01 wez Exp $ // vim:ft=javascript ARG_WITH("mysqli", "MySQLi support", "no"); if (PHP_MYSQLI != "no") { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && - CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", "mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c mysqli_fe.c mysqli_report.c mysqli_repl.c mysqli_driver.c mysqli_warning.c mysqli_exception.c mysqli_embedded.c"); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); } else { http://cvs.php.net/diff.php/php-src/ext/pgsql/config.w32?r1=1.6&r2=1.7&ty=u Index: php-src/ext/pgsql/config.w32 diff -u php-src/ext/pgsql/config.w32:1.6 php-src/ext/pgsql/config.w32:1.7 --- php-src/ext/pgsql/config.w32:1.6 Fri Mar 25 01:26:30 2005 +++ php-src/ext/pgsql/config.w32 Sun Jun 5 15:25:01 2005 @@ -1,11 +1,11 @@ -// $Id: config.w32,v 1.6 2005/03/25 06:26:30 chriskl Exp $ +// $Id: config.w32,v 1.7 2005/06/05 19:25:01 wez Exp $ // vim:ft=javascript ARG_WITH("pgsql", "PostgreSQL support", "no"); if (PHP_PGSQL != "no") { if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) && - CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PGSQL)) { + CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PGSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PGSQL)) { EXTENSION("pgsql", "pgsql.c"); AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library'); ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS /D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA");

« previous php.cvs (#32112) next »