php-ncurses.patch

   1 --- php-4.3.3RC3/ext/ncurses/config.m4.orig     2003-06-16 22:17:13.000000000 +0200
   2 +++ php-4.3.3RC3/ext/ncurses/config.m4  2003-08-16 15:18:01.013531176 +0200
   3 @@ -13,13 +13,26 @@
   4
   5     if test -r $PHP_NCURSES/; then # path given as parameter
   6       NCURSES_DIR=$PHP_NCURSES
   7 +     if test -r $PHP_NCURSES/include/curses.h ; then
   8 +       NCURSES_INC=$PHP_NCURSES/include
   9 +     elif test -r $PHP_NCURSES/include/ncurses/curses.h ; then
  10 +       NCURSES_INC=$PHP_NCURSES/include/ncurses
  11 +     else
  12 +       NCURSES_INC=$PHP_NCURSES/include
  13 +     fi
  14     else # search default path list
  15       AC_MSG_CHECKING(for ncurses files in default path)
  16       for i in $SEARCH_PATH ; do
  17         if test -r $i/$SEARCH_FOR; then
  18           NCURSES_DIR=$i
  19 +         NCURSES_INC=$i/include
  20           AC_MSG_RESULT(found in $i)
  21         fi
  22 +       if test -r $i/include/ncurses/curses.h; then
  23 +         NCURSES_DIR=$i
  24 +         NCURSES_INC=$i/include/ncurses
  25 +         AC_MSG_RESULT(found in $i, headers in $i/include/ncurses)
  26 +       fi
  27       done
  28     fi
  29
  30 @@ -29,7 +42,7 @@
  31     fi
  32
  33     # --with-ncurses -> add include path
  34 -   PHP_ADD_INCLUDE($NCURSES_DIR/include)
  35 +   PHP_ADD_INCLUDE($NCURSES_INC)
  36
  37     # --with-ncurses -> chech for lib and symbol presence
  38     LIBNAME=ncurses
  39 --- php-4.3.3RC3/ext/readline/config.m4.orig    2003-02-11 04:24:56.000000000 +0100
  40 +++ php-4.3.3RC3/ext/readline/config.m4 2003-08-16 15:20:16.758894744 +0200
  41 @@ -21,6 +21,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 @@ -30,6 +34,7 @@
  53        PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
  54      ])
  55    ])
  56 +  ])
  57
  58    PHP_CHECK_LIBRARY(readline, readline,
  59    [
  60 @@ -68,6 +73,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 @@ -77,6 +86,7 @@
  72        PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
  73      ])
  74    ])
  75 +  ])
  76
  77    PHP_CHECK_LIBRARY(edit, readline,
  78    [