--- IO-AIO/Makefile.PL	2012/08/22 22:28:03	1.27
+++ IO-AIO/Makefile.PL	2015/06/13 00:06:13	1.34
@@ -1,4 +1,4 @@
-use 5.008002;
+use Canary::Stability IO::AIO => 1, 5.008002;
 
 use ExtUtils::MakeMaker;
 
@@ -16,15 +16,20 @@
 *** also, the windows SDK is expected to be installed in /sdk
 *** and visual C is expected to be installed in /vc98
 ***
-*** Akternatively, set the INC and LIBS environment variables
-*** accordingly before running Makeifle.PL, or you can
+*** Alternatively, set the INC and LIBS environment variables
+*** accordingly before running Makefile.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"];
+   if ($Config{cc} =~ /(?:^|\\|\/)gcc(?:|.*\.exe)$/) {
+      $INC  = "$ENV{INC} -I/gtk/include";
+      $LIBS = ["$ENV{LIBS} -L/gtk/lib -lpthreadGC2"];
+   } else {
+      $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: $!";
@@ -95,7 +100,7 @@
        SUFFIX	=> '.gz',
     },
     depend => {
-       "AIO.c" => "schmorp.h libeio/eio.h libeio/xthread.h libeio/eio.c libeio/config.h",
+       "AIO.c" => "schmorp.h libeio/eio.h libeio/xthread.h libeio/etp.c libeio/eio.c libeio/config.h",
     },
     NAME         => "IO::AIO",
     VERSION_FROM => "AIO.pm",
@@ -103,8 +108,9 @@
     LIBS         => $LIBS,
     EXE_FILES    => ["bin/treescan"],
     PM           => {
-       'AIO.pm'		=> '$(INST_LIBDIR)/AIO.pm',
+       'AIO.pm'		=> '$(INST_LIB)/IO/AIO.pm',
     },
+    CONFIGURE_REQUIRES => { ExtUtils::MakeMaker => 6.52, Canary::Stability => 2001 },
     PREREQ_PM => {
        "common::sense" => 0,
     },