use warnings;
my $no = join('|',qw(GDBM_File ODBM_File NDBM_File DB_File
- VMS VMS-DCLsym VMS-Stdio Sys-Syslog IPC-SysV I18N-Langinfo));
+ VMS.* Sys-Syslog IPC-SysV I18N-Langinfo));
$no = qr/^(?:$no)$/i;
sub apply_config {
# duplicates logic from Configure (mostly)
push @no, "DB_File" unless $config->{i_db};
push @no, "GDBM_File" unless $config->{i_gdbm};
- push @no, "I18N-Langinfo" unless $config->{i_langinfo} && $config->{i_nl_langinfo};
+ push @no, "I18N-Langinfo" unless $config->{i_langinfo} && $config->{d_nl_langinfo};
push @no, "IPC-SysV" unless $config->{d_msg} || $config->{d_sem} || $config->{d_shm};
push @no, "NDBM_File" unless $config->{d_ndbm};
push @no, "ODBM_File"
}
}
-sub scan_ext
-{
- my $dir = shift;
- find_ext("$dir/");
- extensions();
-}
-
sub _ext_eq {
my $key = shift;
sub {
*static_ext = _ext_eq('static');
*nonxs_ext = _ext_eq('nonxs');
-sub _ext_ne {
- my $key = shift;
- sub {
- sort grep $ext{$_} ne $key, keys %ext;
- }
+sub extensions {
+ sort grep $ext{$_} ne 'known', keys %ext;
}
-*extensions = _ext_ne('known');
-# faithfully copy Configure in not including nonxs extensions for the nonce
-*known_extensions = _ext_ne('nonxs');
+sub known_extensions {
+ sort keys %ext;
+}
sub is_static
{
}
# Function to find available extensions, ignoring DynaLoader
-sub find_ext
+sub scan_ext
{
my $ext_dir = shift;
opendir my $dh, "$ext_dir";
while (defined (my $item = readdir $dh)) {
next if $item =~ /^\.\.?$/;
next if $item eq "DynaLoader";
- next unless -d "$ext_dir$item";
+ next unless -d "$ext_dir/$item";
my $this_ext = $item;
my $leaf = $item;
$this_ext =~ s!-!/!g;
$leaf =~ s/.*-//;
+ # List/Util.xs lives in Scalar-List-Utils, Cwd.xs lives in PathTools
+ $this_ext = 'List/Util' if $this_ext eq 'Scalar/List/Utils';
+ $this_ext = 'Cwd' if $this_ext eq 'PathTools';
+
# Temporary hack to cope with smokers that are not clearing directories:
next if $ext{$this_ext};
- if (has_xs_or_c("$ext_dir$item")) {
+ if (has_xs_or_c("$ext_dir/$item")) {
$ext{$this_ext} = $static{$this_ext} ? 'static' : 'dynamic';
} else {
$ext{$this_ext} = 'nonxs';
}
- $ext{$this_ext} = 'known' if $ext{$this_ext} && $item =~ $no;
+ $ext{$this_ext} = 'known' if $item =~ $no;
}
}