svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c
branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/php_cli_readline.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/readline/config.m4
branches/PHP_5_3/ext/readline/readline.c branches/PHP_5_3/sapi/cli/php_cli.c branches/PHP_5_3/sapi/cli/php_cli_readline.c trunk/ext/readline/config.m4
trunk/ext/readline/readline.c trunk/sapi/cli/php_cli.c trunk/sapi/cli/php_cli_readli
| From: | Felipe Pena | Date: | Sun, 13 Dec 2009 17:06:47 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_2/ext/readline/readline.c branches/PHP_5_2/sapi/cli/php_cli.c branches/PHP_5_2/sapi/cli/php_cli_readline.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/readline/config.m4 branches/PHP_5_3/ext/readline/readline.c branches/PHP_5_3/sapi/cli/php_cli.c branches/PHP_5_3/sapi/cli/php_cli_readline.c trunk/ext/readline/config.m4 trunk/ext/readline/readline.c trunk/sapi/cli/php_cli.c trunk/sapi/cli/php_cli_readli |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61256@lists.php.net to get a copy of this message | ||
felipe Sun, 13 Dec 2009 17:06:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292081
Log:
- Fixed bug #50209 (Compiling with libedit cannot find readline.h)
(patch by tcallawa at redhat dot com)
Bug: http://bugs.php.net/50209 (No Feedback) Compiling with
libedit cannot find readline.h
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/readline/config.m4
U php/php-src/branches/PHP_5_2/ext/readline/readline.c
U php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
U php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/readline/config.m4
U php/php-src/branches/PHP_5_3/ext/readline/readline.c
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli_readline.c
U php/php-src/trunk/ext/readline/config.m4
U php/php-src/trunk/ext/readline/readline.c
U php/php-src/trunk/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/cli/php_cli_readline.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-12-13 17:06:47 UTC (rev 292081)
@@ -17,6 +17,8 @@
- 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
Modified: php/php-src/branches/PHP_5_2/ext/readline/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-12-13 17:06:47 UTC (rev 292081)
@@ -65,7 +65,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
Modified: php/php-src/branches/PHP_5_2/ext/readline/readline.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/readline/readline.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/ext/readline/readline.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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
Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c
===================================================================
--- php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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"
Modified: php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c
===================================================================
--- php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_2/sapi/cli/php_cli_readline.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-12-13 17:06:47 UTC (rev 292081)
@@ -62,6 +62,8 @@
(Pierrick)
- Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).
(Ilia, shigeru_kitazaki at cybozu dot co dot jp)
+- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
+ (tcallawa at redhat dot com)
- Fixed bug #50207 (segmentation fault when concatenating very large strings on
64bit linux). (Ilia)
- Fixed bug #50195 (pg_copy_to() fails when table name contains schema. (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/readline/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-12-13 17:06:47 UTC (rev 292081)
@@ -65,7 +65,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
Modified: php/php-src/branches/PHP_5_3/ext/readline/readline.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/readline/readline.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_3/ext/readline/readline.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -76,8 +76,10 @@
#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"
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli_readline.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli_readline.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli_readline.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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
Modified: php/php-src/trunk/ext/readline/config.m4
===================================================================
--- php/php-src/trunk/ext/readline/config.m4 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/trunk/ext/readline/config.m4 2009-12-13 17:06:47 UTC (rev 292081)
@@ -65,7 +65,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
Modified: php/php-src/trunk/ext/readline/readline.c
===================================================================
--- php/php-src/trunk/ext/readline/readline.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/trunk/ext/readline/readline.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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
Modified: php/php-src/trunk/sapi/cli/php_cli.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/trunk/sapi/cli/php_cli.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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"
Modified: php/php-src/trunk/sapi/cli/php_cli_readline.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_readline.c 2009-12-13 16:53:24 UTC (rev 292080)
+++ php/php-src/trunk/sapi/cli/php_cli_readline.c 2009-12-13 17:06:47 UTC (rev 292081)
@@ -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