--- IO-AIO/Makefile.PL	2013/04/14 09:43:18	1.29
+++ IO-AIO/Makefile.PL	2018/08/12 05:21:35	1.35
@@ -1,4 +1,4 @@
-use 5.008002;
+use Canary::Stability IO::AIO => 1, 5.008002;
 
 use ExtUtils::MakeMaker;
 
@@ -16,18 +16,23 @@
 *** 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
+*** 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: $!";
+   open my $fh, ">config.h"
+      or die "config.h: $!";
    print $fh <<EOF;
 EOF
 
@@ -58,10 +63,11 @@
       $ENV{MAKE}     = $Config{make};
       $ENV{SHELL}    = $Config{sh};
       $ENV{CC}       = $Config{cc};
-      $ENV{CPPFLAGS} = $Config{cppflags};
+      $ENV{CPPFLAGS} = "$Config{cppflags} -I$Config{archlibexp}/CORE";
       $ENV{CFLAGS}   = $Config{ccflags};
-      $ENV{LDFLAGS}  = $Config{ldflags};
+      $ENV{LDFLAGS}  = "$Config{ldflags} -L$Config{archlibexp}/CORE -L$Config{privlibexp}";
       $ENV{LINKER}   = $Config{ld}; # nonstandard
+      $ENV{LIBS}     = "-lperl";
 
       system $ENV{SHELL}, -c => "./configure --prefix \Q$Config{prefixexp}\E"
          and exit $? >> 8;
@@ -95,7 +101,7 @@
        SUFFIX	=> '.gz',
     },
     depend => {
-       "AIO.c" => "schmorp.h libeio/eio.h libeio/xthread.h libeio/etp.c libeio/eio.c libeio/config.h",
+       "AIO.c" => "schmorp.h libeio/eio.h libeio/xthread.h libeio/etp.c libeio/eio.c config.h",
     },
     NAME         => "IO::AIO",
     VERSION_FROM => "AIO.pm",
@@ -103,12 +109,13 @@
     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,
     },
-    clean        => { FILES => "libeio/config.h libeio/config.log libeio/config.status" },
+    clean        => { FILES => "config.h libeio/config.h libeio/config.log libeio/config.status" },
 });
 
 $mm->flush;