diff --git a/configure b/configure
index 194698cf8a..1d6e46fd65 100755
--- a/configure
+++ b/configure
@@ -14509,6 +14509,11 @@ done
 
 fi
 
+# Some versions of libedit contain strlcpy(); so disregard that library while
+# checking for these standard libc functions.
+pgac_save_LIBS="$LIBS"
+LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
+
 
 
 
@@ -14635,6 +14640,8 @@ done
 
 
 
+LIBS="$pgac_save_LIBS"
+
 # System's version of getaddrinfo(), if any, may be used only if we found
 # a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
 # (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available
diff --git a/configure.in b/configure.in
index 848e19c0a3..c4e4304ee6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.488 2006/11/25 03:34:10 pgsql Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.489 2006/11/29 20:12:31 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -966,8 +966,15 @@ else
   AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
 fi
 
+# Some versions of libedit contain strlcpy(); so disregard that library while
+# checking for these standard libc functions.
+pgac_save_LIBS="$LIBS"
+LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
+
 AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcpy strtol strtoul unsetenv])
 
+LIBS="$pgac_save_LIBS"
+
 # System's version of getaddrinfo(), if any, may be used only if we found
 # a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
 # (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available