--- configure.in
+++ configure.in
@@ -477,8 +477,8 @@
 
 if test $opt_readline = yes; then
 	AC_DEFINE(READLINE)
-	READLINE_LIB=-lreadline
 	if test "$opt_with_installed_readline" != "no" ; then
+		READLINE_LIB=-lreadline
 		case "$opt_with_installed_readline" in
 		yes)	RL_INCLUDE= ;;
 		*)	case "$RL_INCLUDEDIR" in
@@ -490,6 +490,7 @@
 		READLINE_DEP=
 	else
 		RL_LIBDIR='$(dot)/$(LIBSUBDIR)/readline'
+		READLINE_LIB='$(RL_LIBDIR)/libreadline.a'
 		READLINE_DEP='$(READLINE_LIBRARY)'
 	fi
 else
@@ -503,8 +504,8 @@
 	if test $opt_bang_history = yes; then
 		AC_DEFINE(BANG_HISTORY)
 	fi
-	HISTORY_LIB=-lhistory
  	if test "$opt_with_installed_readline" != "no"; then
+		HISTORY_LIB=-lhistory
 		HIST_LIBDIR=$RL_LIBDIR
 		HISTORY_DEP=
 		case "$opt_with_installed_readline" in
@@ -517,6 +518,7 @@
 		esac
 	else
 		HIST_LIBDIR='$(dot)/$(LIBSUBDIR)/readline'
+		HISTORY_LIB='$(HIST_LIBDIR)/libhistory.a'
 		HISTORY_DEP='$(HISTORY_LIBRARY)'
 	fi
 else