--- EV/Makefile.PL	2008/10/29 17:41:11	1.36
+++ EV/Makefile.PL	2008/10/30 04:01:46	1.37
@@ -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;
 
@@ -129,7 +130,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;
 
@@ -142,7 +145,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.
 
 Here is what we know:
 
@@ -156,7 +159,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;
@@ -184,9 +187,8 @@
 
 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/ ? " -lsocket -lnsl" : "";
+my $LIBS = prompt "Extra libraries for pthread_atfork and clock_gettime?", "-lpthread -lrt$solaris_libs";
 
 
 print <<EOF;
@@ -201,7 +203,7 @@
 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;
@@ -217,7 +219,9 @@
 
 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]/));
+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;