[PHP-CVS] cvs: php-src /ext/mysql config.w32 /ext/mysqli config.w32

2008-04-08 Thread Andrey Hristov
andrey  Tue Apr  8 07:46:05 2008 UTC

  Modified files:  
/php-src/ext/mysql  config.w32 
/php-src/ext/mysqli config.w32 
  Log:
  Fix snapshot build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.7 php-src/ext/mysql/config.w32:1.8
--- php-src/ext/mysql/config.w32:1.7Mon Mar 10 20:27:15 2008
+++ php-src/ext/mysql/config.w32Tue Apr  8 07:46:05 2008
@@ -1,22 +1,24 @@
-// $Id: config.w32,v 1.7 2008/03/10 20:27:15 andrey Exp $
+// $Id: config.w32,v 1.8 2008/04/08 07:46:05 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
-   if (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");
+   } 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");
} else {
WARNING("mysql not enabled; libraries and headers not 
found");
}
-   } else {
-   AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQL native driver support 
enabled');
-   ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
-   EXTENSION("mysql", "php_mysql.c");
-   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
}
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.w32?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/mysqli/config.w32
diff -u php-src/ext/mysqli/config.w32:1.12 php-src/ext/mysqli/config.w32:1.13
--- php-src/ext/mysqli/config.w32:1.12  Mon Mar 10 20:27:15 2008
+++ php-src/ext/mysqli/config.w32   Tue Apr  8 07:46:05 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.12 2008/03/10 20:27:15 andrey Exp $
+// $Id: config.w32,v 1.13 2008/04/08 07:46:05 andrey Exp $
 // vim:ft=javascript
 
 // Note: The extension name is "mysqli", you enable it with "--with-mysqli".
@@ -21,20 +21,22 @@
"mysqli_report.c " +
"mysqli_warning.c";
 
-   if (PHP_MYSQLI != "mysqlnd") {
+   if (PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd") {
+   EXTENSION("mysqli", mysqli_source);
+   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");
+   } else {
if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", 
PHP_MYSQLI + 

"\\include;" + PHP_PHP_BUILD +

"\\include\\mysql;" + PHP_MYSQLI)) {
EXTENSION("mysqli", mysqli_source);
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+   STDOUT.WriteLine("INFO: libmysql build");
} else {
WARNING("mysqli not enabled; libraries and headers not 
found");
}
-   } else {
-   EXTENSION("mysqli", mysqli_source);
-   AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQLi with native driver 
support enabled');
-   AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-   ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
}
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/mysql config.w32 /ext/mysqli/tests mysqli_get_client_stats.phpt /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd_block_alloc.c mysqlnd_block_alloc.h mysqlnd_priv.h my

2008-01-28 Thread Andrey Hristov
andrey  Mon Jan 28 22:54:21 2008 UTC

  Modified files:  
/php-src/ext/mysql  config.w32 
/php-src/ext/mysqli/tests   mysqli_get_client_stats.phpt 
/php-src/ext/mysqlndmysqlnd_block_alloc.c mysqlnd_block_alloc.h 
config.w32 config9.m4 mysqlnd.c mysqlnd_priv.h 
mysqlnd_ps.c mysqlnd_result.c 
mysqlnd_structs.h mysqlnd_wireprotocol.c 
  Log:
  MFB:
  some config.w32 fixes
  moved mysqlnd's block allocator to a separate file and also now
  it's part of the connection, no MT problems.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.5 php-src/ext/mysql/config.w32:1.6
--- php-src/ext/mysql/config.w32:1.5Sat Jan 19 18:56:19 2008
+++ php-src/ext/mysql/config.w32Mon Jan 28 22:54:21 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2008/01/19 18:56:19 andrey Exp $
+// $Id: config.w32,v 1.6 2008/01/28 22:54:21 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH("mysql", "MySQL support", "no");
@@ -8,13 +8,15 @@
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');
} else {
WARNING("mysql not enabled; libraries and headers not 
found");
}
} else {
AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support 
enabled');
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
+   EXTENSION("mysql", "php_mysql.c");
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
}
-   EXTENSION("mysql", "php_mysql.c");
-   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.4 
php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.5
--- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.4   Mon Jan 28 
18:27:49 2008
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt   Mon Jan 28 
22:54:21 2008
@@ -969,9 +969,9 @@
   ["mem_efree_count"]=>
   string(1) "0"
   ["mem_malloc_count"]=>
