X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/372a31d8f53707bcfa9c233ce02a93f778b7bb4b..9a5c46146d935367e11adc26f66953ee0f87ef6e:/configpm?ds=sidebyside diff --git a/configpm b/configpm index 250f5ce..0be40f9 100755 --- a/configpm +++ b/configpm @@ -75,7 +75,7 @@ my %Extensions = map {($_,$_)} # This is the list from MM_VMS, plus pad.h, parser.h, perlsfio.h utf8.h # which it installs. It *doesn't* install perliol.h - FIXME. my @header_files = qw(EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h - embed.h embedvar.h form.h gv.h handy.h hv.h intrpvar.h + embed.h embedvar.h form.h gv.h handy.h hv.h hv_func.h intrpvar.h iperlsys.h keywords.h mg.h nostdio.h op.h opcode.h pad.h parser.h patchlevel.h perl.h perlio.h perlsdio.h perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h @@ -228,7 +228,7 @@ EOT my %export_ok = eval $export_funcs or die; -$config_txt .= sprintf << 'EOT', $export_funcs; +$config_txt .= sprintf << 'EOT', $], $export_funcs; # This file was created by configpm when Perl was built. Any changes # made to this file will be lost the next time perl is built. @@ -239,7 +239,9 @@ $config_txt .= sprintf << 'EOT', $export_funcs; package Config; use strict; use warnings; -use vars '%%Config'; +use vars '%%Config', '$VERSION'; + +$VERSION = "%s"; # Skip @Config::EXPORT because it only contains %%Config, which we special # case below as it's not a function. @Config::EXPORT won't change in the @@ -1135,10 +1137,7 @@ EOS unshift(@INC,'lib'); unshift(@INC,'xlib/symbian') if $Opts{cross}; require $Config_PM; - if (!eval {require $Config_heavy}) { - open my $fh, "<", $Config_heavy; - print STDERR while <$fh>; - } +require $Config_heavy; import Config; die "$0: $Config_PM not valid"