--- EV/Makefile.PL	2007/10/30 14:02:35	1.6
+++ EV/Makefile.PL	2007/10/30 14:11:32	1.7
@@ -1,7 +1,15 @@
 use 5.006;
 
+use Config;
 use ExtUtils::MakeMaker;
 
+$ENV{CC} = $Config{cc};
+$ENV{CFLAGS} = join " ", map $Config{$_}, qw(inc optimize ccflags cccdlflags);
+system "cd libevent && ./configure --disable-shared --enable-static --disable-maintainer-mode"
+   and die "configure failed.";
+
+$LIBS = qx<cd libevent && make printlibs>;
+
 WriteMakefile(
     dist	=> {
 	            PREOP	=> 'pod2text EV.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
@@ -10,6 +18,7 @@
 	           },
     MYEXTLIB  => 'libevent/.libs/libevent$(LIB_EXT)',
     NAME => "EV",
+    LIBS => [$LIBS],
     VERSION_FROM => "EV.pm",
     PM           => {
     		    'EV.pm'		=> '$(INST_LIBDIR)/EV.pm',
@@ -26,15 +35,12 @@
 sub MY::postamble {
     my $postamble =<<'END';
 
-libevent/Makefile: libevent/configure
-	cd libevent && CC="$(CC)" CFLAGS="$(OPTIMIZE) $(CFLAGS) $(CCCDLFLAGS)" ./configure --disable-shared --enable-static --disable-maintainer-mode
-
 clean::
 	-cd libevent && make distclean
 
 force:
 
-$(MYEXTLIB): libevent/Makefile force
+$(MYEXTLIB): force
 	cd libevent && $(MAKE) all
 
 END