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.3 Wed Jul 25 23:47:32 2007
+++ php-src/ext/mysql/config.w32 Tue 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 {
+ EXTENSION("mysqli", mysqli_source);
+ AC_DEFINE('HAVE_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
