| 1 |
diff -Naur php-5.5.2/ext/readline/config.m4 php-5.5.2.oden/ext/readline/config.m4 |
| 2 |
--- php-5.5.2/ext/readline/config.m4 2013-08-15 22:42:04.000000000 +0200 |
| 3 |
+++ php-5.5.2.oden/ext/readline/config.m4 2013-08-18 21:09:08.937879994 +0200 |
| 4 |
@@ -2,16 +2,9 @@ |
| 5 |
dnl $Id$ |
| 6 |
dnl |
| 7 |
|
| 8 |
-PHP_ARG_WITH(libedit,for libedit readline replacement, |
| 9 |
-[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) |
| 10 |
- |
| 11 |
-if test "$PHP_LIBEDIT" = "no"; then |
| 12 |
PHP_ARG_WITH(readline,for readline support, |
| 13 |
[ --with-readline[=DIR] Include readline support (CLI/CGI only)]) |
| 14 |
-else |
| 15 |
dnl "register" the --with-readline option to preven invalid "unknown configure option" warning |
| 16 |
- php_with_readline=no |
| 17 |
-fi |
| 18 |
|
| 19 |
if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then |
| 20 |
for i in $PHP_READLINE /usr/local /usr; do |
| 21 |
@@ -60,7 +53,7 @@ |
| 22 |
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS |
| 23 |
]) |
| 24 |
|
| 25 |
- PHP_CHECK_LIBRARY(edit, rl_on_new_line, |
| 26 |
+ PHP_CHECK_LIBRARY(readline, rl_on_new_line, |
| 27 |
[ |
| 28 |
AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ]) |
| 29 |
],[],[ |
| 30 |
@@ -69,18 +62,6 @@ |
| 31 |
|
| 32 |
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) |
| 33 |
|
| 34 |
-elif test "$PHP_LIBEDIT" != "no"; then |
| 35 |
- |
| 36 |
- for i in $PHP_LIBEDIT /usr/local /usr; do |
| 37 |
- test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break |
| 38 |
- done |
| 39 |
- |
| 40 |
- if test -z "$LIBEDIT_DIR"; then |
| 41 |
- AC_MSG_ERROR(Please reinstall libedit - I cannot find readline.h) |
| 42 |
- fi |
| 43 |
- |
| 44 |
- PHP_ADD_INCLUDE($LIBEDIT_DIR/include) |
| 45 |
- |
| 46 |
AC_CHECK_LIB(ncurses, tgetent, |
| 47 |
[ |
| 48 |
PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD) |
| 49 |
@@ -72,33 +72,9 @@ |
| 50 |
]) |
| 51 |
]) |
| 52 |
|
| 53 |
- PHP_CHECK_LIBRARY(edit, readline, |
| 54 |
- [ |
| 55 |
- PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) |
| 56 |
- ], [ |
| 57 |
- AC_MSG_ERROR(edit library required by readline not found) |
| 58 |
- ], [ |
| 59 |
- -L$READLINE_DIR/$PHP_LIBDIR |
| 60 |
- ]) |
| 61 |
- |
| 62 |
- PHP_CHECK_LIBRARY(edit, rl_callback_read_char, |
| 63 |
- [ |
| 64 |
- AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) |
| 65 |
- ],[],[ |
| 66 |
- -L$READLINE_DIR/$PHP_LIBDIR |
| 67 |
- ]) |
| 68 |
- |
| 69 |
- PHP_CHECK_LIBRARY(edit, rl_on_new_line, |
| 70 |
- [ |
| 71 |
- AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ]) |
| 72 |
- ],[],[ |
| 73 |
- -L$READLINE_DIR/$PHP_LIBDIR |
| 74 |
- ]) |
| 75 |
- |
| 76 |
- AC_DEFINE(HAVE_LIBEDIT, 1, [ ]) |
| 77 |
fi |
| 78 |
|
| 79 |
-if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then |
| 80 |
+if test "$PHP_READLINE" != "no"; then |
| 81 |
AC_CHECK_FUNCS([rl_completion_matches]) |
| 82 |
PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) |
| 83 |
PHP_SUBST(READLINE_SHARED_LIBADD) |
Parent Directory
| 
Revision Log