--- cvsroot/EV/Makefile.PL	2007/10/28 06:40:01	1.4
+++ cvsroot/EV/Makefile.PL	2007/11/01 06:48:49	1.10
@@ -1,18 +1,28 @@
 use 5.006;
 
+use Config;
 use ExtUtils::MakeMaker;
 
-print <<EOF;
 
+unless (-e "libev/ev_epoll.c") {
+   print <<EOF;
+
+***
+*** ERROR: libev is missing or damaged. If you used a CVS check-out of EV,
+*** you also have to check-out the "libev" module from the same CVS
+*** repository into the EV dir (i.e. EV/libev from outside).
 ***
-*** 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
+   exit 1;
+}
+
+#$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	=> {
@@ -20,8 +30,21 @@
 	            COMPRESS	=> 'gzip -9v',
 	            SUFFIX	=> '.gz',
 	           },
-    LIBS => ["-levent"],
+    depend => {
+       "EV.c" => "EV/EVAPI.h libev/ev.c libev/ev.h libev/ev_epoll.c libev/ev_select.c",
+    },
+    INC       => "-Ilibev",
     NAME => "EV",
+    LIBS => ["-lrt -lpthread"],
     VERSION_FROM => "EV.pm",
+    PM           => {
+    		    'EV.pm'		=> '$(INST_LIBDIR)/EV.pm',
+    		    'EV/AnyEvent.pm'	=> '$(INST_LIBDIR)/EV/AnyEvent.pm',
+                    #'EV/DNS.pm'		=> '$(INST_LIBDIR)/EV/DNS.pm',
+    		    'EV/EVAPI.h'	=> '$(INST_LIBDIR)/EV/EVAPI.h',
+    		    'EV/MakeMaker.pm'	=> '$(INST_LIBDIR)/EV/MakeMaker.pm',
+    		    'libev/ev.h'	=> '$(INST_LIBDIR)/EV/ev.h',
+                 },
 );
 
+