File php5-really-with-libedit.patch of Package php-5.2.12

File php5-really-with-libedit.patch of Package php-5.2.12 (Revision 500923640eee1e9fe7d2f07471e9af76)

Currently displaying revision 500923640eee1e9fe7d2f07471e9af76, show latest

Index: ext/readline/config.m4
===================================================================
RCS file: /repository/php-src/ext/readline/config.m4,v
retrieving revision 1.25.2.3
diff -u -r1.25.2.3 config.m4
--- ext/readline/config.m4	28 Nov 2005 23:04:01 -0000	1.25.2.3
+++ ext/readline/config.m4	17 Aug 2006 22:46:53 -0000
@@ -64,7 +64,7 @@
 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
Index: ext/readline/readline.c
===================================================================
RCS file: /repository/php-src/ext/readline/readline.c,v
retrieving revision 1.42.2.3
diff -u -r1.42.2.3 readline.c
--- ext/readline/readline.c	1 Jan 2006 12:50:12 -0000	1.42.2.3
+++ ext/readline/readline.c	17 Aug 2006 22:46:53 -0000
@@ -33,9 +33,11 @@
 #define rl_completion_matches completion_matches
 #endif
 
+#if HAVE_LIBREADLINE
 #include <readline/readline.h>
-#ifndef HAVE_LIBEDIT
 #include <readline/history.h>
+#else
+#include <editline/readline.h>
 #endif
 
 PHP_FUNCTION(readline);
Index: sapi/cli/php_cli.c
===================================================================
RCS file: /repository/php-src/sapi/cli/php_cli.c,v
retrieving revision 1.129.2.13.2.6
diff -u -r1.129.2.13.2.6 php_cli.c
--- sapi/cli/php_cli.c	27 Jun 2006 08:27:10 -0000	1.129.2.13.2.6
+++ sapi/cli/php_cli.c	17 Aug 2006 22:47:10 -0000
@@ -76,7 +76,7 @@
 #endif
 
 #if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
-#include <readline/readline.h>
+#include <editline/readline.h>
 #if !HAVE_LIBEDIT
 #include <readline/history.h>
 #endif
Index: sapi/cli/php_cli_readline.c
===================================================================
RCS file: /repository/php-src/sapi/cli/php_cli_readline.c,v
retrieving revision 1.3.2.5
diff -u -r1.3.2.5 php_cli_readline.c
--- sapi/cli/php_cli_readline.c	1 Jan 2006 12:50:19 -0000	1.3.2.5
+++ sapi/cli/php_cli_readline.c	17 Aug 2006 22:47:10 -0000
@@ -49,7 +49,7 @@
 #include <unixlib/local.h>
 #endif
 
-#include <readline/readline.h>
+#include <editline/readline.h>
 #if !HAVE_LIBEDIT
 #include <readline/history.h>
 #endif