X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/b89d399a31373fa709aa1afa4ee04b52768ea37b..d38f6844f6115251e4fe0705e9b721f08bebf22b:/Porting/checkcfgvar.pl

diff --git a/Porting/checkcfgvar.pl b/Porting/checkcfgvar.pl
index 1db53d7..6f4e7d0 100644
--- a/Porting/checkcfgvar.pl
+++ b/Porting/checkcfgvar.pl
@@ -30,6 +30,7 @@ my @CFG = (
 	   "win32/config.gc",
 	   "win32/config.vc",
 	   "win32/config.vc64",
+	   "win32/config.ce",
 	   "wince/config.ce",
 	   "configure.com",
 	  );
@@ -49,8 +50,7 @@ sub read_file {
 sub config_h_SH_reader {
     my $cfg = shift;
     return sub {
-	return if 1../^echo \"Extracting \$CONFIG_H/;
-	while (/[^\\]\$(\w+)/g) {
+	while (/[^\\]\$([a-z]\w+)/g) {
 	    my $v = $1;
 	    next if $v =~ /^(CONFIG_H|CONFIG_SH)$/;
 	    $cfg->{$v}++;
@@ -86,8 +86,10 @@ for my $cfg (@CFG) {
     read_file($cfg,
 	      sub {
 		  return if /^\#/ || /^\s*$/;
-		  return if $cfg eq 'configure.com' &&
-			    ! /^\$\s+WC "(\w+)='(.*)'"$/;
+		  if ($cfg eq 'configure.com') {
+		      s/(\s*!.*|\s*)$//; # remove trailing comments or whitespace
+		      return if ! /^\$\s+WC "(\w+)='(.*)'"$/;
+		  }
 		  # foo='bar'
 		  # foo=bar
 		  # $foo='bar' # VOS 5.8.x specialty
@@ -104,5 +106,8 @@ for my $cfg (@CFG) {
 		      warn "$cfg:$.:$_";
 		  }
 	      });
+    if ($cfg eq 'configure.com') {
+	$cfg{startperl}++; # Cheat.
+    }
     check_cfg($cfg, \%cfg);
 }