*** configure.in	Sat Jan 26 21:49:53 2002
--- configure.tim	Sat Jan 26 22:06:26 2002
***************
*** 218,233 ****
  if test x$termcap_library = xtermcap; then
  	AC_DEFINE(USE_TERMCAP)
  fi
  if test x$termcap_library = xncurses; then
  	AC_CHECK_HEADER(curses.h,
! 	 	AC_CHECK_HEADER(term.h,, AC_MSG_ERROR([*** curses headers not installed ***])),
!     	  		AC_CHECK_HEADER(ncurses/curses.h, [ 
             			AC_CHECK_HEADER(ncurses/term.h,, AC_MSG_ERROR([*** curses headers not installed ***]))
               			CXXFLAGS="-DHAVE_NCURSES_CURSES_H $CXXFLAGS"
        	     			],
!       	   			AC_MSG_ERROR([*** curses headers not installed ***]))
          )
  	AC_DEFINE(USE_NCURSES)
  fi
  
  dnl ------------------------------------------------------------------
--- 218,233 ----
  if test x$termcap_library = xtermcap; then
  	AC_DEFINE(USE_TERMCAP)
  fi
  if test x$termcap_library = xncurses; then
  	AC_CHECK_HEADER(curses.h,
! 	 	[AC_CHECK_HEADER(term.h,, [AC_MSG_ERROR([*** curses headers not installed ***])])],
!     	  		[AC_CHECK_HEADER(ncurses/curses.h, [ 
             			AC_CHECK_HEADER(ncurses/term.h,, AC_MSG_ERROR([*** curses headers not installed ***]))
               			CXXFLAGS="-DHAVE_NCURSES_CURSES_H $CXXFLAGS"
        	     			],
!       	   			AC_MSG_ERROR([*** curses headers not installed ***]))]
          )
  	AC_DEFINE(USE_NCURSES)
  fi
  
  dnl ------------------------------------------------------------------
***************
*** 426,442 ****
  dnl and for readline and history libraries
  dnl
  AM_CONDITIONAL(SYSTEM_READLINE, test x$enable_sysreadline = xyes)
  if test x$enable_sysreadline = xyes; then
    AC_CHECK_HEADER(readline.h, readline_includes=/usr/include, 
!     AC_CHECK_HEADER(readline/readline.h,
        readline_includes=/usr/include/readline,
!       AC_MSG_ERROR([*** readline headers not installed ***]))
    )
    AC_CHECK_HEADER(history.h,,
!     AC_CHECK_HEADER(readline/history.h,,
!       AC_MSG_ERROR([*** readline history headers not installed ***]))
    )
    AC_CHECK_LIB(readline, main,, AC_MSG_ERROR([*** readline support not installed ***]))
    AC_CHECK_LIB(history, main,, AC_MSG_ERROR([*** readline history support not installed ***]))
    AC_SUBST(readline_includes)
  else
--- 426,442 ----
  dnl and for readline and history libraries
  dnl
  AM_CONDITIONAL(SYSTEM_READLINE, test x$enable_sysreadline = xyes)
  if test x$enable_sysreadline = xyes; then
    AC_CHECK_HEADER(readline.h, readline_includes=/usr/include, 
!     [AC_CHECK_HEADER(readline/readline.h,
        readline_includes=/usr/include/readline,
!       [AC_MSG_ERROR([*** readline headers not installed ***])])]
    )
    AC_CHECK_HEADER(history.h,,
!     [AC_CHECK_HEADER(readline/history.h,,
!       AC_MSG_ERROR([*** readline history headers not installed ***]))]
    )
    AC_CHECK_LIB(readline, main,, AC_MSG_ERROR([*** readline support not installed ***]))
    AC_CHECK_LIB(history, main,, AC_MSG_ERROR([*** readline history support not installed ***]))
    AC_SUBST(readline_includes)
  else