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.7    Mon Mar 10 20:27:15 2008
+++ php-src/ext/mysql/config.w32        Tue 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

Reply via email to