@@ -60,13 +60,20 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
60
60
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
61
61
] )
62
62
63
- PHP_CHECK_LIBRARY(edit , rl_on_new_line,
63
+ PHP_CHECK_LIBRARY(readline , rl_on_new_line,
64
64
[
65
65
AC_DEFINE ( HAVE_RL_ON_NEW_LINE , 1 , [ ] )
66
66
] ,[ ] ,[
67
67
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
68
68
] )
69
69
70
+ PHP_CHECK_LIBRARY(readline, rl_completion_matches,
71
+ [
72
+ AC_DEFINE ( HAVE_RL_COMPLETION_MATCHES , 1 , [ ] )
73
+ ] ,[ ] ,[
74
+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
75
+ ] )
76
+
70
77
AC_DEFINE ( HAVE_LIBREADLINE , 1 , [ ] )
71
78
72
79
elif test "$PHP_LIBEDIT" != "no"; then
@@ -114,11 +121,17 @@ elif test "$PHP_LIBEDIT" != "no"; then
114
121
-L$READLINE_DIR/$PHP_LIBDIR
115
122
] )
116
123
124
+ PHP_CHECK_LIBRARY(edit, rl_completion_matches,
125
+ [
126
+ AC_DEFINE ( HAVE_RL_COMPLETION_MATCHES , 1 , [ ] )
127
+ ] ,[ ] ,[
128
+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
129
+ ] )
130
+
117
131
AC_DEFINE ( HAVE_LIBEDIT , 1 , [ ] )
118
132
fi
119
133
120
134
if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
121
- AC_CHECK_FUNCS ( [ rl_completion_matches] )
122
135
PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli)
123
136
PHP_SUBST(READLINE_SHARED_LIBADD)
124
137
fi
0 commit comments