--- EV/Makefile.PL	2007/10/26 17:40:31	1.3
+++ EV/Makefile.PL	2007/11/06 17:20:42	1.16
@@ -1,14 +1,128 @@
+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 versions likely work too.
-*** 
+
+EOF
+   exit 1;
+}
+
+print <<EOF;
+
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+Welcome to EV configuration. If you are in a hurry, just press return here
+and hope for the best. The defaults should usually do.
+
+EOF
+
+if (prompt ("Skip further questions and use defaults (y/n)?", "y") =~ /[yY]/) {
+   $ENV{PERL_MM_USE_DEFAULT} = 1;
+}
+
+print <<EOF;
+
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+POSIX optionally offers support for a monotonic clock source. EV
+can take advantage of this clock source to detect time jumps
+reliably. Unfortunately, some systems are bound to be broken, so you can
+disable this here: you can completely disable the detection and use of
+the monotonic clock by answering 'n' here. Support for this clock type
+will otherwise be autodetected at both compile- and runtime.
+
+EOF
+
+if (prompt ("Enable optional support for CLOCK_MONOTONIC (y/n)?", "y") =~ /[yY]/) {
+   $DEFINE .= " -DEV_USE_MONOTONIC";
+}
+
+print <<EOF;
+
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+POSIX optionally offers support for a (potentially) high-resolution
+realtime clock interface. In a good implementation, using it is faster
+than the normal method of using gettimeofday. Unfortunately, this option
+is also bound to be broken on some systems, so you can disable use and
+probing of this feature altogether here. Otherwise support for this clock
+type will be autodetected at compiletime.
+
+EOF
+
+if (prompt ("Prefer clock_gettime (CLOCK_REALTIME) over gettimeofday (y/n)?", "y") !~ /[yY]/) {
+   $DEFINE .= " -DEV_USE_REALTIME=0";
+}
+
+print <<EOF;
+
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+EV by default uses select, which makes it hard to write efficient servers,
+especially if the number of active conencitons is much lower than the open
+ones. GNU/Linux systems have a more scalable method called "epoll", which
+EV can use. For this to work, both your kernel and glibc have to support
+epoll, but if you can compile it, the detection will be done at runtime,
+and EV will safely fall back to using select when epoll isn't available.
+If unsure, accept the default.
+
+EOF
+
+if (prompt ("Enable epoll backend (y/n)?", (-e "/usr/include/sys/epoll.h") ? "y" : "n") =~ /[yY]/) {
+   $DEFINE .= " -DEV_USE_EPOLL";
+} 
+
+print <<EOF;
+
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+Similarly to the epoll backend above, EV can take advantage of kqueue on
+many BSD systems (it seems to be broken on Mac OS X though). The kqueue
+backend has not been tested, however, so it is disabled by default. Please
+test (and preferably fix) the kqueue backend when you have a machine
+supporting it.  Support for kqueue will be detected at runtime, with a
+safe fallback to other methods when it cannot be used.
+
+EOF
+
+if (prompt ("Enable kqueue backend (y/n)?", (-e "/usr/include/sys/event.h") ? "y" : "n") =~ /[yY]/) {
+   $DEFINE .= " -DEV_USE_KQUEUE";
+} 
+
+print <<EOF;
+
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+EV needs the functions pthread_atfork and clock_gettime. On most systems
+you need some special libraries for this (such as -lrt and -lpthread). You
+can specify additional libraries to provide these calls now, or accept the
+default.
+
+EOF
+
+$LIBS = prompt "Extra libraries for pthread_atfork and clock_gettime?", "-lpthread -lrt";
+
+
+print <<EOF;
+
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
 EOF
 
@@ -18,8 +132,24 @@
 	            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 "
+               . "libev/event.h libev/event.c libev/evdns.h libev/evdns.c",
+    },
+    INC       => "-Ilibev",
+    DEFINE    => "$DEFINE",
     NAME => "EV",
+    LIBS => [$LIBS],
     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',
+                 },
 );
 
+