--- cvsroot/EV/Makefile.PL	2008/10/02 12:26:25	1.34
+++ cvsroot/EV/Makefile.PL	2009/06/10 00:52:21	1.40
@@ -1,5 +1,6 @@
 use 5.006;
 
+use strict qw(vars subs);
 use Config;
 use ExtUtils::MakeMaker;
 
@@ -45,7 +46,7 @@
 
 EOF
 
-$DEFINE .= " -DEV_USE_MONOTONIC=" . (0 + (prompt ("Enable optional support for CLOCK_MONOTONIC (y/n)?", "y") =~ /[yY]/));
+my $DEFINE .= " -DEV_USE_MONOTONIC=" . (0 + (prompt ("Enable optional support for CLOCK_MONOTONIC (y/n)?", "y") =~ /[yY]/));
 
 print <<EOF;
 
@@ -55,28 +56,12 @@
 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.
+is also bound to be broken on some systems, and current EV versions do not
+actually call C<gettimeofday> very often, so ti defaults to no.
 
 EOF
 
-$DEFINE .= " -DEV_USE_REALTIME=" . (0 + (prompt ("Prefer clock_gettime (CLOCK_REALTIME) over gettimeofday (y/n)?", "y") =~ /[yY]/));
-
-print <<EOF;
-
-*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
-
-
-Another useful bit of functionality is the Linux eventfd, which is useful
-for faster signal handling (don't care) and intra-thread communications
-(mostly useful for embedding). Kernel support for this will be probed at
-runtime, but your libc must contain the necessary wrapper. Glibc 2.7 and
-later should have this wrapper.
-
-EOF
-
-$DEFINE .= " -DEV_USE_EVENTFD=" . (0 + (prompt ("Enable linux eventfd support (y/n)?", (-e "/usr/include/sys/eventfd.h") || $ENV{EV_EVENTFD} ? "y" : "n") =~ /[yY]/));
+$DEFINE .= " -DEV_USE_REALTIME=" . (0 + (prompt ("Prefer clock_gettime (CLOCK_REALTIME) over gettimeofday (y/n)?", "n") =~ /[yY]/));
 
 print <<EOF;
 
@@ -144,7 +129,9 @@
 
 EOF
 
-$DEFINE .= " -DEV_USE_EPOLL=" . (0 + (prompt ("Enable epoll backend (y/n)?", (-e "/usr/include/sys/epoll.h") ? "y" : "n") =~ /[yY]/));
+my $can_epoll = -e "/usr/include/sys/epoll.h";
+$can_epoll = $ENV{EV_EPOLL} if exists $ENV{EV_EPOLL};
+$DEFINE .= " -DEV_USE_EPOLL=" . (0 + (prompt ("Enable epoll backend (y/n)?", $can_epoll ? "y" : "n") =~ /[yY]/));
 
 print <<EOF;
 
@@ -157,7 +144,7 @@
 
 Note that kqueue is broken on most operating systems, so by default it
 won't be used on many platforms, but you can still create your own event
-loop with qkueue backend.
+loop with kqueue backend if you ask specifically for it.
 
 Here is what we know:
 
@@ -171,7 +158,7 @@
 EOF
 
 my $can_kqueue = -e "/usr/include/sys/event.h";
-
+$can_kqueue = $ENV{EV_KQUEUE} if exists $ENV{EV_KQUEUE};
 $DEFINE .= " -DEV_USE_KQUEUE=" . (0 + (prompt ("Enable kqueue backend (y/n)?", $can_kqueue ? "y" : "n") =~ /[yY]/));
 
 print <<EOF;
@@ -199,9 +186,9 @@
 
 EOF
 
-$SOLARIS_LIBS = $^O =~ /solaris/ ? " -lsocket -lnsl" : "";
-
-$LIBS = prompt "Extra libraries for pthread_atfork and clock_gettime?", "-lpthread -lrt$SOLARIS_LIBS";
+my $solaris_libs = $^O =~ /solaris/i ? "-lsocket -lnsl" : "";
+my $librt = $^O =~ /linux/i ? "-lpthread" : "-lpthread -lrt";
+my $LIBS = prompt "Extra libraries for pthread_atfork and clock_gettime?", "$librt $solaris_libs";
 
 
 print <<EOF;
@@ -211,12 +198,13 @@
 
 A backend of a different kind is the Linux inotify(7) interface, which can
 be used to speed up (and reduce resource consumption) of stat watchers. If
-you have it, it is usually a good idea to enable it.
+you have the include file and libc support for it, it is usually a good
+idea to enable it, as kernel availability is detected at runtime.
 
 EOF
 
 my $can_inotify = -e "/usr/include/sys/inotify.h";
-
+$can_inotify = $ENV{EV_INOTIFY} if exists $ENV{EV_INOTIFY};
 $DEFINE .= " -DEV_USE_INOTIFY=" . (0 + (prompt ("Enable inotify support (y/n)?", $can_inotify ? "y" : "n") =~ /[yY]/));
 
 print <<EOF;
@@ -224,6 +212,23 @@
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
 
+Another useful bit of functionality is the Linux eventfd, which is useful
+for faster signal handling (don't care) and intra-thread communications
+(more relevant). Kernel support for this will be probed at runtime, but
+your libc must contain the necessary wrapper. Glibc 2.7 and later should
+have this wrapper.
+
+EOF
+
+my $can_eventfd = -e "/usr/include/sys/eventfd.h";
+$can_eventfd = $ENV{EV_EVENTFD} if exists $ENV{EV_EVENTFD};
+$DEFINE .= " -DEV_USE_EVENTFD=" . (0 + (prompt ("Enable linux eventfd support (y/n)?", $can_eventfd ? "y" : "n") =~ /[yY]/));
+
+print <<EOF;
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
 EOF
 
 my @anyevent = eval { require AnyEvent; $AnyEvent::VERSION < 2.6 } ? (AnyEvent => 2.6) : ();
@@ -252,12 +257,12 @@
     		    'EV/EVAPI.h'	=> '$(INST_LIBDIR)/EV/EVAPI.h',
     		    'EV/MakeMaker.pm'	=> '$(INST_LIBDIR)/EV/MakeMaker.pm',
     		    'libev/ev.h'	=> '$(INST_LIBDIR)/EV/ev.h',
-    		    'libev/ev.pod'	=> '$(INST_LIBDIR)/EV/c_doc.pod',
+    		    'libev/ev.pod'	=> '$(INST_LIBDIR)/EV/libev.pod',
                  },
     MAN3PODS => {
                     'EV.pm'           => '$(INST_MAN3DIR)/EV.$(MAN3EXT)',
                     'EV/MakeMaker.pm' => '$(INST_MAN3DIR)/EV::MakeMaker.$(MAN3EXT)',
-                    'libev/ev.pod'    => '$(INST_MAN3DIR)/EV::c_doc.$(MAN3EXT)',
+                    'libev/ev.pod'    => '$(INST_MAN3DIR)/EV::libev.$(MAN3EXT)',
                 },
 );