@@ -21,20 +21,22 @@ if (PHP_MYSQLI != "no") {
2121 "mysqli_report.c " +
2222 "mysqli_warning.c" ;
2323
24- if ( PHP_MYSQLI != "mysqlnd" ) {
24+ if ( PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd" ) {
25+ EXTENSION ( "mysqli" , mysqli_source ) ;
26+ AC_DEFINE ( 'MYSQLI_USE_MYSQLND' , 1 , 'Using MySQL native driver' ) ;
27+ AC_DEFINE ( 'HAVE_MYSQLILIB' , 1 , 'Have MySQLi library' ) ;
28+ ADD_EXTENSION_DEP ( 'mysqli' , 'mysqlnd' , true ) ;
29+ STDOUT . WriteLine ( "INFO: mysqlnd build" ) ;
30+ } else {
2531 if ( CHECK_LIB ( "libmysql.lib" , "mysqli" , PHP_MYSQLI ) &&
2632 CHECK_HEADER_ADD_INCLUDE ( "mysql.h" , "CFLAGS_MYSQLI" , PHP_MYSQLI +
2733 "\\include;" + PHP_PHP_BUILD +
2834 "\\include\\mysql;" + PHP_MYSQLI ) ) {
2935 EXTENSION ( "mysqli" , mysqli_source ) ;
3036 AC_DEFINE ( 'HAVE_MYSQLILIB' , 1 , 'Have MySQLi library' ) ;
37+ STDOUT . WriteLine ( "INFO: libmysql build" ) ;
3138 } else {
3239 WARNING ( "mysqli not enabled; libraries and headers not found" ) ;
3340 }
34- } else {
35- EXTENSION ( "mysqli" , mysqli_source ) ;
36- AC_DEFINE ( 'MYSQLI_USE_MYSQLND' , 1 , 'MySQLi with native driver support enabled' ) ;
37- AC_DEFINE ( 'HAVE_MYSQLILIB' , 1 , 'Have MySQLi library' ) ;
38- ADD_EXTENSION_DEP ( 'mysqli' , 'mysqlnd' , true ) ;
3941 }
4042}
0 commit comments