Skip to content

Commit 46e3d3a

Browse files
committed
Fix snapshot build
1 parent f728678 commit 46e3d3a

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

ext/mysql/config.w32

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@
44
ARG_WITH("mysql", "MySQL support", "no");
55

66
if (PHP_MYSQL != "no") {
7-
if (PHP_MYSQL != "mysqlnd") {
7+
if (PHP_MYSQL == "yes" || PHP_MYSQL == "mysqlnd") {
8+
AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'Using MySQL native driver');
9+
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
10+
EXTENSION("mysql", "php_mysql.c");
11+
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
12+
STDOUT.WriteLine("INFO: mysqlnd build");
13+
} else if (PHP_MYSQL != "") {
814
if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
915
CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
1016
PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
1117
EXTENSION("mysql", "php_mysql.c");
1218
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
19+
STDOUT.WriteLine("INFO: libmysql build");
1320
} else {
1421
WARNING("mysql not enabled; libraries and headers not found");
1522
}
16-
} else {
17-
AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'MySQL native driver support enabled');
18-
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
19-
EXTENSION("mysql", "php_mysql.c");
20-
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
2123
}
2224
}

ext/mysqli/config.w32

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)