--- EV/Makefile.PL	2007/10/29 08:48:07	1.5
+++ EV/Makefile.PL	2007/10/30 14:11:32	1.7
@@ -1,18 +1,14 @@
 use 5.006;
 
+use Config;
 use ExtUtils::MakeMaker;
 
-print <<EOF;
+$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.";
 
-***
-*** You need to install libevent (http://monkey.org/~provos/libevent/) separately
-*** first in a way so that the Makefile.PL can find both -levent and the event.h
-*** and evdns.h include files.
-*** 
-*** Version 1.3e or higher is recommended, but older 1.3 versions likely work too.
-*** 
-
-EOF
+$LIBS = qx<cd libevent && make printlibs>;
 
 WriteMakefile(
     dist	=> {
@@ -20,8 +16,9 @@
 	            COMPRESS	=> 'gzip -9v',
 	            SUFFIX	=> '.gz',
 	           },
-    LIBS => ["-levent"],
+    MYEXTLIB  => 'libevent/.libs/libevent$(LIB_EXT)',
     NAME => "EV",
+    LIBS => [$LIBS],
     VERSION_FROM => "EV.pm",
     PM           => {
     		    'EV.pm'		=> '$(INST_LIBDIR)/EV.pm',
@@ -29,6 +26,23 @@
     		    'EV/DNS.pm'		=> '$(INST_LIBDIR)/EV/DNS.pm',
     		    'EV/EVAPI.h'	=> '$(INST_LIBDIR)/EV/EVAPI.h',
     		    'EV/MakeMaker.pm'	=> '$(INST_LIBDIR)/EV/MakeMaker.pm',
+    		    'libevent/event.h'	=> '$(INST_LIBDIR)/EV/event.h',
+    		    'libevent/evdns.h'	=> '$(INST_LIBDIR)/EV/evdns.h',
+    		    'libevent/evhttp.h'	=> '$(INST_LIBDIR)/EV/evhttp.h',
                  },
 );
 
+sub MY::postamble {
+    my $postamble =<<'END';
+
+clean::
+	-cd libevent && make distclean
+
+force:
+
+$(MYEXTLIB): force
+	cd libevent && $(MAKE) all
+
+END
+}
+