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

  (patch by tcallawa at redhat dot com)

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 8f20482ff404981afa95fe37164bd34f918d4a3f..436f72b9fbda5606b6e363c886741e2963e4bce9 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 4867c91b1a75acb9609d7a0bc955da172818d121..3c4664a8abf368dabd9836afb72fe9785a2fbd18 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 6da5b93908bf00d08489a574863faf98d86acc41..b079bed5784c980e72311fce04996c3e16c212e8 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