diff --git a/configure b/configure
index 64f61a83ff..14771f7e83 100755
--- a/configure
+++ b/configure
@@ -17527,10 +17527,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
@@ -17554,6 +17550,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 6975e3a43d..18d985f989 100644
--- a/configure.in
+++ b/configure.in
@@ -2625,10 +2625,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)
@@ -2641,6 +2637,10 @@ yes|auto)
 				break
 			fi
 		done
+		if test "$ac_cv_func_readline" = "yes"
+		then
+			break
+		fi
 	done
 	LIBS="$saved_LIBS"
 	;;