diff options
| author | Pierre Joye <pajoye@php.net> | 2008-06-23 18:40:29 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-06-23 18:40:29 +0000 |
| commit | 41976c7ab67b6624cd661eae7c8ae0565874d465 (patch) | |
| tree | 091b13cb5be71b4c1ea3760aab2d7c8add656ca0 /ext/mysqli/config.w32 | |
| parent | 019c5861910b6c1d5669472d3202c5d5b2161993 (diff) | |
| download | php-git-41976c7ab67b6624cd661eae7c8ae0565874d465.tar.gz | |
- do not enable an ext when a lib/header fails
- use MESSAGE in mysql*
- use correct CFLAGS for ext/libxml headers
Diffstat (limited to 'ext/mysqli/config.w32')
| -rw-r--r-- | ext/mysqli/config.w32 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index e7c418999a..8ea72a06db 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -26,7 +26,7 @@ if (PHP_MYSQLI != "no") { 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"); + MESSAGE("\tmysqlnd build"); } else { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + @@ -34,9 +34,10 @@ if (PHP_MYSQLI != "no") { "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); - STDOUT.WriteLine("INFO: libmysql build"); + MESSAGE("\tlibmysql build"); } else { WARNING("mysqli not enabled; libraries and headers not found"); + PHP_MYSQLI = "no" } } } |