X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FExtUtils%2FMM.pm;h=8aaa55f15f2e4846fc54e9916d5c7a18b4bbefac;hb=a4fc7abc9c5502fa20253f620ede1e956c44caed;hp=3e98c9aaae454896134dbc555c6333ab64bc228f;hpb=011f1a1a00b94fe919083a224d5df636f05ae32a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/ExtUtils/MM.pm b/lib/ExtUtils/MM.pm
index 3e98c9a..8aaa55f 100644
--- a/lib/ExtUtils/MM.pm
+++ b/lib/ExtUtils/MM.pm
@@ -1,9 +1,9 @@
 package ExtUtils::MM;
 
 use strict;
-use Config;
+use ExtUtils::MakeMaker::Config;
 use vars qw(@ISA $VERSION);
-$VERSION = 0.04;
+$VERSION = '0.05';
 
 require ExtUtils::Liblist;
 require ExtUtils::MakeMaker;
@@ -44,25 +44,28 @@ away.
 }
 
 my %Is = ();
-$Is{VMS}    = 1 if $^O eq 'VMS';
-$Is{OS2}    = 1 if $^O eq 'os2';
-$Is{MacOS}  = 1 if $^O eq 'MacOS';
+$Is{VMS}    = $^O eq 'VMS';
+$Is{OS2}    = $^O eq 'os2';
+$Is{MacOS}  = $^O eq 'MacOS';
 if( $^O eq 'MSWin32' ) {
     Win32::IsWin95() ? $Is{Win95} = 1 : $Is{Win32} = 1;
 }
-$Is{UWIN}   = 1 if $^O eq 'uwin';
-$Is{Cygwin} = 1 if $^O eq 'cygwin';
-$Is{NW5}    = 1 if $Config{'osname'} eq 'NetWare';  # intentional
-$Is{BeOS}   = 1 if $^O =~ /beos/i;    # XXX should this be that loose?
-$Is{DOS}    = 1 if $^O eq 'dos';
-
-$Is{Unix}   = 1 if !keys %Is;
-
+$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{DOS}    = $^O eq 'dos';
 if( $Is{NW5} ) {
     $^O = 'NetWare';
     delete $Is{Win32};
 }
+$Is{VOS}    = $^O eq 'vos';
+$Is{QNX}    = $^O eq 'qnx';
+$Is{AIX}    = $^O eq 'aix';
+
+$Is{Unix}   = !grep { $_ } values %Is;
 
+map { delete $Is{$_} unless $Is{$_} } keys %Is;
 _assert( keys %Is == 1 );
 my($OS) = keys %Is;