From 0febafcfbe3e35f4a230430368ba931f19f8e957 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Mon, 23 Jun 2014 10:04:40 +0200
Subject: Fix https://github.com/krakjoe/phpdbg/issues/91

Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE
---
 sapi/phpdbg/phpdbg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sapi/phpdbg/phpdbg.h')

diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index 12350d5425..b2e7a03c21 100644
--- a/sapi/phpdbg/phpdbg.h
+++ b/sapi/phpdbg/phpdbg.h
@@ -64,7 +64,7 @@
 # include "TSRM.h"
 #endif
 
-#ifdef HAVE_LIBREADLINE
+#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
 #   include <readline/readline.h>
 #   include <readline/history.h>
 #endif
-- 
cgit v1.2.1


From 0da5d94a6c840af835a5b5d8bc4284a588d727bf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Mon, 23 Jun 2014 10:17:43 +0200
Subject: Better fix for phpdbg + libedit - fix include - disable coloured
 prompt only with libedit

---
 sapi/phpdbg/phpdbg.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sapi/phpdbg/phpdbg.h')

diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index b2e7a03c21..eb4faf1f94 100644
--- a/sapi/phpdbg/phpdbg.h
+++ b/sapi/phpdbg/phpdbg.h
@@ -64,10 +64,13 @@
 # include "TSRM.h"
 #endif
 
-#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
+#ifdef LIBREADLINE
 #   include <readline/readline.h>
 #   include <readline/history.h>
 #endif
+#ifdef HAVE_LIBEDIT
+#   include <editline/readline.h>
+#endif
 
 #include "phpdbg_lexer.h"
 #include "phpdbg_cmd.h"
-- 
cgit v1.2.1