From d3a2a8d0e41397bc86fc35900fc1b99d2d41be2e Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 23 Feb 2012 20:41:10 +0100 Subject: [PATCH] aclocal: do not quote `like this', as per GCS recommendation * aclocal.in: Convert comments, diagnostic and help screen to the use of new quoting format 'like this' or "like this" rather than `like this'. --- aclocal.in | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/aclocal.in b/aclocal.in index 5e7475ffa..70ce0c09c 100644 --- a/aclocal.in +++ b/aclocal.in @@ -54,9 +54,9 @@ $perl_threads = 0; # automake macros, and finally the system-wide directories for # third-party macros. # @user_includes can be augmented with -I. -# @automake_includes can be reset with the `--automake-acdir' option. -# @system_includes can be augmented with the `dirlist' file or the -# ACLOCAL_PATH environment variable, and reset with the `--system-acdir' +# @automake_includes can be reset with the '--automake-acdir' option. +# @system_includes can be augmented with the 'dirlist' file or the +# ACLOCAL_PATH environment variable, and reset with the '--system-acdir' # option. my @user_includes = (); my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); @@ -128,9 +128,9 @@ my %serial = (); # AC_DEFUN([macroname], ...) # or # AC_DEFUN(macroname, ...) -# When macroname is `['-quoted , we accept any character in the name, -# except `]'. Otherwise macroname stops on the first `]', `,', `)', -# or `\n' encountered. +# When macroname is '['-quoted , we accept any character in the name, +# except ']'. Otherwise macroname stops on the first ']', ',', ')', +# or '\n' encountered. my $ac_defun_rx = "(?:AU_ALIAS|A[CU]_DEFUN|AC_DEFUN_ONCE)\\((?:\\[([^]]+)\\]|([^],)\n]+))"; @@ -164,7 +164,7 @@ sub unlink_tmp } if (defined $erase_me && -e $erase_me && !unlink ($erase_me)) { - fatal "could not remove `$erase_me': $!"; + fatal "could not remove '$erase_me': $!"; } undef $erase_me; @@ -185,7 +185,7 @@ sub check_acinclude () foreach my $key (keys %map) { # FIXME: should print line number of acinclude.m4. - msg ('syntax', "macro `$key' defined in acinclude.m4 but never used") + msg ('syntax', "macro '$key' defined in acinclude.m4 but never used") if $map{$key} eq 'acinclude.m4' && ! exists $macro_seen{$key}; } } @@ -219,12 +219,12 @@ sub install_file ($$) { if (-e $dest) { - msg 'note', "overwriting `$dest' with `$src'"; + msg 'note', "overwriting '$dest' with '$src'"; $diff_dest = $dest; } else { - msg 'note', "installing `$dest' from `$src'"; + msg 'note', "installing '$dest' from '$src'"; } if (@diff_command) @@ -312,7 +312,7 @@ sub scan_m4_dirs ($@) { if (! opendir (DIR, $m4dir)) { - fatal "couldn't open directory `$m4dir': $!"; + fatal "couldn't open directory '$m4dir': $!"; } # We reverse the directory contents so that foo2.m4 gets @@ -416,7 +416,7 @@ sub scan_configure_dep ($) while (/$m4_include_rx/go) { my $ifile = $2 || $3; - # Skip missing `sinclude'd files. + # Skip missing 'sinclude'd files. next if $1 ne 'm4_' && ! -f $ifile; push @ilist, $ifile; } @@ -436,7 +436,7 @@ sub scan_configure_dep ($) # Make this just a warning, because we do not know whether # the macro is actually used (it could be called conditionally). msg ('unsupported', "$file:$line", - "macro `$2' not found in library"); + "macro '$2' not found in library"); } } @@ -483,7 +483,7 @@ sub scan_file ($$$) $file_type{$file} = $type; - fatal "$where: file `$file' does not exist" if ! -e $file; + fatal "$where: file '$file' does not exist" if ! -e $file; my $fh = new Automake::XFile $file; my $contents = ''; @@ -496,7 +496,7 @@ sub scan_file ($$$) while ($_ = $fh->getline) { - # Ignore `##' lines. + # Ignore '##' lines. next if /^##/; $contents .= $_; @@ -508,7 +508,7 @@ sub scan_file ($$$) if ($number !~ /$serial_number_rx/go) { msg ('syntax', "$file:$.", - "ill-formed serial number `$number', " + "ill-formed serial number '$number', " . "expecting a version string with only digits and dots"); } elsif ($defun_seen) @@ -596,7 +596,7 @@ sub scan_file ($$$) while ($line =~ /$m4_include_rx/go) { my $ifile = $2 || $3; - # Skip missing `sinclude'd files. + # Skip missing 'sinclude'd files. next if $1 ne 'm4_' && ! -f $ifile; push (@inc_files, $ifile); $inc_lines{$ifile} = $.; @@ -612,7 +612,7 @@ sub scan_file ($$$) $file_contents{$file} = $contents; # For some reason I don't understand, it does not work - # to do `map { scan_file ($_, ...) } @inc_files' below. + # to do "map { scan_file ($_, ...) } @inc_files" below. # With Perl 5.8.2 it undefines @inc_files. my @copy = @inc_files; my @all_inc_files = (@inc_files, @@ -755,7 +755,7 @@ sub write_aclocal ($@) # If the file to add looks like outside the project, copy it # to the output. The regex catches filenames starting with - # things like `/', `\', or `c:\'. + # things like '/', '\', or 'c:\'. if ($file_type{$file} != FT_USER || $file =~ m,^(?:\w:)?[\\/],) { @@ -805,12 +805,12 @@ m4_if(m4_defn([AC_AUTOCONF_VERSION]), [$ac_version],, [m4_warning([this file was generated for autoconf $ac_version. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) $output"; } - # We used to print `# $output_file generated automatically etc.' But + # We used to print "# $output_file generated automatically etc." But # this creates spurious differences when using autoreconf. Autoreconf # creates aclocal.m4t and then rename it to aclocal.m4, but the # rebuild rules generated by Automake create aclocal.m4 directly -- @@ -857,7 +857,7 @@ $output"; { if (-e $output_file && !unlink $output_file) { - fatal "could not remove `$output_file': $!"; + fatal "could not remove '$output_file': $!"; } my $out = new Automake::XFile "> $output_file"; print $out $output; @@ -872,9 +872,10 @@ sub usage ($) { my ($status) = @_; - print "Usage: aclocal [OPTION]... + print <<'EOF'; +Usage: aclocal [OPTION]... -Generate `aclocal.m4' by scanning `configure.ac' or `configure.in' +Generate 'aclocal.m4' by scanning 'configure.ac' or 'configure.in' Options: --automake-acdir=DIR directory holding automake-provided m4 files @@ -894,18 +895,17 @@ Options: -W, --warnings=CATEGORY report the warnings falling in CATEGORY Warning categories include: - `syntax' dubious syntactic constructs (default) - `unsupported' unknown macros (default) - `all' all the warnings (default) - `no-CATEGORY' turn off warnings in CATEGORY - `none' turn off all the warnings - `error' treat warnings as errors - -" . 'Report bugs to <@PACKAGE_BUGREPORT@>. + syntax dubious syntactic constructs (default) + unsupported unknown macros (default) + all all the warnings (default) + no-CATEGORY turn off warnings in CATEGORY + none turn off all the warnings + error treat warnings as errors + +Report bugs to <@PACKAGE_BUGREPORT@>. GNU Automake home page: <@PACKAGE_URL@>. General help using GNU software: . -'; - +EOF exit $status; } @@ -929,7 +929,7 @@ EOF # the public (unversioned) system directory. This usage is obsolete. sub handle_acdir_option ($$) { - msg 'obsolete', '', "`--acdir' is deprecated\n"; + msg 'obsolete', '', "'--acdir' is deprecated\n"; @system_includes = ($_[1]); @automake_includes = (); } @@ -981,7 +981,7 @@ sub parse_arguments () . "\nfirst -I option, but no -I was supplied"); } - # Finally, adds any directory listed in the `dirlist' file. + # Finally, adds any directory listed in the 'dirlist' file. if (open (DIRLIST, "$system_includes[0]/dirlist")) { while () @@ -1000,7 +1000,7 @@ sub parse_arguments () } } -# Add any directory listed in the `ACLOCAL_PATH' environment variable +# Add any directory listed in the 'ACLOCAL_PATH' environment variable # to the list of system include directories. sub parse_ACLOCAL_PATH () { -- 2.47.2