Updates from Tim's -m/-M/-V patch.

1 files changed, 144 insertions, 94 deletions

diff --git a/configpm b/configpm
index c5a4f63ef4..9bfeab5070 100755
--- a/configpm
+++ b/configpm
@@ -4,10 +4,12 @@ $config_pm = $ARGV[0] || 'lib/Config.pm';
 @ARGV = "./config.sh";
 
 # list names to put first (and hence lookup fastest)
-@fast = qw(osname osvers so libpth archlib
+@fast = qw(archname osname osvers prefix libs libpth
+	dynamic_ext static_ext extensions dlsrc so
+	sig_name cc ccflags cppflags
+	privlibexp archlibexp installprivlib installarchlib
 	sharpbang startsh shsharp
-	dynamic_ext static_ext extensions dl_src
-	sig_name ccflags cppflags intsize);
+);
 
 # names of things which may need to have slashes changed to double-colons
 @extensions = qw(dynamic_ext static_ext extensions known_extensions);
@@ -15,11 +17,13 @@ $config_pm = $ARGV[0] || 'lib/Config.pm';
 
 open CONFIG, ">$config_pm" or die "Can't open $config_pm: $!\n";
 $myver = sprintf("%.3f", $]);
+
 print CONFIG <<"ENDOFBEG";
 package Config;
-require Exporter;
+use Exporter ();
 \@ISA = (Exporter);
 \@EXPORT = qw(%Config);
+\@EXPORT_OK = qw(myconfig config_sh config_vars);
 
 \$] == $myver or die sprintf
     "Perl lib version ($myver) doesn't match executable version (%.3f)\\n", \$];
@@ -29,51 +33,6 @@ require Exporter;
 
 ENDOFBEG
 
-print CONFIG <<'EndOfPod';
-=head1 NAME
-
-Config - access Perl configuration option
-
-=head1 SYNOPSIS
-
-    use Config;
-    if ($Config{'cc'} =~ /gcc/) {
-	print "built by gcc\n";
-    } 
-
-=head1 DESCRIPTION
-
-The Config module contains everything that was available to the
-C<Configure> program at Perl build time.  Shell variables from
-F<config.sh> are stored in the readonly-variable C<%Config>, indexed by
-their names.
-
-=head1 EXAMPLE
-
-Here's a more sophisticated example of using %Config:
-
-    use Config;
-
-    defined $Config{sig_name} || die "No sigs?";
-    foreach $name (split(' ', $Config{sig_name})) {
-	$signo{$name} = $i;
-	$signame[$i] = $name;
-	$i++;
-    }   
-
-    print "signal #17 = $signame[17]\n";
-    if ($signo{ALRM}) { 
-	print "SIGALRM is $signo{ALRM}\n";
-    }   
-
-=head1 NOTE
-
-This module contains a good example of how to make a variable
-readonly to those outside of it.  
-
-=cut
-
-EndOfPod
 
 @fast{@fast} = @fast;
 @extensions{@extensions} = @extensions;
