configure: improve reporting about readline

Report real 'readline' supporting state instead of 'maybe'.
Really check for 'readline' headers.

diff --git a/configure b/configure
index 9d0d97c503361913524a0d2647f8e0574109c06f..2a591aaf8e8fd414d75d87270aa1e18f52911291 100755 (executable)
--- a/configure
+++ b/configure
@@ -9623,8 +9623,6 @@ _ACEOF
 
 
 ################################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable readline" >&5
-$as_echo_n "checking whether to enable readline... " >&6; }
 # Check whether --enable-readline was given.
 if test "${enable_readline+set}" = set; then :
   enableval=$enable_readline; READLINE=$enableval
@@ -9632,8 +9630,6 @@ else
   READLINE=maybe
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
-$as_echo "$READLINE" >&6; }
 
 ################################################################################
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable realtime support" >&5
@@ -14444,7 +14440,8 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
 
 $as_echo "#define READLINE_SUPPORT 1" >>confdefs.h
 
-                               LIBS=$lvm_saved_libs
+                               READLINE=yes
+               LIBS=$lvm_saved_libs
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_line_buffer in -lreadline" >&5
 $as_echo_n "checking for rl_line_buffer in -lreadline... " >&6; }
 if ${ac_cv_lib_readline_rl_line_buffer+:} false; then :
@@ -14764,6 +14761,10 @@ fi
 done
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable readline" >&5
+$as_echo_n "checking whether to enable readline... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
+$as_echo "$READLINE" >&6; }
 
 if test "$BUILD_CMIRRORD" = yes; then
        for ac_func in atexit

diff --git a/configure.in b/configure.in
index 0ca6b43bd2b96ee7ae9a115bdb08f43e2989aac5..ae5baa5d5d08b20325bb5cb2c5a0696288614fa0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -674,11 +674,9 @@ AC_DEFINE_UNQUOTED([CACHE_RESTORE_CMD], ["$CACHE_RESTORE_CMD"],
 
 ################################################################################
 dnl -- Disable readline
-AC_MSG_CHECKING(whether to enable readline)
 AC_ARG_ENABLE([readline],
              AC_HELP_STRING([--disable-readline], [disable readline support]),
              READLINE=$enableval, READLINE=maybe)
-AC_MSG_RESULT($READLINE)
 
 ################################################################################
 dnl -- Disable realtime clock support
@@ -1721,6 +1719,7 @@ Note: (n)curses also seems to work as a substitute for termcap.  This was
                AC_DEFINE([READLINE_SUPPORT], 1,
                        [Define to 1 to include the LVM readline shell.])
                dnl -- Try only with -lreadline and check for different symbol
+               READLINE=yes
                LIBS=$lvm_saved_libs
                AC_CHECK_LIB([readline], [rl_line_buffer],
                        [ READLINE_LIBS="-lreadline" ], [
@@ -1827,6 +1826,8 @@ dnl -- Ensure additional headers required
 if test "$READLINE" = yes; then
        AC_CHECK_HEADERS(readline/readline.h readline/history.h,,hard_bailout)
 fi
+AC_MSG_CHECKING(whether to enable readline)
+AC_MSG_RESULT($READLINE)
 
 if test "$BUILD_CMIRRORD" = yes; then
        AC_CHECK_FUNCS(atexit,,hard_bailout)