- Fixed bug #50209 (Compiling with libedit cannot find readline.h)

  (patch by tcallawa at redhat dot com)

diff --git a/NEWS b/NEWS
index 9c4a3f8fff1fc67323b7bd9a205637f7527994e4..655cd4eae6e0ab6056aeda3cdd8fc8cc8404c8d2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ PHP                                                                        NEWS
 - Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
   (Ilia, Pierrick)
 - Fixed bug #50266 (conflicting types for llabs). (Jani)
+- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
+  (tcallawa at redhat dot com)
 - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
   non-existent file). (Dmitry)
 - Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index a320deeb4299dfa124b49e4d20f04423282c33f6..a99262a659a634cf6272635c8cae25c1a10fe549 100644 (file)
--- 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 c6f5e18c8142f72175ddde45fc3aa5d802b7e703..4c8373f3d44022660af38dfc2cf3ccd2f497310e 100644 (file)
--- 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 1545dabe03060cb205af1b49f1637326cef6a4b8..fe33cea01020bae6dad0abc78982e1f43afcf65c 100644 (file)
--- 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 64543fcbdd5967245450fe52c249a53c65b9b1f3..6098f975f5b76934e4dfc857c32d75da785b77bf 100644 (file)
--- 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