*** configure.in	Fri Sep 11 10:22:12 1998
--- configure.in.new	Fri Sep 11 10:16:36 1998
***************
*** 251,263 ****
  dnl
  if test "$with_readline" = yes; then
      use_readline=no
!     AC_CHECK_LIB(readline,readline,LIBS="-lreadline -ltermcap $LIBS",,-ltermcap)
!     if test "$ac_cv_lib_readline_readline" = yes; then
! 	use_readline=yes
!     else
!         AC_CHECK_LIB(editline,readline,)
!         use_readline="$ac_cv_lib_editline_readline"
      fi
      if test "$use_readline" = yes; then
  	AC_DEFINE(USE_READLINE)
      else
--- 251,272 ----
  dnl
  if test "$with_readline" = yes; then
      use_readline=no
!     TERMCAP=no
!     AC_CHECK_LIB(ncurses,main,TERMCAP="-lncurses",,)
!     if test "$ac_cv_lib_ncurses" = no; then
!         AC_CHECK_LIB(termcap,main,TERMCAP="-ltermcap",,)
      fi
+     if test "$TERMCAP" != no; then
+         AC_CHECK_LIB(readline,readline,LIBS="-lreadline $TERMCAP $LIBS",,$TERMCAP)
+         if test "$ac_cv_lib_readline_readline" = yes; then
+ 	    use_readline=yes
+ 	fi
+     fi
+     if test "$use_readline" = no; then
+ 	    AC_CHECK_LIB(editline,readline,)
+             use_readline="$ac_cv_lib_editline_readline"
+     fi
+     
      if test "$use_readline" = yes; then
  	AC_DEFINE(USE_READLINE)
      else