--- IO-AIO/Makefile.PL	2008/05/11 00:01:03	1.16
+++ IO-AIO/Makefile.PL	2010/11/01 22:03:43	1.22
@@ -1,4 +1,4 @@
-use v5.8.8;
+use 5.008002;
 
 use ExtUtils::MakeMaker;
 
@@ -17,19 +17,16 @@
 } else {
 
    $INC  = "";
-   $LIBS = ['-lpthread -lrt', '-lpthread', '-lpthreads', '-lpthreadVC2', ''];
+   $LIBS = ['-lpthread', '-lpthreads', '-lpthreadVC2', ''];
 
-   if ($^O =~ /freebsd/i) {
+   if ($^O =~ /bsd/i) {
       print <<EOF;
 
-This package seems to deadlock or otherwise misbehave under FreeBSD. As
-documentation on FreeBSD threading is sorely lacking and confusing, I'll
-just call FreeBSD broken with regards to threading.
-
-If you find out whats wrong, please tell me.
-
-Some people had luck with using OPTIMIZE=-O instead of -O2, so you might
-want to try that.
+If you have problems with deadlocks or crashes on your system,
+make sure your perl has been linked with -lpthread (you might try
+LD_PRELOAD=/path/to/libpthread.so as a workaround). Also, pthread support
+under many BSDs is not the best - before reporting a bug in this module,
+make sure it's not an OS bug.
 
 EOF
    }
@@ -47,7 +44,6 @@
       $ENV{CPPFLAGS} = $Config{cppflags};
       $ENV{CFLAGS}   = $Config{ccflags};
       $ENV{LDFLAGS}  = $Config{ldflags};
-      $ENV{LIBS}     = $Config{libs};
       $ENV{LINKER}   = $Config{ld}; # nonstandard
 
       system $ENV{SHELL}, -c => "./configure --prefix \Q$Config{prefixexp}\E"
@@ -88,9 +84,13 @@
     VERSION_FROM => "AIO.pm",
     INC          => $INC,
     LIBS         => $LIBS,
+    EXE_FILES    => ["bin/treescan"],
     PM           => {
     		    'AIO.pm'		=> '$(INST_LIBDIR)/AIO.pm',
                     },
+    PREREQ_PM => {
+       "common::sense" => 0,
+    },
     clean        => { FILES => "libeio/config.h libeio/config.log libeio/config.status" },
 });