From 2c189a57f443e513881ebbbfcbb822b6fde30a9c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 23 Jun 2008 09:23:48 +0000 Subject: [PATCH] avoid link failure when configuring without --enable-readline * configure.in: Define READLINE_SUPPORT not when processing --enable-readline or --disable-readline, but rather only after determining that readline support is desired and the readline library is available/usable. --- WHATS_NEW | 1 + configure.in | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index c43186b80..763975535 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.39 - ================================ + Avoid link failure when configuring without --enable-readline. Make clvmd return immediately if other nodes are down in an openais cluster. Make clvmd return immediately if other nodes are down in a gulm cluster. Improve/Fix read ahead 'auto' calculation for stripe_size diff --git a/configure.in b/configure.in index e2205228e..73c4ee4a8 100644 --- a/configure.in +++ b/configure.in @@ -270,14 +270,11 @@ fi ################################################################################ dnl -- Enable readline AC_MSG_CHECKING(whether to enable readline) -AC_ARG_ENABLE(readline, [ --enable-readline Enable readline support], -READLINE=$enableval, READLINE=no) +AC_ARG_ENABLE([readline], + [ --enable-readline Enable readline support], + [READLINE=$enableval], [READLINE=no]) AC_MSG_RESULT($READLINE) -if test x$READLINE = xyes; then - AC_DEFINE([READLINE_SUPPORT], 1, [Define to 1 to include the LVM readline shell.]) -fi - ################################################################################ dnl -- Disable realtime clock support AC_MSG_CHECKING(whether to enable realtime support) @@ -501,7 +498,11 @@ Note: if you are using precompiled packages you will also need the development package as well (which may be called readline-devel or something similar). ) ) - AC_CHECK_FUNC(rl_completion_matches, AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], 1, [Define to 1 if rl_completion_matches() is available.])) + AC_CHECK_FUNC([rl_completion_matches], + AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], 1, + [Define to 1 if rl_completion_matches() is available.])) + AC_DEFINE([READLINE_SUPPORT], 1, + [Define to 1 to include the LVM readline shell.]) fi ################################################################################