[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.549,1.550

[Ken W. <kwi...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23292/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Don't die in have_c_compiler() when EU::CBuilder isn't around

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -d -r1.549 -r1.550
--- Base.pm	25 Feb 2006 03:51:27 -0000	1.549
+++ Base.pm	27 Feb 2006 02:29:50 -0000	1.550
@@ -3484,10 +3484,8 @@
   my $self = shift;
   my $p = $self->{properties};
   return $p->{_cbuilder} if $p->{_cbuilder};
+  return unless $self->_mb_feature('C_support');
 
-  die "Module::Build is not configured with C_support"
-    unless $self->_mb_feature('C_support');
-  
   require ExtUtils::CBuilder;
   return $p->{_cbuilder} = ExtUtils::CBuilder->new(config => $self->config);
 }
@@ -3499,14 +3497,16 @@
   return $p->{have_compiler} if defined $p->{have_compiler};
   
   $self->log_verbose("Checking if compiler tools configured... ");
-  my $have = $self->_cbuilder->have_compiler;
+  my $b = $self->_cbuilder;
+  my $have = $b && $b->have_compiler;
   $self->log_verbose($have ? "ok.\n" : "failed.\n");
   return $p->{have_compiler} = $have;
 }
 
 sub compile_c {
   my ($self, $file, %args) = @_;
-  my $b = $self->_cbuilder;
+  my $b = $self->_cbuilder
+    or die "Module::Build is not configured with C_support";
 
   my $obj_file = $b->object_file($file);
   $self->add_to_cleanup($obj_file);
@@ -3539,7 +3539,9 @@
   my $module_name = $self->module_name;
   $module_name  ||= $spec->{module_name};
 
-  $self->_cbuilder->link(
+  my $b = $self->_cbuilder
+    or die "Module::Build is not configured with C_support";
+  $b->link(
     module_name => $module_name,
     objects     => [$spec->{obj_file}, @$objects],
     lib_file    => $spec->{lib_file},