diff --git a/configure b/configure
index c8466ffd82..6779cc31a0 100755
--- a/configure
+++ b/configure
@@ -18617,10 +18617,6 @@ done
 			READLINE_LIB="$readline"
 			break
 		fi
-		if test "X$readline" = "X"
-		then
-			continue
-		fi
 		for lib in -lterminfo -ltermcap -lncurses -lcurses
 		do
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline with $readline $lib" >&5
@@ -18644,6 +18640,10 @@ done
 				break
 			fi
 		done
+		if test "$ac_cv_func_readline" = "yes"
+		then
+			break
+		fi
 	done
 	LIBS="$saved_LIBS"
 	;;
diff --git a/configure.in b/configure.in
index f457f79738..b79aab0a2a 100644
--- a/configure.in
+++ b/configure.in
@@ -3244,10 +3244,6 @@ yes|auto)
 			READLINE_LIB="$readline"
 			break
 		fi
-		if test "X$readline" = "X"
-		then
-			continue
-		fi
 		for lib in -lterminfo -ltermcap -lncurses -lcurses
 		do
 			AC_MSG_NOTICE(checking for readline with $readline $lib)
@@ -3260,6 +3256,10 @@ yes|auto)
 				break
 			fi
 		done
+		if test "$ac_cv_func_readline" = "yes"
+		then
+			break
+		fi
 	done
 	LIBS="$saved_LIBS"
 	;;