diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-01-24 21:22:50 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-01-24 21:22:50 +0100 |
| commit | 2687be6589996b1af9d39c7a02d56cadab009a1c (patch) | |
| tree | 2320edd559c6307ea2eb5dbbd6e49e8b53908453 /ext/session | |
| parent | b6f66f18ad26c5b61473432426fe77bf07ba1c30 (diff) | |
| parent | 3fe9e10a1b357f94871bc225056c90b486aa7dbd (diff) | |
| download | php-git-2687be6589996b1af9d39c7a02d56cadab009a1c.tar.gz | |
Merge branch 'PHP-7.2'
Diffstat (limited to 'ext/session')
| -rw-r--r-- | ext/session/config.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 949306c026..b33855a676 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -27,7 +27,12 @@ if test "$PHP_MM" != "no"; then if test -z "$MM_DIR" ; then AC_MSG_ERROR(cannot find mm library) fi - + + if test "$enable_maintainer_zts" = "yes"; then + dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. + AC_MSG_ERROR(--with-mm cannot be combined with --enable-maintainer-zts) + fi + PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD) PHP_ADD_INCLUDE($MM_DIR/include) PHP_INSTALL_HEADERS([ext/session/mod_mm.h]) |