--- configure.orig	2002-07-15 22:51:08 UTC
+++ configure
@@ -1836,14 +1836,14 @@ fi
 SIMPLELIBS=${LIBS}
 LIBS=
 
-echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:1841: checking for dlsym in -ldl" >&5
+echo $ac_n "checking for dlsym in -lc""... $ac_c" 1>&6
+echo "configure:1841: checking for dlsym in -lc" >&5
 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
+LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1849 "configure"
 #include "confdefs.h"
@@ -1877,7 +1877,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-ldl $LIBS"
+  LIBS="-lc $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
@@ -2151,6 +2151,7 @@ do
 #line 2152 "configure"
 #include "confdefs.h"
 
+      #include <sys/types.h>
       #include <sys/socket.h>
       int connect($testproto);
     
@@ -2227,14 +2228,16 @@ EOF
 
 echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6
 echo "configure:2230: checking for correct poll prototype" >&5
-PROTO=
-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 
+PROTO1="struct pollfd fds[], nfds_t nfds, int timeout"
+PROTO2="struct pollfd *fds, unsigned int nfds, int timeout"
+for PROTO in "$PROTO1" "$PROTO2"
 do
   if test "${PROTO}" = ""; then
     cat > conftest.$ac_ext <<EOF
 #line 2236 "configure"
 #include "confdefs.h"
 
+      #include <sys/types.h>
       #include <sys/poll.h>
       int poll($testproto);