From 848646514cb760044dcb4e49f96ab8bfbb96b43e Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Thu, 11 Nov 2004 19:07:45 +0000 Subject: [PATCH] check for both curses and ncurses --- ipmitool/configure.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ipmitool/configure.in b/ipmitool/configure.in index 11f5533..99bdfae 100644 --- a/ipmitool/configure.in +++ b/ipmitool/configure.in @@ -211,17 +211,16 @@ fi AC_SUBST(IPMITOOL_INTF_LIB) dnl check for readline library to enable ipmi shell -have_readline=no -AC_SEARCH_LIBS([readline], [readline], [have_readline=yes], - [AC_CHECK_LIB([readline], [readline], - [have_readline=yes], [], [-lcurses])]) AC_ARG_ENABLE([ipmishell], [AC_HELP_STRING([--enable-ipmishell], [enable IPMI shell interface [default=yes]])], [], [enable_ipmishell=yes]) -if test "x$enable_ipmishell" = "xyes" && test "x$have_readline" = "xyes"; then - AC_DEFINE(HAVE_READLINE, [1], [Define to 1 if readline present.]) - LIBS="$LIBS -lcurses -lreadline" +if test "x$enable_ipmishell" = "xyes"; then + AC_SEARCH_LIBS([initscr], [curses ncurses], [have_curses=yes]) + AC_SEARCH_LIBS([readline], [readline], [have_readline=yes]) + if test "x$have_curses" = "xyes" && test "x$have_readline" = "xyes"; then + AC_DEFINE(HAVE_READLINE, [1], [Define to 1 if readline present.]) + fi fi dnl enable IPMI Event Daemon