Commit | Line | Data |
---|---|---|
e054b9eb FF |
1 | diff -u -r ../php-5.6.15/ext/opcache/config.m4 ./ext/opcache/config.m4 |
2 | --- ../php-5.6.15/ext/opcache/config.m4 2015-10-29 05:55:01.000000000 -0400 | |
3 | +++ ./ext/opcache/config.m4 2015-11-10 15:24:37.080935147 -0500 | |
4 | @@ -341,7 +341,15 @@ | |
5 | flock_type=linux | |
6 | AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) | |
7 | AC_MSG_RESULT("yes") | |
8 | -], AC_MSG_RESULT("no") ) | |
9 | +], [ | |
10 | + AC_MSG_RESULT("no") | |
11 | +], [ | |
12 | + dnl cross-compiling; assume Linux | |
13 | + flock_type=linux | |
14 | + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) | |
15 | + AC_MSG_RESULT("yes") | |
16 | +]) | |
17 | + | |
18 | ||
19 | AC_MSG_CHECKING("whether flock struct is BSD ordered") | |
20 | AC_TRY_RUN([ | |
21 | @@ -357,7 +365,13 @@ | |
22 | flock_type=bsd | |
23 | AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) | |
24 | AC_MSG_RESULT("yes") | |
25 | -], AC_MSG_RESULT("no") ) | |
26 | +], [ | |
27 | + AC_MSG_RESULT("no") | |
28 | +], [ | |
29 | + dnl cross-compiling; assume Linux | |
30 | + AC_MSG_RESULT("no") | |
31 | +]) | |
32 | + | |
33 | ||
34 | if test "$flock_type" == "unknown"; then | |
35 | AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) |