- There's no point in allowing using both --with-readline and --with-libedit

  the same time. Prefer --with-readline.
- Use PHP_ADD_LIBRARY when there is no path available.

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 982531260cd6902fff5a8cd46b6fe3ea51d26ed3..a22c09dee7b6b2c535d41313c5abe456627476bf 100644 (file)
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -18,15 +18,16 @@ if test "$PHP_READLINE" != "no"; then
   if test -z "$READLINE_DIR"; then
     AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h)
   fi
+
   PHP_ADD_INCLUDE($READLINE_DIR/include)
 
   AC_CHECK_LIB(ncurses, tgetent,
   [
-    PHP_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
   ],[
     AC_CHECK_LIB(termcap, tgetent,
     [
-      PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)
+      PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
     ])
   ])
 
@@ -52,9 +53,9 @@ if test "$PHP_READLINE" != "no"; then
 
   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
   PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
-fi
 
-if test "$PHP_LIBEDIT" != "no"; then
+elif test "$PHP_LIBEDIT" != "no"; then
+
   for i in /usr/local /usr $PHP_LIBEDIT; do
     if test -f $i/include/readline/readline.h; then
       LIBEDIT_DIR=$i
@@ -64,15 +65,16 @@ if test "$PHP_LIBEDIT" != "no"; then
   if test -z "$LIBEDIT_DIR"; then
     AC_MSG_ERROR(Please reinstall libedit - I cannot find readline.h)
   fi
+
   PHP_ADD_INCLUDE($LIBEDIT_DIR/include)
 
   AC_CHECK_LIB(ncurses, tgetent,
   [
-    PHP_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
   ],[
     AC_CHECK_LIB(termcap, tgetent,
     [
-      PHP_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)
+      PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
     ])
   ])