FindExt::scan_ext("../ext");
FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
+my @dynamic_ext = grep(!/Thread/,FindExt::dynamic_ext());
+my @extensions = grep(!/Thread/,FindExt::extensions());
$opt{'nonxs_ext'} = join(' ',FindExt::nonxs_ext()) || ' ';
$opt{'static_ext'} = join(' ',FindExt::static_ext()) || ' ';
-$opt{'dynamic_ext'} = join(' ',FindExt::dynamic_ext()) || ' ';
-$opt{'extensions'} = join(' ',FindExt::extensions()) || ' ';
+$opt{'dynamic_ext'} = join(' ',@dynamic_ext) || ' ';
+$opt{'extensions'} = join(' ',@extensions) || ' ';
$opt{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
my $pl_h = '../patchlevel.h';
$opt{'version_patchlevel_string'} = "version $opt{PERL_VERSION} subversion $opt{PERL_SUBVERSION}";
$opt{'version_patchlevel_string'} .= " patchlevel $opt{PERL_PATCHLEVEL}" if exists $opt{PERL_PATCHLEVEL};
+$opt{'osvers'} = join '.', (Win32::GetOSVersion())[1,2];
+
+if (exists $opt{cc}) {
+ # cl and bcc32 version detection borrowed from Test::Smoke's configsmoke.pl
+ if ($opt{cc} eq 'cl') {
+ my $output = `cl --version 2>&1`;
+ $opt{ccversion} = $output =~ /^.*Version\s+([\d.]+)/ ? $1 : '?';
+ }
+ elsif ($opt{cc} eq 'bcc32') {
+ my $output = `bcc32 --version 2>&1`;
+ $opt{ccversion} = $output =~ /([\d.]+)/ ? $1 : '?';
+ }
+ elsif ($opt{cc} eq 'gcc') {
+ chomp($opt{gccversion} = `gcc -dumpversion`);
+ }
+}
+
$opt{'cf_by'} = $ENV{USERNAME} unless $opt{'cf_by'};
$opt{'cf_email'} = $opt{'cf_by'} . '@' . (gethostbyname('localhost'))[0]
unless $opt{'cf_email'};