--- cvsroot/Coro/Makefile.PL	2007/12/17 06:36:24	1.39
+++ cvsroot/Coro/Makefile.PL	2012/10/31 16:19:09	1.68
@@ -1,5 +1,7 @@
 use ExtUtils::MakeMaker;
 
+use 5.008002;
+
 unless (-e "Coro/libcoro/coro.c") {
    print <<EOF;
 
@@ -15,21 +17,6 @@
 
 print "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n\n";
 
-if ($] < 5.006) {
-   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-10]
-*** 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>
-***
-
-EOF
-}
-
 if (eval { require Event }) {
    if ($Event::VERSION < 0.86 or $Event::VERSION == 0.88) {
       print <<EOF
@@ -49,15 +36,27 @@
       print "\nEvent version $Event::VERSION found, building Event support.\n\n";
    }
 } else {
-   print "\n*** Event not found, not build Event support.\n\n";
+   print "\n*** Event not found, not building Event support.\n\n";
 }
 
 if (eval { require EV }) {
-   $EV = 1;
-   $DEFINE .= " -DHAVE_EV=1";
-   print "\nEV version $EV::VERSION found, building EV support.\n\n";
+   if ($EV::VERSION < 4.0) {
+      print <<EOF
+
+*** 
+*** WARNING: EV version $EV::VERSION found, NOT building EV support.
+***
+*** This version is ABI-incompatible with Coro, please upgrade to at least 4.0.
+***
+
+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";
+   print "\n*** EV not found, not building EV support.\n\n";
 }
 
 WriteMakefile(
@@ -70,54 +69,74 @@
     VERSION_FROM => "Coro.pm",
     DIR          => ['Coro', ($EVENT ? 'Event' : ()), ($EV ? "EV" : ())],
     PREREQ_PM    => {
+       common::sense    => 0,
        Scalar::Util	=> 0.00,
-       AnyEvent         => 2.7,
+       AnyEvent         => 5.0,
        Storable		=> 2.15,
        Time::HiRes      => 0,
+       Guard            => 0.5,
 
        # for Coro::Event
-       Event		=> 1.06,
+       #Event		=> 1.06,
 
        # for Coro::EV
-       EV               => 1.3,
+       #EV               => 4.0,
 
        # for Coro::AIO
-       IO::AIO          => 2.3,
+       #IO::AIO          => 2.3,
+       #AnyEvent::AIO    => 1.1,
+
+       # for Coro::BDB
+       #BDB              => 1.5,
+       #AnyEvent::BDB    => 1.0,
     },
-    EXTRA_META => q{
-configure_requires:
-  Event: 1.06
-  EV: 1.3
+    # 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            => 4.0,
+           IO::AIO       => 3.1,
+           BDB           => 0,
+           AnyEvent      => 7.0,
+           AnyEvent::AIO => 1.0,
+           AnyEvent::BDB => 1.0,
+        }
     },
     PM           => {
-    		    'Coro.pm'		=> '$(INST_LIBDIR)/Coro.pm',
-
-    		    'Coro/State.pm'	=> '$(INST_LIBDIR)/Coro/State.pm',
-
-    		    'Coro/MakeMaker.pm'	=> '$(INST_LIBDIR)/Coro/MakeMaker.pm',
-    		    'Coro/CoroAPI.h'	=> '$(INST_LIBDIR)/Coro/CoroAPI.h',
-
-#    		    'Coro/Cont.pm'	=> '$(INST_LIBDIR)/Coro/Cont.pm',
+		    'Coro.pm'		=> '$(INST_LIBDIR)/Coro.pm',
 
-    		    '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',
-
-    		    'Coro/Debug.pm'	=> '$(INST_LIBDIR)/Coro/Debug.pm',
-    		    'Coro/Util.pm'	=> '$(INST_LIBDIR)/Coro/Util.pm',
-    		    'Coro/Select.pm'	=> '$(INST_LIBDIR)/Coro/Select.pm',
-    		    'Coro/Handle.pm'	=> '$(INST_LIBDIR)/Coro/Handle.pm',
-    		    '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/State.pm'	=> '$(INST_LIBDIR)/Coro/State.pm',
+		    'Coro/jit-amd64-unix.pl' => '$(INST_LIBDIR)/Coro/jit-amd64-unix.pl',
+		    'Coro/jit-x86-unix.pl'   => '$(INST_LIBDIR)/Coro/jit-x86-unix.pl',
+
+		    'Coro/MakeMaker.pm'	=> '$(INST_LIBDIR)/Coro/MakeMaker.pm',
+		    'Coro/CoroAPI.h'	=> '$(INST_LIBDIR)/Coro/CoroAPI.h',
+
+#		    'Coro/Cont.pm'	=> '$(INST_LIBDIR)/Coro/Cont.pm',
+
+		    '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',
+
+		    'Coro/Debug.pm'	=> '$(INST_LIBDIR)/Coro/Debug.pm',
+		    'Coro/Util.pm'	=> '$(INST_LIBDIR)/Coro/Util.pm',
+		    'Coro/Select.pm'	=> '$(INST_LIBDIR)/Coro/Select.pm',
+		    'Coro/Handle.pm'	=> '$(INST_LIBDIR)/Coro/Handle.pm',
+		    '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',
                     },
 );
 
@@ -126,7 +145,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
 }