Author: ahristov
Date: 2007-10-05 16:56:37 +0200 (Fri, 05 Oct 2007)
New Revision: 1088
Modified:
trunk/php5/ext/mysql/config.w32
trunk/php5/ext/mysqli/config.w32
trunk/php6/ext/mysql/config.w32
trunk/php6/ext/mysqli/config.w32
Log:
Tabs instead_of spaces
Modified: trunk/php5/ext/mysql/config.w32
===================================================================
--- trunk/php5/ext/mysql/config.w32 2007-10-05 12:44:10 UTC (rev 1087)
+++ trunk/php5/ext/mysql/config.w32 2007-10-05 14:56:37 UTC (rev 1088)
@@ -4,19 +4,18 @@
ARG_WITH("mysql", "MySQL support", "no");
if (PHP_MYSQL != "no") {
- if (PHP_MYSQLI != "mysqlnd") {
- STDOUT.Write("mysqlnd not wanted");
- 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 {
- STDOUT.Write("mysqlnd wanted");
- 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');
+ 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 {
+ STDOUT.Write("mysqlnd wanted");
+ 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');
}
Modified: trunk/php5/ext/mysqli/config.w32
===================================================================
--- trunk/php5/ext/mysqli/config.w32 2007-10-05 12:44:10 UTC (rev 1087)
+++ trunk/php5/ext/mysqli/config.w32 2007-10-05 14:56:37 UTC (rev 1088)
@@ -9,39 +9,34 @@
ARG_WITH("mysqli", "MySQLi support", "no");
if (PHP_MYSQLI != "no") {
- STDOUT.Write("Trying to enable mysqli");
+ 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";
- 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") {
- STDOUT.Write("mysqli with libmysql");
- 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 {
- STDOUT.Write("mysqli with mysqlnd");
-
- EXTENSION("mysqli", mysqli_source);
- AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support enabled');
- AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
- ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
- }
+ 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);
+ }
}
Modified: trunk/php6/ext/mysql/config.w32
===================================================================
--- trunk/php6/ext/mysql/config.w32 2007-10-05 12:44:10 UTC (rev 1087)
+++ trunk/php6/ext/mysql/config.w32 2007-10-05 14:56:37 UTC (rev 1088)
@@ -4,16 +4,18 @@
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 {
+ STDOUT.Write("mysqlnd wanted");
+ 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');
}
Modified: trunk/php6/ext/mysqli/config.w32
===================================================================
--- trunk/php6/ext/mysqli/config.w32 2007-10-05 12:44:10 UTC (rev 1087)
+++ trunk/php6/ext/mysqli/config.w32 2007-10-05 14:56:37 UTC (rev 1088)
@@ -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";
- 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);
- }
+ 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);
+ }
}
| Thread |
|---|
| • PHP mysqlnd svn commit: r1088 - in trunk: php5/ext/mysql php5/ext/mysqli php6/ext/mysql php6/ext/mysqli | ahristov | 5 Oct |
