Merge branch 'PHP-7.4'

* PHP-7.4:
  use pkg-config for libedit

1 files changed, 11 insertions, 15 deletions

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index d11a2c11ec..21f4f63b04 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -1,7 +1,7 @@
 dnl config.m4 for extension readline
 
 PHP_ARG_WITH(libedit,for libedit readline replacement,
-[  --with-libedit[=DIR]      Include libedit readline replacement (CLI/CGI only)])
+[  --with-libedit          Include libedit readline replacement (CLI/CGI only)])
 
 if test "$PHP_LIBEDIT" = "no"; then
   PHP_ARG_WITH(readline,for readline support,
@@ -76,16 +76,13 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
 
 elif test "$PHP_LIBEDIT" != "no"; then
-
-  for i in $PHP_LIBEDIT /usr/local /usr; do
-    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
-  done
-
-  if test -z "$LIBEDIT_DIR"; then
-    AC_MSG_ERROR(Please reinstall libedit - I cannot find readline.h)
+  if test "$PHP_LIBEDIT" != "yes"; then
+    AC_MSG_WARN([libedit directory ignored, rely on pkg-config])
   fi
 
-  PHP_ADD_INCLUDE($LIBEDIT_DIR/include)
+  PKG_CHECK_MODULES([EDIT], [libedit])
+  PHP_EVAL_LIBLINE($EDIT_LIBS, READLINE_SHARED_LIBADD)
+  PHP_EVAL_INCLINE($EDIT_CFLAGS)
 
   AC_CHECK_LIB(ncurses, tgetent,
   [
@@ -99,39 +96,38 @@ elif test "$PHP_LIBEDIT" != "no"; then
 
   PHP_CHECK_LIBRARY(edit, readline,
   [
-    PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
   ], [
     AC_MSG_ERROR(edit library required by readline not found)
   ], [
-    -L$READLINE_DIR/$PHP_LIBDIR
+    $READLINE_SHARED_LIBADD
   ])
 
   PHP_CHECK_LIBRARY(edit, rl_callback_read_char,
   [
     AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ])
   ],[],[
-    -L$READLINE_DIR/$PHP_LIBDIR
+    $READLINE_SHARED_LIBADD
   ])
 
   PHP_CHECK_LIBRARY(edit, rl_on_new_line,
   [
     AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ])
   ],[],[
-    -L$READLINE_DIR/$PHP_LIBDIR
+    $READLINE_SHARED_LIBADD
   ])
 
   PHP_CHECK_LIBRARY(edit, rl_completion_matches,
   [
     AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ])
   ],[],[
-    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
+    $READLINE_SHARED_LIBADD
   ])
 
   PHP_CHECK_LIBRARY(edit, history_list,
   [
     AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
   ],[],[
-    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
+    $READLINE_SHARED_LIBADD
   ])
 
   AC_DEFINE(HAVE_LIBEDIT, 1, [ ])