com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS sapi/phpdbg/config.m4 sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg _prompt.c
| From: | Joe Watkins | Date: | Wed, 27 Mar 2019 09:04:07 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS sapi/phpdbg/config.m4 sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg _prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105360@lists.php.net to get a copy of this message | ||
Commit: eb405a2192bd8a0092c0795cd161d96b89f9d534
Author: Joe Watkins <krakjoe@php.net> Wed, 27 Mar 2019 10:03:50 +0100
Parents: 1e4cff9ddb810a9038a8613719d7f91ad8bda64f 7af270eb284c3bd00f6e5d80fbb0a2de9f89b693
Branches: PHP-7.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb405a2192bd8a0092c0795cd161d96b89f9d534
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77805 phpdbg build fails when readline is shared
Bugs:
https://bugs.php.net/77805
Changed paths:
MM NEWS
MM sapi/phpdbg/config.m4
MM sapi/phpdbg/phpdbg.h
MM sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --cc NEWS
index 6a73dbb,81d1727..2ca20ad
--- a/NEWS
+++ b/NEWS
@@@ -18,7 -14,8 +18,8 @@@ PH
. Fixed bug #76801 (too many open files). (alekitto)
. Fixed bug #77800 (phpdbg segfaults on listing some conditional breakpoints).
(krakjoe)
+ . Fixed bug #77805 (phpdbg build fails when readline is shared). (krakjoe)
-
+
- Reflection:
. Fixed bug #77772 (ReflectionClass::getMethods(null) doesn't work).. (Nikita)
diff --cc sapi/phpdbg/config.m4
index 56d4b21,d6765e1..93144ac
--- a/sapi/phpdbg/config.m4
+++ b/sapi/phpdbg/config.m4
@@@ -1,15 -1,19 +1,18 @@@
-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)
+
if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" !=
"no"; then
AC_HEADER_TIOCGWINSZ
AC_DEFINE(HAVE_PHPDBG, 1, [ ])