From 7af270eb284c3bd00f6e5d80fbb0a2de9f89b693 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Wed, 27 Mar 2019 09:58:40 +0100 Subject: Fix #77805 phpdbg build fails when readline is shared --- sapi/phpdbg/phpdbg_prompt.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'sapi/phpdbg/phpdbg_prompt.c') diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 70c02221aa..fd668fcfec 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(""); -#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"); -- cgit v1.2.1