@@ -98,10 +57,31 @@ while (<>) {
 foreach(@non_v){ print CONFIG $_ }
 
 print CONFIG "\n",
-    "\$config_sh=<<'!END!OF!CONFIG!';\n",
+    "my \$config_sh = <<'!END!';\n",
     join("", @v_fast, sort @v_others),
-    "!END!OF!CONFIG!\n\n";
+    "!END!\n\n";
+
+# copy config summary format from the myconfig script
+
+print CONFIG "my \$summary = <<'!END!';\n";
+
+open(MYCONFIG,"<myconfig") || die "open myconfig failed: $!";
+1 while( ($_=<MYCONFIG>) !~ /^Summary of/);
+do { print CONFIG $_ } until ($_ = <MYCONFIG>) =~ /^\s*$/;
+close(MYCONFIG);
 
+print CONFIG "\n!END!\n", <<'EOT';
+my $summary_expanded = 0;
+
+sub myconfig {
+	return $summary if $summary_expanded;
+	$summary =~ s/\$(\w+)/$Config{$1}/ge;
+	$summary_expanded = 1;
+	$summary;
+}
+EOT
+
+# ----
 
 print CONFIG <<'ENDOFEND';
 
@@ -119,66 +99,136 @@ sub FETCH {
     return $value;
 }
  
+my $prevpos = 0;
+
 sub FIRSTKEY {
     $prevpos = 0;
-    my $key;
-    ($key) = $config_sh =~ m/^(.*)=/;
+    my($key) = $config_sh =~ m/^(.*?)=/;
     $key;
 }
 
 sub NEXTKEY {
-    my ($pos, $len);
-    $pos = $prevpos;
-    $pos = index( $config_sh, "\n", $pos) + 1;
+    my $pos = index($config_sh, "\n", $prevpos) + 1;
+    my $len = index($config_sh, "=", $pos) - $pos;
     $prevpos = $pos;
-    $len = index( $config_sh, "=", $pos) - $pos;
-    $len > 0 ? substr( $config_sh, $pos, $len) : undef;
+    $len > 0 ? substr($config_sh, $pos, $len) : undef;
 }
 
-sub EXISTS{ 
+sub EXISTS { 
      exists($_[0]->{$_[1]})  or  $config_sh =~ m/^$_[1]=/m; 
 }
 
-sub readonly { die "\%Config::Config is read-only\n" }
+sub STORE  { die "\%Config::Config is read-only\n" }
+sub DELETE { &STORE }
+sub CLEAR  { &STORE }
 
-sub myconfig {
-	my($output);
-	
-	$output = <<'END';
-Summary of my $package (patchlevel $PATCHLEVEL) configuration:
-  Platform:
-    osname=$osname, osver=$osvers, archname=$archname
-    uname='$myuname'
-    hint=$hint
-  Compiler:
-    cc='$cc', optimize='$optimize'
-    cppflags='$cppflags'
-    ccflags ='$ccflags'
-    ldflags ='$ldflags'
-    stdchar='$stdchar', d_stdstdio=$d_stdstdio, usevfork=$usevfork
-    voidflags=$voidflags, castflags=$castflags, d_casti32=$d_casti32, d_castneg=$d_castneg
-    intsize=$intsize, alignbytes=$alignbytes, usemymalloc=$usemymalloc, randbits=$randbits
-  Libraries:
-    so=$so
-    libpth=$libpth
-    libs=$libs
-    libc=$libc
-  Dynamic Linking:
-    dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun
-    cccdlflags='$cccdlflags', ccdlflags='$ccdlflags', lddlflags='$lddlflags'
-
-END
-	$output =~ s/\$(\w+)/$Config{$1}/ge;
-	$output;
+
+sub config_sh {
+    $config_sh
 }
+sub config_vars {
+    foreach(@_){
+	my $v=(exists $Config{$_}) ? $Config{$_} : 'UNKNOWN';
+	$v='undef' unless defined $v;
+	print "$_='$v';\n";
+    }
+}
+
+1;
+__END__
 
-sub STORE { &readonly }
-sub DELETE{ &readonly }
-sub CLEAR { &readonly }
+=head1 NAME
 
-sub config_sh { $config_sh }
+Config - access Perl configuration information
+
+=head1 SYNOPSIS
+
+    use Config;
+    if ($Config{'cc'} =~ /gcc/) {
+	print "built by gcc\n";
+    } 
+
+    use Config qw(myconfig config_sh config_vars);
+
+    print myconfig();
+
+    print config_sh();
+
+    config_vars(qw(osname archname));
+
+
+=head1 DESCRIPTION
+
+The Config module contains all the information that was available to
+the C<Configure> program at Perl build time (over 900 values).
+
+Shell variables from the F<config.sh> file (written by Configure) are
+stored in the readonly-variable C<%Config>, indexed by their names.
+
+Values stored in config.sh as 'undef' are returned as undefined
+values.  The perl C<exists> function can be used to check is a
+named variable exists.
+
+=over 4
+
+=item myconfig()
+
+Returns a textual summary of the major perl configuration values.
+See also C<-V> in L<perlrun/Switches>.
+
+=item config_sh()
+
+Returns the entire perl configuration information in the form of the
+original config.sh shell variable assignment script.
+
+=item config_vars(@names)
+
+Prints to STDOUT the values of the named configuration variable. Each is
+printed on a separate line in the form:
+
+  name='value';
+
+Names which are unknown are output as C<name='UNKNOWN';>.
+See also C<-V:name> in L<perlrun/Switches>.
+
+=back
+
+=head1 EXAMPLE
+
+Here's a more sophisticated example of using %Config:
+
+    use Config;
+
+    defined $Config{sig_name} || die "No sigs?";
+    foreach $name (split(' ', $Config{sig_name})) {
+	$signo{$name} = $i;
+	$signame[$i] = $name;
+	$i++;
+    }   
+
+    print "signal #17 = $signame[17]\n";
+    if ($signo{ALRM}) { 
+	print "SIGALRM is $signo{ALRM}\n";
+    }   
+
+=head1 WARNING
+
+Because this information is not stored within the perl executable
+itself it is possible (but unlikely) that the information does not
+relate to the actual perl binary which is being used to access it.
+
+The Config module is installed into the architecture and version
+specific library directory ($Config{installarchlib}) and it checks the
+perl version number when loaded.
+
+=head1 NOTE
+
+This module contains a good example of how to use tie to implement a
+cache and an example of how to make a tied variable readonly to those
+outside of it.
+
+=cut
 
-1;
 ENDOFEND
 
 close(CONFIG);