php-ncurses.patch

   1 diff -urN php-4.3.4RC2.orig/ext/ncurses/config.m4 php-4.3.4RC2/ext/ncurses/config.m4
   2 --- php-4.3.4RC2.orig/ext/ncurses/config.m4     2003-10-22 11:15:33.000000000 +0200
   3 +++ php-4.3.4RC2/ext/ncurses/config.m4  2003-10-22 13:11:00.000000000 +0200
   4 @@ -11,24 +11,29 @@
   5
   6     for i in $SEARCH_PATH ; do
   7       if test -d $i/include; then
   8 +       NCURSES_DIR=$i
   9         if test -r $i/include/ncurses.h; then
  10 -         NCURSES_DIR=$i
  11 +        NCURSES_INC=$i/include
  12 +         AC_DEFINE(HAVE_NCURSES_H,1,[ ])
  13 +         break
  14 +       elif test -r $i/include/ncurses/ncurses.h; then
  15 +        NCURSES_INC=$i/include/ncurses;
  16           AC_DEFINE(HAVE_NCURSES_H,1,[ ])
  17           break
  18         elif test -r $i/include/curses.h; then
  19 -         NCURSES_DIR=$i
  20 +         NCURSES_INC=$i/include
  21           break
  22         fi
  23       fi
  24     done
  25
  26 -   if test -z "$NCURSES_DIR"; then
  27 +   if test -z "$NCURSES_INC"; then
  28       AC_MSG_RESULT(not found)
  29       AC_MSG_ERROR(Please reinstall the ncurses distribution)
  30     fi
  31
  32     # --with-ncurses -> add include path
  33 -   PHP_ADD_INCLUDE($NCURSES_DIR/include)
  34 +   PHP_ADD_INCLUDE($NCURSES_INC)
  35
  36     # --with-ncurses -> chech for lib and symbol presence
  37     LIBNAME=ncurses
  38 diff -urN php-4.3.4RC2.orig/ext/readline/config.m4 php-4.3.4RC2/ext/readline/config.m4
  39 --- php-4.3.4RC2.orig/ext/readline/config.m4    2003-10-22 11:15:34.000000000 +0200
  40 +++ php-4.3.4RC2/ext/readline/config.m4 2003-10-22 13:12:04.000000000 +0200
  41 @@ -19,6 +19,10 @@
  42
  43    PHP_ADD_INCLUDE($READLINE_DIR/include)
  44
  45 +  AC_CHECK_LIB(tinfo, tgetent,
  46 +  [
  47 +    PHP_ADD_LIBRARY(tinfo,,READLINE_SHARED_LIBADD)
  48 +  ],[
  49    AC_CHECK_LIB(ncurses, tgetent,
  50    [
  51      PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
  52 @@ -28,6 +32,7 @@
  53        PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
  54      ])
  55    ])
  56 +  ])
  57
  58    PHP_CHECK_LIBRARY(readline, readline,
  59    [
  60 @@ -63,6 +68,10 @@
  61
  62    PHP_ADD_INCLUDE($LIBEDIT_DIR/include)
  63
  64 +  AC_CHECK_LIB(tinfo, tgetent,
  65 +  [
  66 +    PHP_ADD_LIBRARY(tinfo,,READLINE_SHARED_LIBADD)
  67 +  ],[
  68    AC_CHECK_LIB(ncurses, tgetent,
  69    [
  70      PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
  71 @@ -72,6 +81,7 @@
  72        PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
  73      ])
  74    ])
  75 +  ])
  76
  77    PHP_CHECK_LIBRARY(edit, readline,
  78    [