diff --git a/configure.in b/configure.in
index 23c54b754..910de2797 100644
--- a/configure.in
+++ b/configure.in
@@ -351,6 +351,7 @@ fi
 AM_CONDITIONAL(have_err_h, test "$ac_cv_header_err_h" = yes)
 AM_CONDITIONAL(have_fnmatch_h, test "$ac_cv_header_fnmatch_h" = yes)
 
+AC_KRB_IPV6
 
 dnl Checks for libraries.
 
@@ -725,8 +726,6 @@ AC_CHECK_VAR(
 [#include <time.h>],
 timezone)
 
-AC_KRB_IPV6
-
 AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>])
 
 AC_HAVE_TYPE([socklen_t],[#include <sys/socket.h>])
@@ -779,10 +778,7 @@ fi
 
 dnl readline
 
-save_LIBS="$LIBS"
-LIBS="$LIB_tgetent $LIBS"
-AC_FIND_FUNC_NO_LIBS(readline, edit readline)
-LIBS="$save_LIBS"
+AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
 ac_foo=no
 if test "$with_readline" = yes; then
 	: