gather-accelerator-contexts.pl parses options, and the top_srcdir must

now be specified as --srcdir=top_srcdir (or --source-directory=top_srcdir
or -S top_srcdir).  Changed po/Makefile to match.
This option can even be repeated; that resolves a BUGS item.
Changed po/Makefile to ignore exit codes from check-accelerator-contexts.pl.
Enabled bundling of options in Getopt::Long so that -Stop_srcdir works too.

po/Makefile

@@ -59,7 +59,7 @@ $(srcdir)$(PACKAGE).pot: $(srcdir)$(POTFILES_ABS_LIST) $(srcdir)perl/gather-acce
 		    --add-comments --language=C \
 		    --keyword=_ --keyword=N_ --keyword=n_:1,2 --keyword=N__ -f $(srcdir)$(POTFILES_ABS_LIST) \
 	&& test -f $(PACKAGE).po \
-	&& $(PERL) -I"$(srcdir)perl" $(srcdir)perl/gather-accelerator-contexts.pl $(top_srcdir) $(PACKAGE).po \
+	&& $(PERL) -I"$(srcdir)perl" $(srcdir)perl/gather-accelerator-contexts.pl -S"$(top_srcdir)" $(PACKAGE).po \
 	&& mv -f $(PACKAGE).po $(srcdir)$(PACKAGE).pot
 
 
@@ -91,7 +91,7 @@ update-gmo: Makefile $(GMOFILES)
 #
 
 check-po:
-	@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \
+	@-$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \
 	  echo -n "$(lang): "; \
 	  $(GMSGFMT) --check --check-accelerators="~" --verbose --statistics -o /dev/null $(srcdir)$(lang).po; \
 	  $(PERL) -I"$(srcdir)perl" $(srcdir)perl/check-accelerator-contexts.pl $(srcdir)$(lang).po; \

po/perl/check-accelerator-contexts.pl

@@ -4,11 +4,18 @@
 use strict;
 use warnings;
 use Locale::PO qw();
-use Getopt::Long qw(GetOptions);
+use Getopt::Long qw(GetOptions :config bundling gnu_compat);
 use autouse 'Pod::Usage' => qw(pod2usage);
 
 my $VERSION = "1.0";
 
+sub show_version
+{
+    print "check-accelerator-contexts.pl $VERSION\n";
+    pod2usage({-verbose => 99, -sections => "COPYRIGHT AND LICENSE",
+	       -exitval => 0});
+}
+
 sub check_po_file
 {
     my($po_file_name) = @_;
@@ -49,13 +56,6 @@ sub check_po_file
     return $warnings ? 1 : 0;
 }
 
-sub show_version
-{
-    print "check-accelerator-contexts.pl $VERSION\n";
-    pod2usage({-verbose => 99, -sections => "COPYRIGHT AND LICENSE",
-	       -exitval => 0});
-}
-
 GetOptions("help" => sub { pod2usage({-verbose => 1, -exitval => 0}) },
 	   "version" => \&show_version)
     or exit 2;

po/perl/gather-accelerator-contexts.pl

@@ -1,7 +1,21 @@
 #! /usr/bin/perl
+# The copyright notice and license are in the POD at the bottom.
+
 use strict;
 use warnings;
 use Locale::PO qw();
+use Getopt::Long qw(GetOptions :config bundling gnu_compat);
+use autouse 'Pod::Usage' => qw(pod2usage);
+use autouse 'File::Spec::Functions' => qw(catfile);
+
+my $VERSION = "1.0";
+
+sub show_version
+{
+    print "gather-accelerator-contexts.pl $VERSION\n";
+    pod2usage({-verbose => 99, -sections => "COPYRIGHT AND LICENSE",
+	       -exitval => 0});
+}
 
 {
     package Contextline;
@@ -15,49 +29,80 @@ use Locale::PO qw();
     }
 }
 
