--- IO-AIO/Makefile.PL	2007/07/08 09:09:34	1.13
+++ IO-AIO/Makefile.PL	2008/05/10 18:06:41	1.15
@@ -2,8 +2,6 @@
 
 use Config;
 
-require "autoconf.pm";
-
 if ($^O =~ /win32/i or $^O =~ /mswin/) {
 
    # configuration on windows is hardcoded - as always
@@ -12,7 +10,7 @@
    warn "using some hardcoded config that will not work on your system\n";
 
    $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"];
+   $LIBS = ["-L/gtk/lib -lpthreadVC2"];
 
 } else {
 
@@ -34,8 +32,25 @@
 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{LIBS}     = $Config{libs};
+      $ENV{LINKER}   = $Config{ld}; # nonstandard
+
+      system $ENV{SHELL}, -c => "cd libeio && ./configure --prefix \Q$Config{prefixexp}\E"
+         and exit $? >> 8;
+   }
 }
 
 if ($^O =~ /linux/ && $Config{usemymalloc} eq "y") {
@@ -64,6 +79,9 @@
        COMPRESS	=> 'gzip -9v',
        SUFFIX	=> '.gz',
 	            },
+    depend => {
+       "AIO.c" => "libeio/eio.h libeio/eio.c libeio/config.h",
+    },
     NAME         => "IO::AIO",
     VERSION_FROM => "AIO.pm",
     INC          => $INC,
@@ -71,7 +89,7 @@
     PM           => {
     		    'AIO.pm'		=> '$(INST_LIBDIR)/AIO.pm',
                     },
-    clean        => { FILES => "autoconf/config.h autoconf/config.log autoconf/config.status" },
+    clean        => { FILES => "libeio/config.h libeio/config.log libeio/config.status" },
 });
 
 $mm->flush;