shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

configure: improve reporting about readline

Browse Source 
Report real 'readline' supporting state instead of 'maybe'.
Really check for 'readline' headers.
This commit is contained in:
Zdenek Kabelac 2017-06-09 22:40:27 +02:00
parent 358eee15f3
commit 5ef20d2168
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -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. # Check whether --enable-readline was given.
if test "${enable_readline+set}" = set; then : if test "${enable_readline+set}" = set; then :
enableval=$enable_readline; READLINE=$enableval enableval=$enable_readline; READLINE=$enableval
@ -9632,8 +9630,6 @@ else
READLINE=maybe READLINE=maybe
fi 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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable realtime support" >&5
@ -14444,6 +14440,7 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
$as_echo "#define READLINE_SUPPORT 1" >>confdefs.h $as_echo "#define READLINE_SUPPORT 1" >>confdefs.h
READLINE=yes
LIBS=$lvm_saved_libs LIBS=$lvm_saved_libs
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_line_buffer in -lreadline" >&5 { $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; } $as_echo_n "checking for rl_line_buffer in -lreadline... " >&6; }
@ -14764,6 +14761,10 @@ fi
done done
fi 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 if test "$BUILD_CMIRRORD" = yes; then
for ac_func in atexit for ac_func in atexit

5
configure.in
View File

@ -674,11 +674,9 @@ AC_DEFINE_UNQUOTED([CACHE_RESTORE_CMD], ["$CACHE_RESTORE_CMD"],
################################################################################ ################################################################################
dnl -- Disable readline dnl -- Disable readline
AC_MSG_CHECKING(whether to enable readline)
AC_ARG_ENABLE([readline], AC_ARG_ENABLE([readline],
AC_HELP_STRING([--disable-readline], [disable readline support]), AC_HELP_STRING([--disable-readline], [disable readline support]),
READLINE=$enableval, READLINE=maybe) READLINE=$enableval, READLINE=maybe)
AC_MSG_RESULT($READLINE)
################################################################################ ################################################################################
dnl -- Disable realtime clock support 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, AC_DEFINE([READLINE_SUPPORT], 1,
[Define to 1 to include the LVM readline shell.]) [Define to 1 to include the LVM readline shell.])
dnl -- Try only with -lreadline and check for different symbol dnl -- Try only with -lreadline and check for different symbol
READLINE=yes
LIBS=$lvm_saved_libs LIBS=$lvm_saved_libs
AC_CHECK_LIB([readline], [rl_line_buffer], AC_CHECK_LIB([readline], [rl_line_buffer],
[ READLINE_LIBS="-lreadline" ], [ [ READLINE_LIBS="-lreadline" ], [
@ -1827,6 +1826,8 @@ dnl -- Ensure additional headers required
if test "$READLINE" = yes; then if test "$READLINE" = yes; then
AC_CHECK_HEADERS(readline/readline.h readline/history.h,,hard_bailout) AC_CHECK_HEADERS(readline/readline.h readline/history.h,,hard_bailout)
fi fi
AC_MSG_CHECKING(whether to enable readline)
AC_MSG_RESULT($READLINE)
if test "$BUILD_CMIRRORD" = yes; then if test "$BUILD_CMIRRORD" = yes; then
AC_CHECK_FUNCS(atexit,,hard_bailout) AC_CHECK_FUNCS(atexit,,hard_bailout)