From 62df3e6ea8f115ae9f011318e223c3f2d1e549a7 Mon Sep 17 00:00:00 2001 From: Jim Mankovich Date: Wed, 2 May 2012 13:45:37 +0000 Subject: [PATCH] Commit handles two things 1] fail when no curses or readline is found, yet ipmishell is about to be compiled in. ipmishell depends on these two libraries; 2] add 'ipmishell' line to the % ./configure ; summary output to tell user whether ipmishell support is enabled or disabled. Committed for Duncan Idaho --- ipmitool/configure.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ipmitool/configure.in b/ipmitool/configure.in index 01e7dfb..680619c 100644 --- a/ipmitool/configure.in +++ b/ipmitool/configure.in @@ -469,9 +469,13 @@ if test "x$enable_ipmishell" = "xyes"; then AC_SEARCH_LIBS([tgetent], [tinfo ncurses curses readline termcap]) AC_SEARCH_LIBS([initscr], [ncurses curses], [have_curses=yes]) AC_SEARCH_LIBS([readline], [readline edit], [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.]) + if test "x$have_curses" != "xyes"; then + AC_MSG_ERROR([** Unable to find curses required by ipmishell.]) fi + if test "x$have_readline" != "xyes"; then + AC_MSG_ERROR([** Unable to find readline required by ipmishell.]) + fi + AC_DEFINE(HAVE_READLINE, [1], [Define to 1 if readline present.]) fi dnl Enable -Wall -Werror @@ -553,6 +557,7 @@ AC_MSG_RESULT([ bmc : $enable_intf_bmc]) AC_MSG_RESULT([ lipmi : $enable_intf_lipmi]) AC_MSG_RESULT([]) AC_MSG_RESULT([Extra tools]) -AC_MSG_RESULT([ ipmievd : yes]) +AC_MSG_RESULT([ ipmievd : yes]) +AC_MSG_RESULT([ ipmishell : $enable_ipmishell]) AC_MSG_RESULT([])