summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Amelkin <alexander@amelkin.msk.ru>2019-11-29 13:39:55 +0300
committerAlexander Amelkin <mocbuhtig@amelkin.msk.ru>2019-12-05 13:45:57 +0300
commite60eac12cc7684e9a7592bb9aa49ef27f5b18348 (patch)
tree76d005153551242033ac7b6238c5828013d7bb64
parentdec04e79fd51fbfa3a167311a04471cca6e8bba9 (diff)
downloadipmitool-e60eac12cc7684e9a7592bb9aa49ef27f5b18348.tar.gz
configure: remove some duplicate code
Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
-rw-r--r--configure.ac14
1 files changed, 4 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 9448a44..6cd5e80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -616,30 +616,24 @@ fi
AC_SUBST(IPMITOOL_INTF_LIB)
-if test "x$xenable_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
- xenable_ipmishell=no
- fi
-fi
-
-dnl check for readline library to enable ipmi shell
AC_ARG_ENABLE([ipmishell],
[AC_HELP_STRING([--enable-ipmishell],
[enable IPMI shell interface [default=auto]])],
[xenable_ipmishell=$enableval],
[])
+
+dnl check for readline library to enable ipmi shell
if test "x$xenable_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"; then
AC_MSG_ERROR([** Unable to find curses required by ipmishell.])
+ xenable_ipmishell=no
fi
if test "x$have_readline" != "xyes"; then
AC_MSG_ERROR([** Unable to find readline required by ipmishell.])
+ xenable_ipmishell=no
fi
AC_DEFINE(HAVE_READLINE, [1], [Define to 1 if readline present.])
fi