--- cvsroot/Coro/Makefile.PL	2007/09/19 21:39:15	1.31
+++ cvsroot/Coro/Makefile.PL	2009/08/22 22:36:23	1.63
@@ -1,20 +1,22 @@
 use ExtUtils::MakeMaker;
 
-if ($] < 5.006) {
+use 5.008002;
+
+unless (-e "Coro/libcoro/coro.c") {
    print <<EOF;
 
 ***
-*** WARNING: This module is quite low-level and uses undocumented perl
-*** internals to do it's job. While it seems to work fine with perl-5.[6-9]
-*** it has not been tested with older versions. If it compiles and passes the
-*** testsuite, it should work. Otherwise you should either upgrade or fix it ;)
-***
-*** Marc Lehmann <schmorp\@schmorp.de>
+*** ERROR: Coro/libcoro is missing or damaged. If you used a CVS check-out
+*** of Coro, you also have to check-out the "libcoro" module from the same CVS
+*** repository in the Coro subdirectory (i.e. Coro/Coro/libcoro from outside).
 ***
 
 EOF
+   exit 1;
 }
 
+print "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n\n";
+
 if (eval { require Event }) {
    if ($Event::VERSION < 0.86 or $Event::VERSION == 0.88) {
       print <<EOF
@@ -33,11 +35,30 @@
       $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";
 }
 
+if (eval { require EV }) {
+   if ($EV::VERSION < 3.3) {
+      print <<EOF
+
+*** 
+*** WARNING: Event version $EV::VERSION found, NOT building EV support.
+***
+*** This version is ABI-incompatible with Coro, please upgrade to at least 3.3.
+***
+
+EOF
+   } else {
+      $EV = 1;
+      $DEFINE .= " -DHAVE_EV=1";
+      print "\nEV version $EV::VERSION found, building EV support.\n\n";
+   }
+} else {
+   print "\n*** EV not found, not build EV support.\n\n";
+}
+
 WriteMakefile(
     dist         => {
        PREOP	=> 'pod2text Coro.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
@@ -46,17 +67,42 @@
 	            },
     NAME         => "Coro",
     VERSION_FROM => "Coro.pm",
-    DIR          => ['Coro', ($EVENT ? 'Event' : ())],
+    DIR          => ['Coro', ($EVENT ? 'Event' : ()), ($EV ? "EV" : ())],
     PREREQ_PM    => {
+       common::sense    => 0,
        Scalar::Util	=> 0.00,
+       AnyEvent         => 5.0,
+       Storable		=> 2.15,
+       Time::HiRes      => 0,
+       Guard            => 0.5,
 
        # for Coro::Event
-       Event		=> 1.06,
-       Time::HiRes      => 0,
+       #Event		=> 1.06,
 
-       # for Coro::AIO, Coro::Util
-       IO::AIO          => 2.3,
-       AnyEvent         => 2.51,
+       # for Coro::EV
+       #EV               => 3.3,
+
+       # for Coro::AIO
+       #IO::AIO          => 2.3,
+       #AnyEvent::AIO    => 1.1,
+
+       # for Coro::BDB
+       #BDB              => 1.5,
+       #AnyEvent::BDB    => 1.0,
+    },
+    # neither configure_requires nor recommends can be used
+    # for optional dependencies. whoever decided that a module needs
+    # to build properly without its dependencies installed
+    # needs his brain rearranged dramatically.
+    META_MERGE => {
+        recommends => {
+           Event         => 1.08,
+           EV            => 3.0,
+           IO::AIO       => 3.1,
+           AnyEvent::AIO => 1.0,
+           BDB           => 0,
+           AnyEvent::BDB => 1.0,
+        }
     },
     PM           => {
     		    'Coro.pm'		=> '$(INST_LIBDIR)/Coro.pm',
@@ -84,8 +130,10 @@
     		    'Coro/Socket.pm'	=> '$(INST_LIBDIR)/Coro/Socket.pm',
 
     		    'Coro/AIO.pm'	=> '$(INST_LIBDIR)/Coro/AIO.pm',
+    		    'Coro/BDB.pm'	=> '$(INST_LIBDIR)/Coro/BDB.pm',
     		    'Coro/LWP.pm'	=> '$(INST_LIBDIR)/Coro/LWP.pm',
     		    'Coro/Storable.pm'	=> '$(INST_LIBDIR)/Coro/Storable.pm',
+    		    'Coro/AnyEvent.pm'	=> '$(INST_LIBDIR)/Coro/AnyEvent.pm',
                     },
 );
 
@@ -94,7 +142,7 @@
 
 # set \$VERSION in all modules
 setver:
-	\$(PERL) -pi -e 's/^(\\s*(our\\s*)?\\\$\$VERSION\\s*=\\s*).*\$\$/\$\${1}\$(VERSION);/' *.pm Coro/*.pm Event/*.pm
+	\$(PERL) -pi -e 's/^(\\s*(our\\s*)?\\\$\$VERSION\\s*=\\s*).*\$\$/\$\${1}\$(VERSION);/' *.pm Coro/*.pm EV/*.pm Event/*.pm
 
 EOF
 }