diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:04:47 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:05:03 +0100 |
| commit | 5b3acb3eaf2967ea876dd6c38a44026d6e80fe12 (patch) | |
| tree | 42b27d639691fd795235f459458292f7c7b25e27 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | fe7a914194aba9d6885a7b46b72fe80073c4518c (diff) | |
| parent | 56293d0637b3e9e706414e3f5689d153ba6bb1f2 (diff) | |
| download | php-git-5b3acb3eaf2967ea876dd6c38a44026d6e80fe12.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
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 64fece82fd..4b20732286 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"); |