diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:04:18 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:04:36 +0100 |
| commit | 56293d0637b3e9e706414e3f5689d153ba6bb1f2 (patch) | |
| tree | e726709e0315209b7383e69ccdf7c40b71b8f410 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | f177a2ac586124374e13b93da0c0b9e0e4980ff6 (diff) | |
| parent | eb405a2192bd8a0092c0795cd161d96b89f9d534 (diff) | |
| download | php-git-56293d0637b3e9e706414e3f5689d153ba6bb1f2.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77805 phpdbg build fails when readline is shared
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index f0d0e13e3b..c962ce52c3 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1158,15 +1158,19 @@ PHPDBG_COMMAND(info) /* {{{ */ { phpdbg_out("Execution Context Information\n\n"); phpdbg_xml("<printinfo %r>"); -#ifdef HAVE_LIBREADLINE - phpdbg_writeln("info", "readline=\"yes\"", "Readline yes"); +#ifdef HAVE_PHPDBG_READLINE +# ifdef HAVE_LIBREADLINE + phpdbg_writeln("info", "readline=\"yes\"", "Readline yes"); +# else + phpdbg_writeln("info", "readline=\"no\"", "Readline no"); +# endif +# ifdef HAVE_LIBEDIT + phpdbg_writeln("info", "libedit=\"yes\"", "Libedit yes"); +# else + phpdbg_writeln("info", "libedit=\"no\"", "Libedit no"); +# endif #else - phpdbg_writeln("info", "readline=\"no\"", "Readline no"); -#endif -#ifdef HAVE_LIBEDIT - phpdbg_writeln("info", "libedit=\"yes\"", "Libedit yes"); -#else - phpdbg_writeln("info", "libedit=\"no\"", "Libedit no"); + phpdbg_writeln("info", "readline=\"unavailable\"", "Readline unavailable"); #endif phpdbg_writeln("info", "context=\"%s\"", "Exec %s", PHPDBG_G(exec) ? PHPDBG_G(exec) : "none"); |