--- IO-AIO/Makefile.PL	2008/05/10 18:06:41	1.15
+++ IO-AIO/Makefile.PL	2011/07/18 02:59:58	1.24
@@ -1,33 +1,49 @@
+use 5.008002;
+
 use ExtUtils::MakeMaker;
 
 use Config;
 
-if ($^O =~ /win32/i or $^O =~ /mswin/) {
-
+if ($^O eq "MSWin32") {
    # configuration on windows is hardcoded - as always
 
-   warn "your platform is not standards-compliant, you have to port this module first\n";
-   warn "using some hardcoded config that will not work on your system\n";
+   print STDERR <<EOF;
 
-   $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"];
+***
+*** Your platform is not standards compliant. To get this module working, you need to
+*** download and install win32 pthread (http://sourceware.org/pthreads-win32/)
+*** in /gtk/{lib,include}
+*** also, the windows SDK is expected to be installed in /sdk
+*** and visual C is expected to be installed in /vc98
+***
+*** You can set the INC and LIBS environment variables
+*** accordingly before running Makeifle.PL, or you can
+*** pass INC and LIBS arguments to Makefile.PL itself.
+***
+
+EOF
+
+   $INC  = "$ENV{INC} -I/sdk/include -I/vc98/include -I/gtk/include";
+   $LIBS = ["$ENV{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', ''];
 
-   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
    }
@@ -45,10 +61,9 @@
       $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 => "cd libeio && ./configure --prefix \Q$Config{prefixexp}\E"
+      system $ENV{SHELL}, -c => "./configure --prefix \Q$Config{prefixexp}\E"
          and exit $? >> 8;
    }
 }
@@ -80,15 +95,19 @@
        SUFFIX	=> '.gz',
 	            },
     depend => {
-       "AIO.c" => "libeio/eio.h libeio/eio.c libeio/config.h",
+       "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',
                     },
+    PREREQ_PM => {
+       "common::sense" => 0,
+    },
     clean        => { FILES => "libeio/config.h libeio/config.log libeio/config.status" },
 });