diff --git a/configure.in b/configure.in
index 793638359..a02248785 100644
--- a/configure.in
+++ b/configure.in
@@ -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)
 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 &&
 	  AC_MSG_ERROR(
 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).
 )
 	if test $rl_found = yes; then
-		AC_CHECK_FUNC([rl_completion_matches],
-		  AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], 1,
-		  [Define to 1 if rl_completion_matches() is available.]))
+		AC_CHECK_FUNCS([rl_completion_matches])
 		AC_DEFINE([READLINE_SUPPORT], 1,
 		  [Define to 1 to include the LVM readline shell.])
 	fi