--- IO-AIO/Makefile.PL	2007/07/08 13:43:29	1.14
+++ IO-AIO/Makefile.PL	2011/07/14 22:36:17	1.23
@@ -1,9 +1,9 @@
+use 5.008002;
+
 use ExtUtils::MakeMaker;
 
 use Config;
 
-require "autoconf.pm";
-
 if ($^O =~ /win32/i or $^O =~ /mswin/) {
 
    # configuration on windows is hardcoded - as always
@@ -14,28 +14,46 @@
    $INC  = "-I/Perl/lib/CORE -I/sdk/include -I/vc98/include -I/gtk/include -I/gtk/include/pango-1.0 -I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include/ -I/gtk/include/freetype2";
    $LIBS = ["-L/gtk/lib -lpthreadVC2"];
 
+   open my $fh, ">libeio/config.h"
+      or die "libeio/config.h: $!";
+   print $fh <<EOF;
+EOF
+
 } 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
    }
 
-   autoconf::run_script()
-      and die "\nconfigure failed, check it's output above and autoconf/config.log\n\n";
+   {
+      local %ENV = %ENV;
+
+      while (my ($k, $v) = each %Config) {
+         $ENV{$k} = $v;
+      }
+
+      $ENV{MAKE}     = $Config{make};
+      $ENV{SHELL}    = $Config{sh};
+      $ENV{CC}       = $Config{cc};
+      $ENV{CPPFLAGS} = $Config{cppflags};
+      $ENV{CFLAGS}   = $Config{ccflags};
+      $ENV{LDFLAGS}  = $Config{ldflags};
+      $ENV{LINKER}   = $Config{ld}; # nonstandard
+
+      system $ENV{SHELL}, -c => "./configure --prefix \Q$Config{prefixexp}\E"
+         and exit $? >> 8;
+   }
 }
 
 if ($^O =~ /linux/ && $Config{usemymalloc} eq "y") {
@@ -64,14 +82,21 @@
        COMPRESS	=> 'gzip -9v',
        SUFFIX	=> '.gz',
 	            },
+    depend => {
+       "AIO.c" => "libeio/eio.h libeio/xthread.h libeio/eio.c libeio/config.h",
+    },
     NAME         => "IO::AIO",
     VERSION_FROM => "AIO.pm",
     INC          => $INC,
     LIBS         => $LIBS,
+    EXE_FILES    => ["bin/treescan"],
     PM           => {
     		    'AIO.pm'		=> '$(INST_LIBDIR)/AIO.pm',
                     },
-    clean        => { FILES => "autoconf/config.h autoconf/config.log autoconf/config.status" },
+    PREREQ_PM => {
+       "common::sense" => 0,
+    },
+    clean        => { FILES => "libeio/config.h libeio/config.log libeio/config.status" },
 });
 
 $mm->flush;