-  string(1) "1"
+  string(1) "0"
   ["mem_malloc_ammount"]=>
-  string(%d) "%d"
+  string(1) "0"
   ["mem_calloc_count"]=>
   string(1) "0"
   ["mem_calloc_ammount"]=>
@@ -1106,9 +1106,9 @@
   [u"mem_efree_count"]=>
   unicode(1) "0"
   [u"mem_malloc_count"]=>
-  unicode(1) "1"
+  unicode(1) "0"
   [u"mem_malloc_ammount"]=>
-  unicode(%d) "%d"
+  unicode(1) "0"
   [u"mem_calloc_count"]=>
   unicode(1) "0"
   [u"mem_calloc_ammount"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u /dev/null php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.2
--- /dev/null   Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c   Mon Jan 28 22:54:21 2008
@@ -0,0 +1,201 @@
+/*
+  +--+
+  | PHP Version 6|
+  +--+
+  | Copyright (c) 2006-2008 The PHP Group|
+  +--+
+  | This source file is subject to version 3.01 of the PHP license,  |
+  | that is bundled with this package in the file LICENSE, and is|
+  | available through the world-wide-web at the following url:   |
+  | http://www.php.net/license/3_01.txt  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to  |
+  | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
+  +--+
+  | Authors: Georg Richter <[EMAIL PROTECTED]> |
+  |  Andrey Hristov <[EMAIL PROTECTED]>   |
+  |  Ulf Wendel <[EMAIL PROTECTED]>  |
+  +--+
+*/
+
+/* $Id: mysqlnd_block_alloc.c,v 1.2 2008/01/28 22:54:21 andrey Exp $ */
+
+#include "php.h"
+#include "mysqlnd.h"
+#include "mysqlnd_block_alloc.h"
+#include "mysqlnd_debug.h"
+#include "mysqlnd_priv.h"
+
+
+/* {{{ mysqlnd_mempool_free_chunk */
+static void
+my

[PHP-CVS] cvs: php-src /ext/mysql config.w32

2008-01-19 Thread Andrey Hristov
andrey  Sat Jan 19 18:56:19 2008 UTC

  Modified files:  
/php-src/ext/mysql  config.w32 
  Log:
  Fix build issue
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.4 php-src/ext/mysql/config.w32:1.5
--- php-src/ext/mysql/config.w32:1.4Tue Oct 23 10:44:25 2007
+++ php-src/ext/mysql/config.w32Sat Jan 19 18:56:19 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4 2007/10/23 10:44:25 andrey Exp $
+// $Id: config.w32,v 1.5 2008/01/19 18:56:19 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
-   if (PHP_MYSQLI != "mysqlnd") {
+   if (PHP_MYSQL != "mysqlnd") {
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)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/mysql config.w32 /ext/mysqli config.w32

2007-10-23 Thread Andrey Hristov
andrey  Tue Oct 23 10:44:25 2007 UTC

  Modified files:  
/php-src/ext/mysql  config.w32 
/php-src/ext/mysqli config.w32 
  Log:
  Fix the build, the w32 files should look like in 5_3
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.3 php-src/ext/mysql/config.w32:1.4
--- php-src/ext/mysql/config.w32:1.3Wed Jul 25 23:47:32 2007
+++ php-src/ext/mysql/config.w32Tue Oct 23 10:44:25 2007
@@ -1,19 +1,20 @@
-// $Id: config.w32,v 1.3 2007/07/25 23:47:32 jani Exp $
+// $Id: config.w32,v 1.4 2007/10/23 10:44:25 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
-  if (PHP_MYSQLI != "mysqlnd") {
-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)) {
-} else {
-WARNING("mysql not enabled; libraries and headers not found");
-}
-  } else {
-ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
-  }
-  EXTENSION("mysql", "php_mysql.c");
-  AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
+   if (PHP_MYSQLI != "mysqlnd") {
+   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)) {
+   } else {
+   WARNING("mysql not enabled; libraries and headers not 
found");
+   }
+   } else {
+   AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support 
enabled');
+   ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
+   }
+   EXTENSION("mysql", "php_mysql.c");
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.w32?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqli/config.w32
diff -u php-src/ext/mysqli/config.w32:1.9 php-src/ext/mysqli/config.w32:1.10
--- php-src/ext/mysqli/config.w32:1.9   Wed Jul 25 23:47:32 2007
+++ php-src/ext/mysqli/config.w32   Tue Oct 23 10:44:25 2007
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.9 2007/07/25 23:47:32 jani Exp $
+// $Id: config.w32,v 1.10 2007/10/23 10:44:25 andrey Exp $
 // vim:ft=javascript
 
 // Note: The extension name is "mysqli", you enable it with "--with-mysqli".
