From 97cfc51298382fe26ac2e0b5acac96acef4a3ebb Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Sun, 13 Dec 2009 17:06:47 +0000
Subject: [PATCH] - Fixed bug #50209 (Compiling with libedit cannot find
 readline.h)   (patch by tcallawa at redhat dot com)

---
 ext/readline/config.m4      | 2 +-
 ext/readline/readline.c     | 4 +++-
 sapi/cli/php_cli.c          | 5 ++++-
 sapi/cli/php_cli_readline.c | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index a320deeb42..a99262a659 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -65,7 +65,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
 elif test "$PHP_LIBEDIT" != "no"; then
 
   for i in $PHP_LIBEDIT /usr/local /usr; do
-    test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
+    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
   done
 
   if test -z "$LIBEDIT_DIR"; then
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 8f20482ff4..436f72b9fb 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -33,8 +33,10 @@
 #define rl_completion_matches completion_matches
 #endif
 
+#ifdef HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
 #include <readline/readline.h>
-#ifndef HAVE_LIBEDIT
 #include <readline/history.h>
 #endif
 
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 4867c91b1a..3c4664a8ab 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -76,8 +76,11 @@
 #endif
 
 #if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
+
+#if HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
 #include <readline/readline.h>
-#if !HAVE_LIBEDIT
 #include <readline/history.h>
 #endif
 #include "php_cli_readline.h"
diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index 6da5b93908..b079bed578 100644
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -49,8 +49,10 @@
 #include <unixlib/local.h>
 #endif
 
+#if HAVE_LIBEDIT
+#include <editline/readline.h>
+#else
 #include <readline/readline.h>
-#if !HAVE_LIBEDIT
 #include <readline/history.h>
 #endif
 
-- 
2.40.0