com php-src: Merge branch 'PHP-7.3' into PHP-7.4: sapi/phpdbg/config.m4
| From: | Joe Watkins | Date: | Thu, 28 Mar 2019 06:35:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: sapi/phpdbg/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105373@lists.php.net to get a copy of this message | ||
Commit: 330517987bb40b8674861e11dc3eed689b31198c
Author: Joe Watkins <krakjoe@php.net> Thu, 28 Mar 2019 07:35:33 +0100
Parents: 363e8dd69d4580e047e365304a1bf9917ed95c71 62a652a0d559f2d1db7e823e0c59e3bcd254af33
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=330517987bb40b8674861e11dc3eed689b31198c
Log:
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 9abc990,24bc557..f590dc6
--- a/sapi/phpdbg/config.m4
+++ b/sapi/phpdbg/config.m4
@@@ -1,27 -1,17 +1,27 @@@
dnl config.m4 for sapi phpdbg
-PHP_ARG_ENABLE(phpdbg, for phpdbg support,
-[ --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)
-
-PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build,
-[ --enable-phpdbg-debug Build phpdbg in debug mode], no, no)
+PHP_ARG_ENABLE([phpdbg],
+ [for phpdbg support],
+ [AS_HELP_STRING([--enable-phpdbg],
+ [Build phpdbg])],
+ [yes],
+ [yes])
+
+PHP_ARG_ENABLE([phpdbg-webhelper],
+ [for phpdbg web SAPI support],
+ [AS_HELP_STRING([--enable-phpdbg-webhelper],
+ [Build phpdbg web SAPI support])],
+ [no])
+
+PHP_ARG_ENABLE([phpdbg-debug],
+ [for phpdbg debug build],
+ [AS_HELP_STRING([--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