Skip to content

Commit d9d0a15

Browse files
committedFeb 1, 2015
Handle updated glibtoolize (OSX) name in --version
1 parent 2cd8880 commit d9d0a15

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed
 

‎autogen.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ my(\$path,\$name)=@ARGV;
120120
exit 0 if !-f \$path;
121121
die "\$prog: \$path not found\n" if !-r \$path;
122122
123-
my \$mname=\$name; \$mname =~ s/^g(libtoolize)\$/\$1/;
123+
# Remove leading g and make it optional for glibtoolize etc.
124+
my \$mname=\$name; \$mname =~ s/^g//;
124125
125126
my(@vnums);
126127
for my \$varg (qw(--version -version)) {
@@ -129,7 +130,8 @@ for my \$varg (qw(--version -version)) {
129130
while(<PIPE>) {
130131
chomp;
131132
next if @vnums; # drain pipe if we got a vnums
132-
next unless /^\$mname/i;
133+
# Add optional leading g
134+
next unless /^g?\$mname/i;
133135
my(\$v)=/(\S+)\$/i; \$v =~ s/-.*\$//;
134136
@vnums=grep { defined \$_ && !/^\s*\$/} map { s/\D//g; \$_; } split(/\./, \$v);
135137
}

0 commit comments

Comments
 (0)
Please sign in to comment.