---- php-4.3.3RC3/ext/ncurses/config.m4.orig 2003-06-16 22:17:13.000000000 +0200
-+++ php-4.3.3RC3/ext/ncurses/config.m4 2003-08-16 15:18:01.013531176 +0200
-@@ -13,13 +13,26 @@
+diff -urN php-4.3.4RC2.orig/ext/ncurses/config.m4 php-4.3.4RC2/ext/ncurses/config.m4
+--- php-4.3.4RC2.orig/ext/ncurses/config.m4 2003-10-22 11:15:33.000000000 +0200
++++ php-4.3.4RC2/ext/ncurses/config.m4 2003-10-22 13:11:00.000000000 +0200
+@@ -11,24 +11,29 @@
- if test -r $PHP_NCURSES/; then # path given as parameter
- NCURSES_DIR=$PHP_NCURSES
-+ if test -r $PHP_NCURSES/include/curses.h ; then
-+ NCURSES_INC=$PHP_NCURSES/include
-+ elif test -r $PHP_NCURSES/include/ncurses/curses.h ; then
-+ NCURSES_INC=$PHP_NCURSES/include/ncurses
-+ else
-+ NCURSES_INC=$PHP_NCURSES/include
-+ fi
- else # search default path list
- AC_MSG_CHECKING(for ncurses files in default path)
- for i in $SEARCH_PATH ; do
- if test -r $i/$SEARCH_FOR; then
- NCURSES_DIR=$i
+ for i in $SEARCH_PATH ; do
+ if test -d $i/include; then
++ NCURSES_DIR=$i
+ if test -r $i/include/ncurses.h; then
+- NCURSES_DIR=$i
++ NCURSES_INC=$i/include
++ AC_DEFINE(HAVE_NCURSES_H,1,[ ])
++ break
++ elif test -r $i/include/ncurses/ncurses.h; then
++ NCURSES_INC=$i/include/ncurses;
+ AC_DEFINE(HAVE_NCURSES_H,1,[ ])
+ break
+ elif test -r $i/include/curses.h; then
+- NCURSES_DIR=$i
+ NCURSES_INC=$i/include
- AC_MSG_RESULT(found in $i)
+ break
fi
-+ if test -r $i/include/ncurses/curses.h; then
-+ NCURSES_DIR=$i
-+ NCURSES_INC=$i/include/ncurses
-+ AC_MSG_RESULT(found in $i, headers in $i/include/ncurses)
-+ fi
- done
- fi
+ fi
+ done
-@@ -29,7 +42,7 @@
+- if test -z "$NCURSES_DIR"; then
++ if test -z "$NCURSES_INC"; then
+ AC_MSG_RESULT(not found)
+ AC_MSG_ERROR(Please reinstall the ncurses distribution)
fi
# --with-ncurses -> add include path
# --with-ncurses -> chech for lib and symbol presence
LIBNAME=ncurses
---- php-4.3.3RC3/ext/readline/config.m4.orig 2003-02-11 04:24:56.000000000 +0100
-+++ php-4.3.3RC3/ext/readline/config.m4 2003-08-16 15:20:16.758894744 +0200
-@@ -21,6 +21,10 @@
+diff -urN php-4.3.4RC2.orig/ext/readline/config.m4 php-4.3.4RC2/ext/readline/config.m4
+--- php-4.3.4RC2.orig/ext/readline/config.m4 2003-10-22 11:15:34.000000000 +0200
++++ php-4.3.4RC2/ext/readline/config.m4 2003-10-22 13:12:04.000000000 +0200
+@@ -19,6 +19,10 @@
PHP_ADD_INCLUDE($READLINE_DIR/include)
AC_CHECK_LIB(ncurses, tgetent,
[
PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
-@@ -30,6 +34,7 @@
+@@ -28,6 +32,7 @@
PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
])
])
PHP_CHECK_LIBRARY(readline, readline,
[
-@@ -68,6 +73,10 @@
+@@ -63,6 +68,10 @@
PHP_ADD_INCLUDE($LIBEDIT_DIR/include)
AC_CHECK_LIB(ncurses, tgetent,
[
PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
-@@ -77,6 +86,7 @@
+@@ -72,6 +81,7 @@
PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
])
])