From: Ilya Zakharevich <ilya@math.berkeley.edu>
Date: Mon, 31 Dec 2001 17:48:55 +0000 (-0500)
Subject: h2xs broken
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9de3b7c3f04d243540e2a381092bf0f918b7fe9e;p=p5sagit%2Fp5-mst-13.2.git

h2xs broken
Message-Id: <20011231174855.A29128@math.ohio-state.edu>

p4raw-id: //depot/perl@13995
---

diff --git a/utils/h2xs.PL b/utils/h2xs.PL
index 1c7cf78..9b7584c 100644
--- a/utils/h2xs.PL
+++ b/utils/h2xs.PL
@@ -546,7 +546,7 @@ my %options = (
                 'const-subs|s=s'     => \$opt_s,
                 'default-type|t=s'   => \$opt_t,
                 'version|v=s'        => \$opt_v,
-                'autogen-xsubs|x=s'  => \$opt_x,
+                'autogen-xsubs|x'    => \$opt_x,
                 'use-new-tests'      => \$new_test,
                 'use-old-tests'      => \$old_test
               );
@@ -698,6 +698,7 @@ if( @path_h ){
       }
       if ($found) {
 	$rel_path_h = $path_h;
+	$fullpath{$path_h} = $fullpath;
       } else {
 	(my $epath = $module) =~ s,::,/,g;
 	$epath = File::Spec->catdir('ext', $epath) if -d 'ext';
@@ -729,7 +730,7 @@ if( @path_h ){
 	    s/\?\?</{/g;                         # | ??<|  {|
 	    s/\?\?>/}/g;                         # | ??>|  }|
 	}
-	if (/^[ \t]*#[ \t]*define\s+([\$\w]+)\b(?!\()\s*(?=[^" \t])(.*)/) {
+	if (/^[ \t]*#[ \t]*define\s+([\$\w]+)\b(?!\()\s*(?=[^"\s])(.*)/) {
 	    my $def = $1;
 	    my $rest = $2;
 	    $rest =~ s!/\*.*?(\*/|\n)|//.*!!g; # Remove comments