Reorder into setup, extract, check, generate

Author: mohawk2

lib/ExtUtils/MakeMaker.pm

@@ -431,44 +431,35 @@ sub new {
     } else {
         $self = {};
     }
-
     setup_MY($self, ++$PACKNAME); # blesses
 
+    $self->extract_hints;
+    local @Parent = @Parent;    # Protect against non-local exits
+    $self->extract_PARENT;
+    $self->extract_ARGV(\@ARGV);
+    $self->{NAME} ||= $self->guess_name;
+    warn "Warning: NAME must be a package name\n"
+      unless $self->{NAME} =~ m!^[A-Z_a-z][0-9A-Z_a-z]*(?:::[0-9A-Z_a-z]+)*$!;
+    ($self->{NAME_SYM} = $self->{NAME}) =~ s/\W+/_/g;
+
     # Cleanup all the module requirement bits
     my $cmrstash = $self->clean_versions;
-
     $self->_PREREQ_PRINT if "@ARGV" =~ /\bPREREQ_PRINT\b/;
     $self->_PRINT_PREREQ if "@ARGV" =~ /\bPRINT_PREREQ\b/; # RedHatism.
-
     if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}) {
         check_manifest();
     }
-
-    $self->extract_hints;
-
     $self->check_min_perl_version;
     my $unsatisfied_prereqs = $self->check_prereqs($cmrstash);
-    my ($initial_att, $configure_att) = $self->extract_CONFIGURE;
-
-    local @Parent = @Parent;    # Protect against non-local exits
-    $self->extract_PARENT;
-
-    $self->extract_ARGV(\@ARGV);
-
     $self->check_PREREQ_FATAL($unsatisfied_prereqs); # after ARGV processed
-
-    $self->{NAME} ||= $self->guess_name;
-    warn "Warning: NAME must be a package name\n"
-      unless $self->{NAME} =~ m!^[A-Z_a-z][0-9A-Z_a-z]*(?:::[0-9A-Z_a-z]+)*$!;
-    ($self->{NAME_SYM} = $self->{NAME}) =~ s/\W+/_/g;
-
-    for my $method (@init_methods) { $self->$method }
-
+    # CONFIGURE after PREREQ_FATAL so can rely on prereqs being present
+    my ($initial_att, $configure_att) = $self->extract_CONFIGURE;
     $self->arch_check(
         $INC{'Config.pm'},
         File::Spec->catfile($Config{'archlibexp'}, "Config.pm")
     );
 
+    for my $method (@init_methods) { $self->$method }
     $self->makefile_preamble(\@ARGV, $initial_att, $configure_att);
     $self->generate_makefile;
 

t/prereq.t

@@ -9,7 +9,7 @@ BEGIN {
 
 use strict;
 use Config;
-use Test::More tests => 19;
+use Test::More tests => 18;
 use File::Temp qw[tempdir];
 
 use TieOut;
@@ -163,17 +163,14 @@ MakeMaker FATAL: prerequisites not found.
 Please install these modules first and rerun 'perl Makefile.PL'.
 END
 
-
-    $warnings = '';
+    # don't care about warnings here, only the die()
     @ARGV = 'PREREQ_FATAL=1';
     eval {
         WriteMakefile(
             NAME => 'Big::Dummy',
             PREREQ_PM => { "I::Do::Not::Exist" => 0, },
         );
     };
-    is $warnings, "Warning: prerequisite I::Do::Not::Exist 0 not found.\n",
-      'CLI PREREQ_FATAL warns';
     isnt $@, '', "CLI PREREQ_FATAL works";
 
 }