- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
{
my $rest = $3;
my $untouched = $1;
my $sub = "";
# Ignore recursive definitions of variables
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+ my $m2 = $2;
+ my $var2 = $varhash{$m2};
+ $sub = $var2 if defined $var2 and $var2 !~ /\$\{?\Q$m2\E\}?/;
--- intltool- update. in.orig 2018-09-21 13:34:51.366910791 -0700
+++ intltool-update.in 2018-09-21 13:32:49.378908000 -0700
@@ -1062,13 +1062,15 @@ sub SubstituteVariable
}
}
- if ($str =~ /^(.*)\ ${?([A- Z_]+)}? (.*)$/) $\{?([A- Z_]+)}? (.*)$/)
+ if ($str =~ /^(.*)\
{
my $rest = $3;
my $untouched = $1;
my $sub = "";
# Ignore recursive definitions of variables
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+ my $m2 = $2;
+ my $var2 = $varhash{$m2};
+ $sub = $var2 if defined $var2 and $var2 !~ /\$\{?\Q$m2\E\}?/;
return SubstituteVariable ("$untouched$ sub$rest" );
}
@@ -1190,10 +1192,10 @@ sub FindPackageName
$name =~ s/\(+$//g;
$version =~ s/\(+$//g;
- $varhash{ "PACKAGE_ NAME"} = $name if (not $name =~ /\${?AC_ PACKAGE_ NAME}?/ ); "PACKAGE_ VERSION" } = $version if (not $name =~ /\${?AC_ PACKAGE_ VERSION} ?/); "PACKAGE_ NAME"} = $name if (not $name =~ /\$\{?AC_ PACKAGE_ NAME}?/ ); "PACKAGE_ VERSION" } = $version if (not $name =~ /\$\{?AC_ PACKAGE_ VERSION} ?/);
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
- $varhash{
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+ $varhash{
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+ $varhash{
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
}
if ($conf_source =~ /^AC_INIT\ (([^,\) ]+),([^ ,\)]+)[ ,]?([^, \)]+)?/ m)
@@ -1219,11 +1221,11 @@ sub FindPackageName
$version =~ s/\(+$//g;
$bugurl =~ s/\(+$//g if (defined $bugurl);
- $varhash{ "PACKAGE_ NAME"} = $name if (not $name =~ /\${?AC_ PACKAGE_ NAME}?/ ); "PACKAGE_ VERSION" } = $version if (not $name =~ /\${?AC_ PACKAGE_ VERSION} ?/); "PACKAGE_ BUGREPORT" } = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); "PACKAGE_ NAME"} = $name if (not $name =~ /\$\{?AC_ PACKAGE_ NAME}?/ ); "PACKAGE_ VERSION" } = $version if (not $name =~ /\$\{?AC_ PACKAGE_ VERSION} ?/); "PACKAGE_ BUGREPORT" } = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
- $varhash{
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
- $varhash{
+ $varhash{
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+ $varhash{
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+ $varhash{
}
# \s makes this not work, why? gcc-13. 1.0-pps- 8.21.0: xtools@ xenon15: ~/build/ eng/pps/ branches/ 8.21.0/ tools/xtools]
[x86_64/