--- configure.orig	Thu Apr 11 00:50:20 2002
+++ configure	Sun Dec 17 13:14:47 2006
@@ -2113,7 +2113,7 @@
   fi
 fi
 
-opt_readline="no"
+opt_readline="unset"
 
 if test "$opt_readline" = "unset"; then
 	if test -f "$withval/include/readline/readline.h"; then
@@ -3118,7 +3118,7 @@
 
 fi
 
-for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h history.h Python.h
+for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h readline/history.h Python.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -3473,7 +3473,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   echo "$ac_t""nah" 1>&6
-	HAVE_SOCKLEN_T=no
+	HAVE_SOCKLEN_T=yes
 fi
 rm -f conftest*