[Dotgnu-pnet-commits] pnet ChangeLog, 1.2753, 1.2754 configure.in, 1.150, 1.151

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet
In directory subversions:/tmp/cvs-serv12306

Modified Files:
        ChangeLog configure.in 
Log Message:


Implement terminfo-based console routines for systems that lack
termcap, or a termcap that interfaces to terminfo.


Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/configure.in,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** configure.in        8 Nov 2003 21:43:14 -0000       1.150
--- configure.in        10 Nov 2003 04:14:47 -0000      1.151
***************
*** 213,230 ****
  AC_CHECK_LIB(z, inflate)
  
- dnl Collect up the libraries that we need for termcap access.
- AC_SUBST(TERMCAPLIBS)
- TERMCAPLIBS=""
- has_tgoto=no
- AC_CHECK_LIB(termcap, tgoto, [TERMCAPLIBS="-ltermcap"
- has_tgoto=yes],
- [AC_CHECK_LIB(curses, tgoto, [TERMCAPLIBS="-lcurses"
- has_tgoto=yes],
- [AC_CHECK_LIB(ncurses, tgoto, [TERMCAPLIBS="-lncurses"
- has_tgoto=yes], [])])])
- if test "x$has_tgoto" = "xyes" ; then
-       AC_DEFINE(HAVE_TGOTO, 1, [Define if you have the tgoto function.])
- fi
- 
  dnl Checks for header files.
  AC_HEADER_STDC
--- 213,216 ----
***************
*** 233,238 ****
  AC_CHECK_HEADERS(string.h strings.h memory.h stdlib.h math.h fcntl.h)
  AC_CHECK_HEADERS(stdarg.h varargs.h sys/mman.h unistd.h sys/stat.h)
! AC_CHECK_HEADERS(sys/time.h sys/types.h dlfcn.h ieeefp.h)
! AC_CHECK_HEADERS(readline/readline.h readline/history.h wchar.h)
  AC_CHECK_HEADERS(sys/socket.h netinet/in.h langinfo.h locale.h sys/ioctl.h)
  AC_CHECK_HEADERS(sys/select.h netdb.h sys/cygwin.h dirent.h sys/utime.h 
utime.h)
--- 219,223 ----
  AC_CHECK_HEADERS(string.h strings.h memory.h stdlib.h math.h fcntl.h)
  AC_CHECK_HEADERS(stdarg.h varargs.h sys/mman.h unistd.h sys/stat.h)
! AC_CHECK_HEADERS(sys/time.h sys/types.h dlfcn.h ieeefp.h wchar.h)
  AC_CHECK_HEADERS(sys/socket.h netinet/in.h langinfo.h locale.h sys/ioctl.h)
  AC_CHECK_HEADERS(sys/select.h netdb.h sys/cygwin.h dirent.h sys/utime.h 
utime.h)
***************
*** 245,254 ****
  #include <linux/types.h>
  #endif]])
! AC_CHECK_HEADERS(sys/utsname.h zlib.h termcap.h)
! AC_CHECK_HEADERS(termios.h sys/termios.h curses.h)
  AC_CHECK_HEADERS([term.h], [], [],
  [[#ifdef HAVE_CURSES_H
  #include <curses.h>
  #endif]])
  
  dnl Check for "sin6_scope_id".
--- 230,264 ----
  #include <linux/types.h>
  #endif]])
! AC_CHECK_HEADERS(sys/utsname.h zlib.h termios.h sys/termios.h)
! AC_CHECK_HEADERS(termcap.h curses.h)
  AC_CHECK_HEADERS([term.h], [], [],
  [[#ifdef HAVE_CURSES_H
  #include <curses.h>
  #endif]])
+ 
+ dnl Collect up the libraries that we need for termcap access.
+ AC_SUBST(TERMCAPLIBS)
+ TERMCAPLIBS=""
+ TERMINFOLIBS=""
+ maybe_termcap=no
+ maybe_terminfo=no
+ AC_CHECK_LIB(termcap, tgetflag, [TERMCAPLIBS="-ltermcap"
+ maybe_termcap=yes])
+ AC_CHECK_LIB(curses, tigetflag, [TERMINFOLIBS="-lcurses"
+ maybe_terminfo=yes],
+ [AC_CHECK_LIB(ncurses, tigetflag, [TERMINFOLIBS="-lncurses"
+ maybe_terminfo=yes])])
+ if test "x$maybe_termcap" = "xyes" ; then
+       if test "x$ac_cv_header_termcap_h" = "xyes" ; then
+               maybe_terminfo=no
+               AC_DEFINE(IL_USE_TERMCAP, 1, [Define to use the termcap 
library.])
+       else
+               TERMCAPLIBS=""
+       fi
+ fi
+ if test "x$maybe_terminfo" = "xyes" ; then
+       TERMCAPLIBS="$TERMINFOLIBS"
+       AC_DEFINE(IL_USE_TERMINFO, 1, [Define to use the terminfo library.])
+ fi
  
  dnl Check for "sin6_scope_id".

Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.2753
retrieving revision 1.2754
diff -C2 -d -r1.2753 -r1.2754
*** ChangeLog   9 Nov 2003 22:20:55 -0000       1.2753
--- ChangeLog   10 Nov 2003 04:14:47 -0000      1.2754
***************
*** 9,12 ****
--- 9,16 ----
        output mode of "ilsize".
  
+       * configure.in, support/console.c: implement terminfo-based
+       console routines for systems that lack termcap, or a termcap
+       that interfaces to terminfo.
+ 
  2003-11-09  Rhys Weatherley  <address@hidden>