--- IO-AIO/Makefile.PL	2018/08/14 09:29:50	1.36
+++ IO-AIO/Makefile.PL	2018/08/14 14:03:15	1.37
@@ -11,27 +11,20 @@
 
 ***
 *** 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
-***
-*** 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.
+*** download and install win32 pthread (http://sourceware.org/pthreads-win32/).
 ***
 
 EOF
 
    if(0){
-   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"];
+      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, ">config.h"
       or die "config.h: $!";
@@ -67,9 +60,9 @@
       $ENV{CC}       = $Config{cc};
       $ENV{CPPFLAGS} = "$Config{cppflags} -I$Config{archlibexp}/CORE";
       $ENV{CFLAGS}   = $Config{ccflags};
-      $ENV{LDFLAGS}  = "$Config{ldflags} -L$Config{archlibexp}/CORE -L$Config{privlibexp}";
+      $ENV{LDFLAGS}  = "$Config{ldflags} $Config{ccdlflags}";
       $ENV{LINKER}   = $Config{ld}; # nonstandard
-      $ENV{LIBS}     = "-lperl $Config{libs}";
+      $ENV{LIBS}     = "-L$Config{archlibexp}/CORE -L$Config{privlibexp} -lperl $Config{libs}";
 
       system $ENV{SHELL}, -c => "./configure --prefix \Q$Config{prefixexp}\E"
          and exit $? >> 8;