+my @Srcpath;
+
 # Each key is a file name.
 # Each value is a reference to an array of references to Contextline
 # pseudo-hashes.  The array is in ascending order by {lineno}.
 my %Srcfiles;
 
-# Scan the $srcfile for gettext_accelerator_context directives,
+sub open_file_on_path ($@)
-# cache the result in %Srcfiles, and return it in that format.
-sub contextlines ($$)
 {
-    my($top_srcdir, $srcfile) = @_;
+    my($fname, @path) = @_;
-    return $Srcfiles{$srcfile} if exists($Srcfiles{$srcfile});
+    if (@path) {
+	my @warnings;
+	foreach my $dir (@path) {
+	    my $full_fname = catfile($dir, $fname);
+	    if (open my $fh, "<", $full_fname) {
+		return($fh, $full_fname);
+	    } else {
+		push @warnings, "$full_fname: $!\n";
+	    }
+	}
+	# Didn't find $name anywhere on @path.
+	warn $_ foreach @warnings;
+	return;
+    } else {			# no path
+	if (open my $fh, "<", $fname) {
+	    return($fh, $fname);
+	} else {
+	    warn "$fname: $!\n";
+	    return;
+	}
+    }
+    # not reached
+}
 
-    local $_;
+# Scan the file $src_fname for gettext_accelerator_context directives,
+# cache the result in %Srcfiles, and return it in that format.
+# Cache and return [] if the file cannot be read on @Srcpath.
+sub contextlines ($)
+{
+    my($src_fname) = @_;
+    return $Srcfiles{$src_fname} if exists($Srcfiles{$src_fname});
     my @contextlines = ();
+
+    if (my($src_fh, $src_full_fname) = open_file_on_path($src_fname, @Srcpath)) {
 	my @prevctxs;
-    open my $srcfd, "<", "$top_srcdir/$srcfile" or die "$top_srcdir/$srcfile: $!";
+	local $_;
-    while (<$srcfd>) {
+	while (<$src_fh>) {
 	    chomp;
 	    if (/^\}/ && @prevctxs) {
 		push @contextlines, Contextline->new($., [@prevctxs = ()]);
 	    }
 	    if (my($contexts) = /\[gettext_accelerator_context\(([^()]*)\)\]/) {
 		my @contexts = grep { $_ ne "" } split(/\s*,\s*/, $contexts);
-	    foreach (@contexts) { s/^\./${srcfile}:/ }
+		s/^\./${src_fname}:/ foreach @contexts;
-	    warn "$srcfile:$.: Previous context not closed\n"
+		warn "$src_full_fname:$.: Previous context not closed\n"
 		    if @prevctxs && @contexts;
-	    warn "$srcfile:$.: Context already closed\n"
+		warn "$src_full_fname:$.: Context already closed\n"
 		    if !@prevctxs && !@contexts;
 		push @contextlines, Contextline->new($., [@prevctxs = @contexts]);
 	    } elsif (/gettext_accelerator_context/) {
-	    warn "$srcfile:$.: Suspicious non-directive: $_\n";
+		warn "$src_full_fname:$.: Suspicious non-directive: $_\n";
 	    }
 	}
-    warn "$srcfile:$.: Last context not closed\n" if @prevctxs;
+	warn "$src_full_fname:$.: Last context not closed\n" if @prevctxs;
+    } # if opened ok
 
-    return $Srcfiles{$srcfile} = \@contextlines;
+    return $Srcfiles{$src_fname} = \@contextlines;
 }
 
