com php-src: Merge branch 'PHP-7.2' into PHP-7.3: sapi/phpdbg/config.m4

Commit: 62a652a0d559f2d1db7e823e0c59e3bcd254af33 Author: Joe Watkins <krakjoe@php.net> Thu, 28 Mar 2019 07:35:15 +0100 Parents: 218154e6958bc911ee2640baca10854cb2c33e20 b7442f1bb81303d3211844445f69d4a03565aa39 Branches: PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=62a652a0d559f2d1db7e823e0c59e3bcd254af33 Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: fix build: readline support must be disabled by default in phpdbg Changed paths: MM sapi/phpdbg/config.m4 Diff: diff --cc sapi/phpdbg/config.m4 index 93144ac,3cdd904..24bc557 --- a/sapi/phpdbg/config.m4 +++ b/sapi/phpdbg/config.m4 @@@ -1,17 -1,18 +1,17 @@@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi phpdbg PHP_ARG_ENABLE(phpdbg, for phpdbg support, -[ --enable-phpdbg Build phpdbg], yes, yes) +[ --enable-phpdbg Build phpdbg], yes, yes) PHP_ARG_ENABLE(phpdbg-webhelper, for phpdbg web SAPI support, -[ --enable-phpdbg-webhelper Build phpdbg web SAPI support], no) +[ --enable-phpdbg-webhelper + Build phpdbg web SAPI support], no) PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build, -[ --enable-phpdbg-debug Build phpdbg in debug mode], no, no) +[ --enable-phpdbg-debug Build phpdbg in debug mode], no, no) PHP_ARG_ENABLE(phpdbg-readline, for phpdbg readline support, - [ --enable-phpdbg-readline Enable readline support in phpdbg (depends on static ext/readline)], yes, yes) + [ --enable-phpdbg-readline Enable readline support in phpdbg (depends on static ext/readline)], no, no) if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then AC_HEADER_TIOCGWINSZ