httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: httpd-apreq-2 Makefile.PL STATUS
Date Fri, 31 Oct 2003 21:38:35 GMT
joes        2003/10/31 13:38:35

  Modified:    .        Makefile.PL STATUS
  Log:
  Add perl prereq tests to Makefile.PL
  
  Revision  Changes    Path
  1.7       +10 -1     httpd-apreq-2/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/Makefile.PL,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.PL	28 Oct 2003 14:00:06 -0000	1.6
  +++ Makefile.PL	31 Oct 2003 21:38:35 -0000	1.7
  @@ -9,6 +9,15 @@
   use constant PERL_PATH => $Config{perlpath}; # XXX
   use constant WIN32 => ($^O =~ /Win32/);
   
  +sub test_prereq {
  +    system (PERL_PATH, "build/version_check.pl", @_) == 0
  +        or die "Please upgrade $_[0] first.";
  +}
  +
  +test_prereq perl => PERL_PATH;
  +test_prereq "apache_test";
  +test_prereq "mp2";
  +
   if (WIN32) {
       push @ARGV, '--with-perl=' . PERL_PATH;
       my @args = (PERL_PATH, 'win32/Configure.pl', @ARGV);
  @@ -30,7 +39,7 @@
       $opts .= "--enable-perl-glue " unless exists $opts{"disable-perl-glue"};
   
       delete @opts{@flags};
  -    $opts{"with-apache2-apxs"} = delete $opts{apxs} 
  +    $opts{"with-apache2-apxs"} = delete $opts{apxs}
           if exists $opts{apxs} and not exists $opts{"with-apache2-apxs"};
   
       $opts .= join " ", map {"--$_=$opts{$_}"} keys %opts;
  
  
  
  1.32      +2 -6      httpd-apreq-2/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/STATUS,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- STATUS	30 Oct 2003 02:23:26 -0000	1.31
  +++ STATUS	31 Oct 2003 21:38:35 -0000	1.32
  @@ -1,7 +1,7 @@
   Last modified at [$Date$]   -*-text-*-
   /** @page STATUS
   
  -     2.0.1  in development
  +     2.01-dev in development
   
   Contributors looking for a mission:
   
  @@ -14,10 +14,6 @@
   
   
   RELEASE SHOWSTOPPERS:
  -
  -    - Incorporate prereq checks into build system:
  -
  -      -# perl module checks in Makefile.PL
   
   
   CURRENT VOTES:
  
  
  

Mime
View raw message