X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FScalar-Vec-Util.git;a=blobdiff_plain;f=Makefile.PL;h=e08782759ac288572e9d0bc5af9903fecca15e6d;hp=3dbfaa29dffcb3fb0593fd8c480460f1b5c123a2;hb=163ac4d152042cfb4e085bd2333396a804871ddd;hpb=6bd2911cc83d8c85647b93638da8577ee3bd3987

diff --git a/Makefile.PL b/Makefile.PL
index 3dbfaa2..e087827 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,36 +4,43 @@ use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
+use Config;
+
 BEGIN {
- eval { require Config };
- die 'OS unsupported' if $@;
- Config->import(qw/%Config/);
- eval { require File::Spec };
- die 'OS unsupported' if $@;
+ local $@;
+ eval { require File::Spec; 1 } or die 'OS unsupported';
 }
 
-# Inspired from Module::Install::Can
-print "Checking for a valid C compiler in the PATH... ";
-my @ccs = ($Config{cc});
-unshift @ccs, $ENV{CC} if $ENV{CC};
 my $cc;
+for (@ARGV) {
+ if (/^CC=(.*)/) {
+  $cc = $1;
+  last;
+ }
+}
+if (defined $cc) {
+ print "Forcing the use of $cc as the C compiler.\n";
+} else {
+ # Inspired from Module::Install::Can
+ print "Checking for a valid C compiler in the PATH... ";
+ my @ccs = ($Config{cc});
+ unshift @ccs, $ENV{CC} if $ENV{CC};
 CC:
-for my $c (@ccs) {
- for my $dir (split /$Config{path_sep}/, $ENV{PATH}) {
-  my $abs = File::Spec->catfile($dir, $c);
-  if (-x $abs or MM->maybe_command($abs)) {
-   $cc = $c;
-   last CC;
+ for my $c (@ccs) {
+  for my $dir (split /$Config{path_sep}/, $ENV{PATH}) {
+   my $abs = File::Spec->catfile($dir, $c);
+   if (-x $abs or MM->maybe_command($abs)) {
+    $cc = $c;
+    print $cc, "\n";
+    last CC;
+   }
   }
  }
+ print "none\n" unless defined $cc;
 }
+
 my @C;
-if ($cc) {
- push @C, 'Util.c';
- print $cc, "\n";
-} else {
- print "none\n";
-}
+push @C, 'Util.c' if defined $cc;
 
 my @DEFINES;
 
@@ -86,6 +93,14 @@ my %PREREQ_PM = (
  'base'     => 0,
 );
 
+my %BUILD_REQUIRES = (
+ 'Config'              => 0,
+ 'ExtUtils::MakeMaker' => 0,
+ 'File::Spec'          => 0,
+ 'Test::More'          => 0,
+ %PREREQ_PM,
+);
+
 my %META = (
  configure_requires => {
   'Config'              => 0,
@@ -93,10 +108,7 @@ my %META = (
   'File::Spec'          => 0,
  },
  build_requires => {
-  'Config'              => 0,
-  'ExtUtils::MakeMaker' => 0,
-  'Test::More'          => 0,
-  %PREREQ_PM,
+  %BUILD_REQUIRES,
  },
  dynamic_config => 1,
  resources => {
@@ -116,15 +128,16 @@ WriteMakefile(
  PL_FILES         => {},
  C                => \@C,
  @DEFINES,
+ BUILD_REQUIRES   => \%BUILD_REQUIRES,
  PREREQ_PM        => \%PREREQ_PM,
- MIN_PERL_VERSION => 5.006,
+ MIN_PERL_VERSION => '5.006',
  META_MERGE       => \%META,
  dist             => {
-  PREOP    => "pod2text $file > \$(DISTVNAME)/README",
+  PREOP    => "pod2text -u $file > \$(DISTVNAME)/README",
   COMPRESS => 'gzip -9f', SUFFIX => 'gz'
  },
  clean            => {
-  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt"
+  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*"
  },
 );
 
@@ -134,7 +147,7 @@ package MY;
 
 sub postamble {
  my $cv = join ' -coverage ', 'cover',
-                            qw/statement branch condition path subroutine time/;
+                            qw<statement branch condition path subroutine time>;
  <<POSTAMBLE;
 cover test_cover:
 	$cv -test