cvs commit: modperl-2.0 Makefile.PL

[stas]

stas        2003/08/06 14:40:04

  Modified:    .        Makefile.PL
  Log:
  move all the requirement checkings (perl/apr) into one sub
  
  Revision  Changes    Path
  1.109     +12 -10    modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- Makefile.PL       6 Aug 2003 21:27:52 -0000       1.108
  +++ Makefile.PL       6 Aug 2003 21:40:04 -0000       1.109
  @@ -41,16 +41,6 @@
   
   our $VERSION;
   
  -if (Apache::Build::REQUIRE_ITHREADS()) {
  -    unless (Apache::Build::HAS_ITHREADS()) {
  -     die "your system requires an ithreads enabled Perl";
  -    }
  -    # 5.6.x ithreads aren't good
  -    unless ($] >= 5.008) {
  -        die "Perl 5.8 or higher w/ ithreads is required. This is only Perl $]";
  -    }
  -}
  -
   perl_version_check();
   
   my $build = Apache::Build->new(init => 1);
  @@ -326,6 +316,18 @@
   }
   
   sub perl_version_check {
  +
  +    if (Apache::Build::REQUIRE_ITHREADS()) {
  +        unless (Apache::Build::HAS_ITHREADS()) {
  +            die "your system requires an ithreads enabled Perl";
  +        }
  +        # 5.6.x ithreads aren't good
  +        unless ($] >= 5.008) {
  +            die "Perl 5.8 or higher w/ ithreads is required. " .
  +                "This is only Perl $]";
  +        }
  +    }
  +
       if ($] < 5.006_001) {
           error "You are running Perl version 5.6.0\n" .
               "We strongly suggest you upgrade to at least 5.6.1";