httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: httpd-apreq-2/build version_check.pl
Date Mon, 05 Jul 2004 05:22:17 GMT
randyk      2004/07/04 22:22:17

  Modified:    .        acinclude.m4 Makefile.PL
               build    version_check.pl
  Log:
  Reviewed by:	joes
  demand minimum ExtUtils::MakeMaker version - early versions
  don't correctly place pm files under an Apache2/ subdirectory,
  which can lead to clobbering an existing libapreq-1 installation
  (reported by Chad Kreimendahl <Chad.Kreimendahl (at) umb.com>).
  
  Revision  Changes    Path
  1.23      +3 -0      httpd-apreq-2/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- acinclude.m4	22 Jun 2004 03:45:56 -0000	1.22
  +++ acinclude.m4	5 Jul 2004 05:22:16 -0000	1.23
  @@ -68,6 +68,9 @@
               if test -z "`$prereq_check Apache::Test`"; then
                   AC_MSG_ERROR([Bad Apache::Test version])
               fi
  +            if test -z "`$prereq_check ExtUtils::MakeMaker`"; then
  +                AC_MSG_ERROR([Bad ExtUtils::MakeMaker version])
  +            fi
           fi
   
           AC_CONFIG_COMMANDS_POST([test "x$PERL_GLUE" != "xno" && 
  
  
  
  1.9       +1 -0      httpd-apreq-2/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/Makefile.PL,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.PL	7 Nov 2003 20:05:19 -0000	1.8
  +++ Makefile.PL	5 Jul 2004 05:22:17 -0000	1.9
  @@ -39,6 +39,7 @@
           $opts .= "--enable-perl-glue ";
           test_prereq "mod_perl";
           test_prereq "Apache::Test";
  +        test_prereq "ExtUtils::MakeMaker";
       }
   
       delete @opts{@flags};
  
  
  
  1.16      +6 -0      httpd-apreq-2/build/version_check.pl
  
  Index: version_check.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/build/version_check.pl,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- version_check.pl	2 Jul 2004 16:18:37 -0000	1.15
  +++ version_check.pl	5 Jul 2004 05:22:17 -0000	1.16
  @@ -20,6 +20,11 @@
       $Apache::Test::VERSION;
   }
   
  +sub mm_version {
  +    require ExtUtils::MakeMaker;
  +    $ExtUtils::MakeMaker::VERSION;
  +}
  +
   sub mp2_version {
       eval {
           require Apache2;
  @@ -53,6 +58,7 @@
                                comment => "Win32 requires version 1.06"    },
     "ExtUtils::XSBuilder" => { version => "0.23",    test => \&xsb_version },
                 mod_perl  => { version => "1.99_15", test => \&mp2_version },
  +  "ExtUtils::MakeMaker" => { version => "6.15",    test => \&mm_version  },
                   );
   
   sub print_prereqs ($$) {
  
  
  

Mime
View raw message