Integration of -ng changes. Changes:

- added support for externally built modules,
- improved support for in-tree shared modules,
- fixed diversion bugs,
- configure displays some informative messages,
- faster static build
  (libtool isn't used anymore for compiling non-PIC objects),
- dependencies comparable to automake's without requiring GNU make or GCC,
- working make clean for non-GNU makes.

3 files changed, 11 insertions, 6 deletions

diff --git a/ext/readline/Makefile.am b/ext/readline/Makefile.am
deleted file mode 100644
index ead3f7bc47..0000000000
--- a/ext/readline/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-noinst_LTLIBRARIES=libphpext_readline.la
-libphpext_readline_la_SOURCES=readline.c
-
diff --git a/ext/readline/Makefile.in b/ext/readline/Makefile.in
new file mode 100644
index 0000000000..5124a8c67a
--- /dev/null
+++ b/ext/readline/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libreadline.la
+LTLIBRARY_SOURCES = readline.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index 0cb936a7bf..c34d8df521 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -18,7 +18,7 @@ AC_ARG_WITH(readline,
       AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h)
     fi
     AC_ADD_INCLUDE($READLINE_DIR/include)
-    AC_ADD_LIBRARY(termcap)
+    AC_ADD_LIBRARY(ncurses)
     AC_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib)
     AC_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib)