--- cvsroot/Coro/Makefile.PL	2001/08/16 21:55:34	1.7
+++ cvsroot/Coro/Makefile.PL	2004/05/13 16:12:14	1.16
@@ -8,8 +8,7 @@
 *** internals to do it's job. While it seems to work fine with perl-5.8,
 *** 5.7 and 5.6, it has not been tested with older versions. If it
 *** compiles and passes the testsuite, it should work.  Otherwise you
-*** should either upgrade or contact the author, maybe it can be made to
-*** work...
+*** should either upgrade or fix it ;)
 ***
 *** Marc Lehmann <pcg\@goof.com>
 ***
@@ -17,7 +16,30 @@
 EOF
 }
 
-$EVENT = eval { require Event };
+if (eval { require Event }) {
+   if ($Event::VERSION < 0.86) {
+      print "*** Please read the INSTALL file, you need a patched Event.\n";
+   } elsif ($Event::VERSION == 0.88) {
+      print <<EOF
+
+*** 
+*** WARNING: Event version $Event::VERSION found, NOT building Event support.
+*** 
+*** This version of Event is broken. The only currently known non-broken
+*** version of Event is 0.87. Please install this version, or try with a
+*** newer version that hopefully has the bug fixed.
+*** 
+
+EOF
+   } else {
+      $EVENT = 1;
+      $DEFINE .= " -DHAVE_EVENT=1";
+      print "\nEvent version $Event::VERSION found, building Event support.\n\n";
+   }
+   print "\n";
+} else {
+   print "\n*** Event not found, not build Event support.\n\n";
+}
 
 WriteMakefile(
     dist         => {
@@ -29,10 +51,12 @@
     VERSION_FROM => "Coro.pm",
     DIR          => ['Coro', ($EVENT ? 'Event' : ())],
     PREREQ_PM    => {
-       Event	=> 0.83, # still, 0.83 and below have serious bugs(!)
+       Event		=> 0.86,
+       Scalar::Util	=> 0.00,
     },
     PM           => {
-    		    'Coro.pm'		=> '$(INST_LIBDIR)/Coro/Coro.pm',
+    		    'Coro.pm'		=> '$(INST_LIBDIR)/Coro.pm',
+
     		    'Coro/State.pm'	=> '$(INST_LIBDIR)/Coro/State.pm',
 
     		    'Coro/MakeMaker.pm'	=> '$(INST_LIBDIR)/Coro/MakeMaker.pm',
@@ -42,18 +66,13 @@
 
     		    'Coro/Specific.pm'	=> '$(INST_LIBDIR)/Coro/Specific.pm',
 
+    		    'Coro/Timer.pm'	=> '$(INST_LIBDIR)/Coro/Timer.pm',
     		    'Coro/Signal.pm'	=> '$(INST_LIBDIR)/Coro/Signal.pm',
     		    'Coro/Channel.pm'	=> '$(INST_LIBDIR)/Coro/Channel.pm',
     		    'Coro/Semaphore.pm'	=> '$(INST_LIBDIR)/Coro/Semaphore.pm',
+    		    'Coro/SemaphoreSet.pm'=> '$(INST_LIBDIR)/Coro/SemaphoreSet.pm',
     		    'Coro/RWLock.pm'	=> '$(INST_LIBDIR)/Coro/RWLock.pm',
-
-                    $EVENT ? (
-                       'Event/Event.pm'	=> '$(INST_LIBDIR)/Coro/Event.pm',
-                       'Event/Handle.pm'=> '$(INST_LIBDIR)/Coro/Handle.pm',
-                       'Event/Socket.pm'=> '$(INST_LIBDIR)/Coro/Socket.pm',
-                       'Event/Util.pm'	=> '$(INST_LIBDIR)/Coro/Util.pm',
-                    ) : (),
-                  },
+                    },
 );
 
 sub MY::postamble {
@@ -61,7 +80,7 @@
 
 # set \$VERSION in all modules
 setver:
-	\$(PERL) -pi -e 's/^(\\s*\\\$\$VERSION\\s*=\\s*).*\$\$/\$\${1}\$(VERSION);/' *.pm Coro/*.pm
+	\$(PERL) -pi -e 's/^(\\s*\\\$\$VERSION\\s*=\\s*).*\$\$/\$\${1}\$(VERSION);/' *.pm Coro/*.pm Event/*.pm
 
 EOF
 }