@@ -9,36 +9,34 @@
 ARG_WITH("mysqli", "MySQLi support", "no");
 
 if (PHP_MYSQLI != "no") {
-
-  mysqli_source =
-"mysqli.c " +
-"mysqli_api.c " +
-"mysqli_driver.c " +
-"mysqli_embedded.c " +
-"mysqli_exception.c " +
-"mysqli_fe.c " +
-"mysqli_nonapi.c " +
-"mysqli_prop.c " +
-"mysqli_report.c " +
-"mysqli_warning.c";
-
-  if (PHP_MYSQLI != "mysqlnd") {
-if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
-CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + 
- "\\include;" + PHP_PHP_BUILD +
- "\\include\\mysql;" + PHP_MYSQLI)) {
-  // No "mysqli_repl.c" when using "mysqlnd"
-  mysqli_extra_sources = "mysqli_repl.c";
-  EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
-  AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-} else {
-  WARNING("mysqli not enabled; libraries and headers not found");
-}
-
-  } else {
-
-EXTENSION("mysqli", mysqli_source);
-AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
-  }
+   mysqli_source =
+   "mysqli.c " +
+   "mysqli_api.c " +
+   "mysqli_driver.c " +
+   "mysqli_embedded.c " +
+   "mysqli_exception.c " +
+   "mysqli_fe.c " +
+   "mysqli_nonapi.c " +
+   "mysqli_prop.c " +
+   "mysqli_report.c " +
+   "mysqli_warning.c";
+
+   if (PHP_MYSQLI != "mysqlnd") {
+   if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
+   CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", 
PHP_MYSQLI + 
+   
"\\include;" + PHP_PHP_BUILD +
+   
"\\include\\mysql;" + PHP_MYSQLI)) {
+   // No "mysqli_repl.c" when using "mysqlnd"
+   mysqli_extra_sources = "mysqli_repl.c";
+   EXTENSION("mysqli", mysqli_source + " " + 
mysqli_extra_sources);
+   AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
+   } else {
+   WARNING("mysqli not enabled; libraries and headers not 
found");
+   }
+   } else 

[PHP-CVS] cvs: php-src /ext/mysql config.w32 /ext/mysqli config.w32 /ext/pgsql config.w32

2005-06-05 Thread Wez Furlong
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.1Fri Dec  5 01:09:29 2003
+++ php-src/ext/mysql/config.w32Sun 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.6Fri Mar 25 01:26:30 2005
+++ php-src/ext/pgsql/config.w32Sun 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");

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/mysql config.w32

2003-12-04 Thread Sebastian Bergmann
sebastian   Fri Dec  5 01:09:30 2003 EDT

  Added files: 
/php-src/ext/mysql  config.w32 
  Log:
  Support for new Win32 build bliss.
  

Index: php-src/ext/mysql/config.w32
+++ php-src/ext/mysql/config.w32
// $Id: config.w32,v 1.1 2003/12/05 06:09:29 sebastian 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)) {
EXTENSION("mysql", "php_mysql.c");
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
} else {
WARNING("mysql not enabled; libraries and headers not found");
}
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php