-sub contexts ($$$)
+sub contexts ($$)
 {
-    my($top_srcdir, $srcfile, $lineno) = @_;
+    my($srcfile, $lineno) = @_;
     # Could use a binary search here.
-    my $contextlines = contextlines($top_srcdir, $srcfile);
+    my $contextlines = contextlines($srcfile);
     my @contexts = ();
     foreach my Contextline $contextline (@{$contextlines}) {
 	return @contexts if $contextline->{lineno} > $lineno;
@@ -66,18 +111,10 @@ sub contexts ($$$)
     return ();
 }
 
-sub format_contexts (@)
+sub gather_accelerator_contexts ($$)
 {
-    if (@_) {
+    my($pos, $po_fname) = @_;
-	return "#. accelerator_context(" . join(", ", @_) . ")\n";
+    foreach my $po (@$pos) {
-    } else {
-	return "";
-    }
-}
-
-my($top_srcdir, $pofile) = @ARGV;
-my $pos = Locale::PO->load_file_asarray($pofile) or die "$pofile: $!";
-foreach my $po (@$pos) {
 	my $automatic = $po->automatic();
 	$automatic =~ s/^\[gettext_accelerator_context\(.*(?:\n|\z)//mg
 	    if defined($automatic);
@@ -87,7 +124,7 @@ foreach my $po (@$pos) {
 	    foreach my $ref (split(' ', $po->reference())) {
 		my @parts = split(/\:/, $ref);
 		warn "weird reference: $ref\n", next unless @parts == 2;
-	    my @ref_contexts = contexts($top_srcdir, $parts[0], $parts[1]);
+		my @ref_contexts = contexts($parts[0], $parts[1]);
 		if (@ref_contexts) {
 		    push @po_contexts, grep { $_ ne "IGNORE" } @ref_contexts;
 		} else {
@@ -102,8 +139,20 @@ foreach my $po (@$pos) {
 	    }
 	}
 	$po->automatic($automatic);
+    }
 }
-Locale::PO->save_file_fromarray($pofile, $pos) or die "$pofile: $!";
+
+GetOptions("srcdir|source-directory|S=s" => \@Srcpath,
+	   "help" => sub { pod2usage({-verbose => 1, -exitval => 0}) },
+	   "version" => \&show_version)
+    or exit 2;
+print(STDERR "$0: missing file operand\n"), exit 2 unless @ARGV;
+print(STDERR "$0: too many operands\n"), exit 2 if @ARGV > 1;
+
+my($po_fname) = @ARGV;
+my $pos = Locale::PO->load_file_asarray($po_fname) or die "$po_fname: $!";
+gather_accelerator_contexts($pos, $po_fname);
+Locale::PO->save_file_fromarray($po_fname, $pos) or die "$po_fname: $!";
 
 __END__
 
@@ -114,7 +163,7 @@ for detecting accelerator conflicts.
 
 =head1 SYNOPSIS
 
-B<gather-accelerator-contexts.pl> I<top_srcdir> F<I<program>.pot>
+B<gather-accelerator-contexts.pl> [B<-S>F<I<srcdir>>]... F<I<program>.pot>
 
 =head1 DESCRIPTION
 
@@ -195,14 +244,23 @@ an accelerator (e.g. in "~/.bashrc"), the warning can be silenced by
 specifying the special context "IGNORE", which
 B<gather-accelerator-contexts.pl> otherwise ignores.
 
-=head1 ARGUMENTS
+=head1 OPTIONS
 
 =over
 
-=item I<top_srcdir>
+=item B<-S>F<I<srcdir>>
 
 The directory to which the source references in "#:" lines are
-relative.
+relative.  Each use of this option adds one directory to the search
+path.  If you do not specify this option,
+B<gather-accelerator-contexts.pl> implicitly searches the current
+directory.
+
+=back
+
+=head1 ARGUMENTS
+
+=over
 
 =item F<I<program>.pot>
 
@@ -230,9 +288,6 @@ the beginning of a line marks the end of a function.
 B<gather-accelerator-contexts.pl> doesn't check whether the
 "gettext_accelerator_context" comments actually are comments.
 
-There should be a way to specify a source path, rather than just a
-single I<top_srcdir> directory.
-
 =head1 AUTHOR
 
 Kalle Olavi Niemitalo <kon@iki.fi>