mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-30 17:18:21 +03:00
Avoid compiler warnings (provoked by new configure.in bug) on RHEL5.
Do not override the default action of AC_CHECK_LIB([readline],... (i.e., leave the ACTION-IF-FOUND parameter blank) so that the subsequent check for rl_completion_matches can use -lreadline. Also, replace AC_CHECK_FUNC+AC_DEFINE with an equivalent AC_CHECK_FUNCS call.
This commit is contained in:
parent
1a02e2e43b
commit
0ad6b7e212
@ -516,7 +516,8 @@ AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getop
|
|||||||
################################################################################
|
################################################################################
|
||||||
dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
|
dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
|
||||||
if test x$READLINE != xno; then
|
if test x$READLINE != xno; then
|
||||||
AC_CHECK_LIB([readline], [readline], [rl_found=yes], [rl_found=no])
|
rl_found=yes
|
||||||
|
AC_CHECK_LIB([readline], [readline], , [rl_found=no])
|
||||||
test x$READLINE:$rl_found = xyes:no &&
|
test x$READLINE:$rl_found = xyes:no &&
|
||||||
AC_MSG_ERROR(
|
AC_MSG_ERROR(
|
||||||
GNU Readline could not be found which is required for the
|
GNU Readline could not be found which is required for the
|
||||||
@ -527,9 +528,7 @@ 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).
|
package as well (which may be called readline-devel or something similar).
|
||||||
)
|
)
|
||||||
if test $rl_found = yes; then
|
if test $rl_found = yes; then
|
||||||
AC_CHECK_FUNC([rl_completion_matches],
|
AC_CHECK_FUNCS([rl_completion_matches])
|
||||||
AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], 1,
|
|
||||||
[Define to 1 if rl_completion_matches() is available.]))
|
|
||||||
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.])
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user