Move ExtUtils::ParseXS from lib to ext.

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / MM.pm

diff --git a/lib/ExtUtils/MM.pm b/lib/ExtUtils/MM.pm
index 04195ee..4694f3f 100644 (file)
--- a/lib/ExtUtils/MM.pm
+++ b/lib/ExtUtils/MM.pm
@@ -3,7 +3,7 @@ package ExtUtils::MM;
 use strict;
 use ExtUtils::MakeMaker::Config;
 
-our $VERSION = '6.48';
+our $VERSION = '6.55_02';
 
 require ExtUtils::Liblist;
 require ExtUtils::MakeMaker;
@@ -44,8 +44,9 @@ away.
 sub _is_win95 {
     # miniperl might not have the Win32 functions available and we need
     # to run in miniperl.
-    return defined &Win32::IsWin95 ? Win32::IsWin95() 
-                                   : ! defined $ENV{SYSTEMROOT}; 
+    my $have_win32 = eval { require Win32 };
+    return $have_win32 && defined &Win32::IsWin95 ? Win32::IsWin95()
+                                                  : ! defined $ENV{SYSTEMROOT};
 }
 
 my %Is = ();
@@ -58,7 +59,7 @@ if( $^O eq 'MSWin32' ) {
 $Is{UWIN}   = $^O =~ /^uwin(-nt)?$/;
 $Is{Cygwin} = $^O eq 'cygwin';
 $Is{NW5}    = $Config{osname} eq 'NetWare';  # intentional
-$Is{BeOS}   = $^O =~ /beos/i;    # XXX should this be that loose?
+$Is{BeOS}   = ($^O =~ /beos/i or $^O eq 'haiku');
 $Is{DOS}    = $^O eq 'dos';
 if( $Is{NW5} ) {
     $^O = 'NetWare';