Use ', not `, for quoting output.

* build-aux/announce-gen (usage, sizes, print_news_deltas)
(print_changelog_deltas, get_tool_versions, main program):
* build-aux/git-version-gen:
* build-aux/gitlog-to-changelog (usage, parse_amend_file):
* build-aux/move-if-change (help):
* build-aux/useless-if-before-free (usage, main program):
* check-module (parse_module_file, usage)
(find_included_lib_files, check_module):
* lib/argmatch.c (main) [TEST]:
* lib/argp-help.c (_help):
* lib/getopt1.c (main) [TEST]:
* lib/git-merge-changelog.c (usage):
* lib/xstrtol-error.c (xstrtol_error):
* m4/alloca.m4 (_AC_LIBOBJ_ALLOCA):
* m4/argz.m4 (gl_FUNC_ARGZ):
* m4/bison.m4 (gl_BISON):
* m4/calloc.m4 (gl_FUNC_CALLOC_GNU):
* m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS):
* m4/flexmember.m4 (AC_C_FLEXIBLE_ARRAY_MEMBER):
* m4/fpending.m4 (gl_PREREQ_FPENDING):
* m4/gc-random.m4 (gl_GC_RANDOM):
* m4/intl.m4 (gt_CHECK_DECL):
* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK):
* m4/longlong.m4 (AC_TYPE_LONG_LONG_INT)
(AC_TYPE_UNSIGNED_LONG_LONG_INT):
* m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS):
* m4/lstat.m4 (gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK):
* m4/onceonly.m4 (AC_CHECK_FUNCS_ONCE):
* m4/posixver.m4 (gl_DEFAULT_POSIX2_VERSION):
* tests/test-dirname.c (main):
* tests/test-getpass.c (main):
* tests/test-iconvme.c (main):
* tests/test-parse-datetime.c (LOG):
* tests/test-xstrtoimax.sh:
* tests/test-xstrtol.sh:
* tests/test-xstrtoll.sh:
* tests/test-xstrtoumax.sh:
* tests/unigbrk/test-uc-is-grapheme-break.c (main):
* top/GNUmakefile (abort-due-to-no-makefile):
Quote 'like this', not `like this', as per the recent change to
the GNU coding standards.

diff --git a/ChangeLog b/ChangeLog
index f1b744b..781e400 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+2012-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use ', not `, for quoting output.
+       * build-aux/announce-gen (usage, sizes, print_news_deltas)
+       (print_changelog_deltas, get_tool_versions, main program):
+       * build-aux/git-version-gen:
+       * build-aux/gitlog-to-changelog (usage, parse_amend_file):
+       * build-aux/move-if-change (help):
+       * build-aux/useless-if-before-free (usage, main program):
+       * check-module (parse_module_file, usage)
+       (find_included_lib_files, check_module):
+       * lib/argmatch.c (main) [TEST]:
+       * lib/argp-help.c (_help):
+       * lib/getopt1.c (main) [TEST]:
+       * lib/git-merge-changelog.c (usage):
+       * lib/xstrtol-error.c (xstrtol_error):
+       * m4/alloca.m4 (_AC_LIBOBJ_ALLOCA):
+       * m4/argz.m4 (gl_FUNC_ARGZ):
+       * m4/bison.m4 (gl_BISON):
+       * m4/calloc.m4 (gl_FUNC_CALLOC_GNU):
+       * m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS):
+       * m4/flexmember.m4 (AC_C_FLEXIBLE_ARRAY_MEMBER):
+       * m4/fpending.m4 (gl_PREREQ_FPENDING):
+       * m4/gc-random.m4 (gl_GC_RANDOM):
+       * m4/intl.m4 (gt_CHECK_DECL):
+       * m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK):
+       * m4/longlong.m4 (AC_TYPE_LONG_LONG_INT)
+       (AC_TYPE_UNSIGNED_LONG_LONG_INT):
+       * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS):
+       * m4/lstat.m4 (gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK):
+       * m4/onceonly.m4 (AC_CHECK_FUNCS_ONCE):
+       * m4/posixver.m4 (gl_DEFAULT_POSIX2_VERSION):
+       * tests/test-dirname.c (main):
+       * tests/test-getpass.c (main):
+       * tests/test-iconvme.c (main):
+       * tests/test-parse-datetime.c (LOG):
+       * tests/test-xstrtoimax.sh:
+       * tests/test-xstrtol.sh:
+       * tests/test-xstrtoll.sh:
+       * tests/test-xstrtoumax.sh:
+       * tests/unigbrk/test-uc-is-grapheme-break.c (main):
+       * top/GNUmakefile (abort-due-to-no-makefile):
+       Quote 'like this', not `like this', as per the recent change to
+       the GNU coding standards.
+
 2012-01-05  Bruno Haible  <bruno@clisp.org>
 
        strtoimax: Don't force a replacement on systems where intmax_t is int.

diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 4edcf89..572952e 100755 (executable)
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Generate a release announcement message.
 
-my $VERSION = '2011-12-25 18:26'; # UTC
+my $VERSION = '2012-01-06 07:21'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -44,7 +44,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try '$ME --help' for more information.\n";
     }
   else
     {
@@ -106,7 +106,7 @@ sub sizes (@)
       my $t = `$cmd`;
       # FIXME-someday: give a better diagnostic, a la $PROCESS_STATUS
       $@
-        and (warn "$ME: command failed: `$cmd'\n"), $fail = 1;
+        and (warn "$ME: command failed: '$cmd'\n"), $fail = 1;
       chomp $t;
       $t =~ s/^([\d.]+[MkK]).*/${1}B/;
       $res{$f} = $t;
@@ -222,9 +222,9 @@ sub print_news_deltas ($$$)
   close NEWS;
 
   $in_items
-    or die "$ME: $news_file: no matching lines for `$curr_version'\n";
+    or die "$ME: $news_file: no matching lines for '$curr_version'\n";
   $found_news
-    or die "$ME: $news_file: no news item found for `$curr_version'\n";
+    or die "$ME: $news_file: no news item found for '$curr_version'\n";
 }
 
 sub print_changelog_deltas ($$)
@@ -280,7 +280,7 @@ sub print_changelog_deltas ($$)
 
   my $cmd = "cvs -n diff -u -r$prev_cvs_tag -rHEAD @reordered";
   open DIFF, '-|', $cmd
-    or die "$ME: cannot run `$cmd': $!\n";
+    or die "$ME: cannot run '$cmd': $!\n";
   # Print two types of lines, making minor changes:
   # Lines starting with `+++ ', e.g.,
   # +++ ChangeLog   22 Feb 2003 16:52:51 -0000      1.247
@@ -310,7 +310,7 @@ sub print_changelog_deltas ($$)
   # The exit code should be 1.
   # Allow in case there are no modified ChangeLog entries.
   $? == 256 || $? == 128
-    or warn "$ME: warning: `$cmd' had unexpected exit code or signal ($?)\n";
+    or warn "$ME: warning: '$cmd' had unexpected exit code or signal ($?)\n";
 }
 
 sub get_tool_versions ($$)
@@ -410,7 +410,7 @@ sub get_tool_versions ($$)
         . "in the gnulib source directory.\n"), $fail = 1;
 
   exists $valid_release_types{$release_type}
-    or (warn "$ME: `$release_type': invalid release type\n"), $fail = 1;
+    or (warn "$ME: '$release_type': invalid release type\n"), $fail = 1;
 
   @ARGV
     and (warn "$ME: too many arguments:\n", join ("\n", @ARGV), "\n"),
@@ -505,7 +505,7 @@ then run this command to import it:
 
   gpg --keyserver keys.gnupg.net --recv-keys $gpg_key_id
 
-and rerun the \`gpg --verify' command.
+and rerun the 'gpg --verify' command.
 EOF
 
   my @tool_versions = get_tool_versions (\@tool_list, $gnulib_version);

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index f5588aa..d5542a2 100755 (executable)
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2011-11-13.13; # UTC
+scriptversion=2012-01-06.07; # UTC
 
 # Copyright (C) 2007-2012 Free Software Foundation, Inc.
 #
@@ -98,8 +98,8 @@ while test $# -gt 0; do
     --version) echo "$version"; exit 0;;
     --prefix) shift; prefix="$1";;
     -*)
-      echo "$0: Unknown option \`$1'." >&2
-      echo "$0: Try \`--help' for more information." >&2
+      echo "$0: Unknown option '$1'." >&2
+      echo "$0: Try '--help' for more information." >&2
       exit 1;;
     *)
       if test -z "$tarball_version_file"; then
@@ -107,7 +107,7 @@ while test $# -gt 0; do
       elif test -z "$tag_sed_script"; then
         tag_sed_script="$1"
       else
-        echo "$0: extra non-option argument \`$1'." >&2
+        echo "$0: extra non-option argument '$1'." >&2
         exit 1
       fi;;
   esac

diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 9d5327a..0efedb0 100755 (executable)
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2012-01-02 14:48'; # UTC
+my $VERSION = '2012-01-06 07:14'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -47,7 +47,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try '$ME --help' for more information.\n";
     }
   else
     {
@@ -211,7 +211,7 @@ sub parse_amend_file($)
   my @cmd = (qw (git log --log-size),
              '--pretty=format:%H:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
   open PIPE, '-|', @cmd
-    or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+    or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"
             . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
 
   my $prev_multi_paragraph;

diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index fb6a451..4d01447 100755 (executable)
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
@@ -2,7 +2,7 @@
 # Like mv $1 $2, but if the files are the same, just delete $1.
 # Status is zero if successful, nonzero otherwise.
 
-VERSION='2011-01-28 20:09'; # UTC
+VERSION='2012-01-06 07:23'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -32,7 +32,7 @@ If SOURCE is different than DEST, then move it to DEST; else remove SOURCE.
   --help     display this help and exit
   --version  output version information and exit
 
-The variable CMPPROG can be used to specify an alternative to \`cmp'.
+The variable CMPPROG can be used to specify an alternative to 'cmp'.
 
 Report bugs to <bug-gnulib@gnu.org>."
 

diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index b1c5902..2b64630 100755 (executable)
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -4,7 +4,7 @@ eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}'
 # Detect instances of "if (p) free (p);".
 # Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces.
 
-my $VERSION = '2011-04-20 13:43'; # UTC
+my $VERSION = '2012-01-06 07:23'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -47,7 +47,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try '$ME --help' for more information.\n";
     }
   else
     {
@@ -62,7 +62,7 @@ detect free-like functions named FOO and BAR.
 OPTIONS:
 
    --list       print only the name of each matching FILE (\\0-terminated)
-   --name=N     add name N to the list of \`free\'-like functions to detect;
+   --name=N     add name N to the list of \'free\'-like functions to detect;
                   may be repeated
 
    --help       display this help and exit
@@ -125,7 +125,7 @@ sub is_NULL ($)
   foreach my $file (@ARGV)
     {
       open FH, '<', $file
-        or (warn "$ME: can't open `$file' for reading: $!\n"),
+        or (warn "$ME: can't open '$file' for reading: $!\n"),
           $err = EXIT_ERROR, next;
       while (defined (my $line = <FH>))
         {

diff --git a/check-module b/check-module
index 3b7129d..9d4d619 100755 (executable)
--- a/check-module
+++ b/check-module
@@ -60,7 +60,7 @@ sub parse_module_file ($)
   my ($module_file) = @_;
 
   open FH, '<', $module_file
-    or die "$ME: can't open `$module_file' for reading: $!\n";
+    or die "$ME: can't open '$module_file' for reading: $!\n";
 
   my %file_set;
   my %dep_set;
@@ -130,7 +130,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try '$ME --help' for more information.\n";
     }
   else
     {
@@ -138,7 +138,7 @@ sub usage ($)
 Usage: $ME [OPTIONS] FILE...
 
 Read a module description file and derive the set of files
-included directly by any .c or .h file listed in the `Files:' section.
+included directly by any .c or .h file listed in the 'Files:' section.
 Take the union of all such sets for any dependent modules.
 Then, compare that set with the set derived from the names
 listed in the various Files: sections.
@@ -172,7 +172,7 @@ sub find_included_lib_files ($)
 
   my %inc;
   open FH, '<', $file
-    or die "$ME: can't open `$file' for reading: $!\n";
+    or die "$ME: can't open '$file' for reading: $!\n";
 
   while (defined (my $line = <FH>))
     {
@@ -272,7 +272,7 @@ sub check_module ($)
            || exists $exempt_header{$i}
              and next;
          !exists $module_all_files{$lib_file} && -f "../lib/$i"
-           and warn "$f: $i is `#include'd, but not "
+           and warn "$f: $i is '#include'd, but not "
              . "listed in module's Files: section\n";
        }
       #my @t = sort keys %$inc;

diff --git a/lib/argmatch.c b/lib/argmatch.c
index 3f04ffe..ecffc7c 100644 (file)
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -269,7 +269,7 @@ main (int argc, const char *const *argv)
     backup_type = XARGMATCH (program_name, argv[1],
                              backup_args, backup_vals);
 
-  printf ("The version control is `%s'\n",
+  printf ("The version control is '%s'\n",
           ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
 
   return 0;

diff --git a/lib/argp-help.c b/lib/argp-help.c
index e55c8a6..b5f2581 100644 (file)
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -1681,7 +1681,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream,
   if (flags & ARGP_HELP_SEE)
     {
       __argp_fmtstream_printf (fs, dgettext (argp->argp_domain, "\
-Try `%s --help' or `%s --usage' for more information.\n"),
+Try '%s --help' or '%s --usage' for more information.\n"),
                                name, name);
       anything = 1;
     }

diff --git a/lib/getopt1.c b/lib/getopt1.c
index 7cf41c8..fb2a8f5 100644 (file)
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -141,11 +141,11 @@ main (int argc, char **argv)
           break;
 
         case 'c':
-          printf ("option c with value `%s'\n", optarg);
+          printf ("option c with value '%s'\n", optarg);
           break;
 
         case 'd':
-          printf ("option d with value `%s'\n", optarg);
+          printf ("option d with value '%s'\n", optarg);
           break;
 
         case '?':

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 652b40a..aac3032 100644 (file)
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -963,7 +963,7 @@ static void
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, "Try `%s --help' for more information.\n",
+    fprintf (stderr, "Try '%s --help' for more information.\n",
              program_name);
   else
     {

diff --git a/lib/xstrtol-error.c b/lib/xstrtol-error.c
index 8f6e2b0..ce96ef6 100644 (file)
--- a/lib/xstrtol-error.c
+++ b/lib/xstrtol-error.c
@@ -60,16 +60,16 @@ xstrtol_error (enum strtol_error err,
       abort ();
 
     case LONGINT_INVALID:
-      msgid = N_("invalid %s%s argument `%s'");
+      msgid = N_("invalid %s%s argument '%s'");
       break;
 
     case LONGINT_INVALID_SUFFIX_CHAR:
     case LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW:
-      msgid = N_("invalid suffix in %s%s argument `%s'");
+      msgid = N_("invalid suffix in %s%s argument '%s'");
       break;
 
     case LONGINT_OVERFLOW:
-      msgid = N_("%s%s argument `%s' too large");
+      msgid = N_("%s%s argument '%s' too large");
       break;
     }
 

diff --git a/m4/alloca.m4 b/m4/alloca.m4
index 8579bff..905363c 100644 (file)
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -1,4 +1,4 @@
-# alloca.m4 serial 13
+# alloca.m4 serial 14
 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2012 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -63,9 +63,9 @@ m4_define([_AC_LIBOBJ_ALLOCA],
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 AC_LIBSOURCES(alloca.c)
 AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl
-AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using `alloca.c'.])
+AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using 'alloca.c'.])
 
-AC_CACHE_CHECK(whether `alloca.c' needs Cray hooks, ac_cv_os_cray,
+AC_CACHE_CHECK(whether 'alloca.c' needs Cray hooks, ac_cv_os_cray,
 [AC_EGREP_CPP(webecray,
 [#if defined CRAY && ! defined CRAY2
 webecray
@@ -77,10 +77,10 @@ if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     AC_CHECK_FUNC($ac_func,
                   [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func,
-                                      [Define to one of `_getb67', `GETB67',
-                                       `getb67' for Cray-2 and Cray-YMP
+                                      [Define to one of '_getb67', 'GETB67',
+                                       'getb67' for Cray-2 and Cray-YMP
                                        systems. This function is required for
-                                       `alloca.c' support on those systems.])
+                                       'alloca.c' support on those systems.])
     break])
   done
 fi

diff --git a/m4/argz.m4 b/m4/argz.m4
index 1209a58..38f1e61 100644 (file)
--- a/m4/argz.m4
+++ b/m4/argz.m4
@@ -7,7 +7,7 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 10 argz.m4
+# serial 11 argz.m4
 
 AC_DEFUN([gl_FUNC_ARGZ],
 [gl_PREREQ_ARGZ
@@ -19,7 +19,7 @@ AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
 AC_CHECK_TYPES([error_t],
   [],
   [AC_DEFINE([error_t], [int],
-   [Define to a type to use for `error_t' if it is not otherwise available.])
+   [Define to a type to use for 'error_t' if it is not otherwise available.])
    AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
     does not typedef error_t.])],
   [#if defined(HAVE_ARGZ_H)

diff --git a/m4/bison.m4 b/m4/bison.m4
index 2d1427a..20260a8 100644 (file)
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,4 +1,4 @@
-# serial 6
+# serial 7
 
 # Copyright (C) 2002, 2005, 2009-2012 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -15,10 +15,10 @@ dnl requires an Autoconf greater than 2.59c, but it will probably still be
 dnl useful to override the description of YACC in the --help output, re
 dnl parse-datetime.y assuming `bison -y'.
   AC_ARG_VAR([YACC],
-[The `Yet Another C Compiler' implementation to use.  Defaults to `bison -y'.
-Values other than `bison -y' will most likely break on most systems.])dnl
+[The "Yet Another C Compiler" implementation to use.  Defaults to 'bison -y'.
+Values other than 'bison -y' will most likely break on most systems.])dnl
   AC_ARG_VAR([YFLAGS],
 [YFLAGS contains the list arguments that will be passed by default to Bison.
 This script will default YFLAGS to the empty string to avoid a default value of
-`-d' given by some make applications.])dnl
+'-d' given by some make applications.])dnl
 ])

diff --git a/m4/calloc.m4 b/m4/calloc.m4
index 9643eea..781cf8e 100644 (file)
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,4 +1,4 @@
-# calloc.m4 serial 13
+# calloc.m4 serial 14
 
 # Copyright (C) 2004-2012 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -46,7 +46,7 @@ AC_DEFUN([gl_FUNC_CALLOC_GNU],
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   _AC_FUNC_CALLOC_IF(
     [AC_DEFINE([HAVE_CALLOC_GNU], [1],
-               [Define to 1 if your system has a GNU libc compatible `calloc'
+               [Define to 1 if your system has a GNU libc compatible 'calloc'
                 function, and to 0 otherwise.])],
     [AC_DEFINE([HAVE_CALLOC_GNU], [0])
      REPLACE_CALLOC=1

diff --git a/m4/extensions.m4 b/m4/extensions.m4
index 94741cd..0bfaef6 100644 (file)
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,4 +1,4 @@
-# serial 10  -*- Autoconf -*-
+# serial 11  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
 # Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -43,7 +43,7 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
   AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
   if test "$MINIX" = yes; then
     AC_DEFINE([_POSIX_SOURCE], [1],
-      [Define to 1 if you need to in order for `stat' and other
+      [Define to 1 if you need to in order for 'stat' and other
        things to work.])
     AC_DEFINE([_POSIX_1_SOURCE], [2],
       [Define to 2 if the system does not provide POSIX.1 features

diff --git a/m4/flexmember.m4 b/m4/flexmember.m4
index ae0e60d..7103b6b 100644 (file)
--- a/m4/flexmember.m4
+++ b/m4/flexmember.m4
@@ -1,4 +1,4 @@
-# serial 2
+# serial 3
 # Check for flexible array member support.
 
 # Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc.
@@ -28,7 +28,7 @@ AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER],
   if test $ac_cv_c_flexmember = yes; then
     AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [],
       [Define to nothing if C supports flexible array members, and to
-       1 if it does not.  That way, with a declaration like `struct s
+       1 if it does not.  That way, with a declaration like 'struct s
        { int n; double d@<:@FLEXIBLE_ARRAY_MEMBER@:>@; };', the struct hack
        can be used with pre-C99 compilers.
        When computing the size of such an object, don't use 'sizeof (struct s)'

diff --git a/m4/fpending.m4 b/m4/fpending.m4
index fdd2f2a..a818323 100644 (file)
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,4 @@
-# serial 17
+# serial 18
 
 # Copyright (C) 2000-2001, 2004-2012 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -83,5 +83,5 @@ AC_DEFUN([gl_PREREQ_FPENDING],
   )
   AC_DEFINE_UNQUOTED([PENDING_OUTPUT_N_BYTES],
     $ac_cv_sys_pending_output_n_bytes,
-    [the number of pending output bytes on stream `fp'])
+    [the number of pending output bytes on stream 'fp'])
 ])

diff --git a/m4/gc-random.m4 b/m4/gc-random.m4
index f5e36e7..e326306 100644 (file)
--- a/m4/gc-random.m4
+++ b/m4/gc-random.m4
@@ -1,4 +1,4 @@
-# gc-random.m4 serial 5
+# gc-random.m4 serial 6
 dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -61,15 +61,15 @@ AC_DEFUN([gl_GC_RANDOM],
   if test "$cross_compiling" != yes; then
     if test "$NAME_OF_RANDOM_DEVICE" != "no"; then
       AC_CHECK_FILE([$NAME_OF_RANDOM_DEVICE],,
-        AC_MSG_WARN([[Device `$NAME_OF_RANDOM_DEVICE' does not exist, consider to use --enable-random-device]]))
+        AC_MSG_WARN([[Device '$NAME_OF_RANDOM_DEVICE' does not exist, consider to use --enable-random-device]]))
     fi
     if test "$NAME_OF_PSEUDO_RANDOM_DEVICE" != "no"; then
       AC_CHECK_FILE([$NAME_OF_PSEUDO_RANDOM_DEVICE],,
-        AC_MSG_WARN([[Device `$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist, consider to use --enable-pseudo-random-device]]))
+        AC_MSG_WARN([[Device '$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist, consider to use --enable-pseudo-random-device]]))
     fi
     if test "$NAME_OF_NONCE_DEVICE" != "no"; then
       AC_CHECK_FILE([$NAME_OF_NONCE_DEVICE],,
-        AC_MSG_WARN([[Device `$NAME_OF_NONCE_DEVICE' does not exist, consider to use --enable-nonce-device]]))
+        AC_MSG_WARN([[Device '$NAME_OF_NONCE_DEVICE' does not exist, consider to use --enable-nonce-device]]))
     fi
   else
     AC_MSG_NOTICE([[Cross compiling, assuming random devices exists on the target host...]])

diff --git a/m4/intl.m4 b/m4/intl.m4
index f6213ca..d67e29c 100644 (file)
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 17b
+# intl.m4 serial 17c
 dnl Copyright (C) 1995-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -296,5 +296,5 @@ AC_DEFUN([gt_CHECK_DECL],
     gt_value=0
   fi
   AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+    [Define to 1 if you have the declaration of '$1', and to 0 if you don't.])
 ])

diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index ce38881..0dc3188 100644 (file)
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,4 +1,4 @@
-# serial 16
+# serial 17
 dnl Run a program to determine whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
@@ -93,7 +93,7 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
     fi
   fi
   AC_DEFINE_UNQUOTED([LINK_FOLLOWS_SYMLINKS], [$gl_link_follows_symlinks],
-    [Define to 1 if `link(2)' dereferences symbolic links, 0 if it
+    [Define to 1 if 'link(2)' dereferences symbolic links, 0 if it
      creates hard links to symlinks, -1 if it depends on the variable __xpg4,
      and -2 if unknown.])
 ])

diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 42a19ac..b9c65c7 100644 (file)
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,4 +1,4 @@
-# longlong.m4 serial 16
+# longlong.m4 serial 17
 dnl Copyright (C) 1999-2007, 2009-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
       fi])
   if test $ac_cv_type_long_long_int = yes; then
     AC_DEFINE([HAVE_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type `long long int'.])
+      [Define to 1 if the system has the type 'long long int'.])
   fi
 ])
 
@@ -77,7 +77,7 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
      fi])
   if test $ac_cv_type_unsigned_long_long_int = yes; then
     AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type `unsigned long long int'.])
+      [Define to 1 if the system has the type 'unsigned long long int'.])
   fi
 ])
 

diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index ff158eb..ed476d6 100644 (file)
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,4 +1,4 @@
-# serial 29
+# serial 30
 # How to list mounted file systems.
 
 # Copyright (C) 1998-2004, 2006, 2009-2012 Free Software Foundation, Inc.
@@ -110,7 +110,7 @@ if test -z "$ac_list_mounted_fs"; then
     AC_DEFINE([MOUNTED_VMOUNT], [1],
         [Define if there is a function named mntctl that can be used to read
          the list of mounted file systems, and there is a system header file
-         that declares `struct vmount.'  (AIX)])
+         that declares 'struct vmount'.  (AIX)])
   fi
 fi
 

diff --git a/m4/lstat.m4 b/m4/lstat.m4
index f41a2df..b83858b 100644 (file)
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,4 @@
-# serial 23
+# serial 24
 
 # Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc.
 #
@@ -65,6 +65,6 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
     ])
   test $gl_cv_func_lstat_dereferences_slashed_symlink = yes &&
     AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
-      [Define to 1 if `lstat' dereferences a symlink specified
+      [Define to 1 if 'lstat' dereferences a symlink specified
        with a trailing slash.])
 ])

diff --git a/m4/onceonly.m4 b/m4/onceonly.m4
index 3cdc43b..275d73c 100644 (file)
--- a/m4/onceonly.m4
+++ b/m4/onceonly.m4
@@ -1,4 +1,4 @@
-# onceonly.m4 serial 8
+# onceonly.m4 serial 9
 dnl Copyright (C) 2002-2003, 2005-2006, 2008-2012 Free Software Foundation,
 dnl Inc.
 dnl
@@ -80,7 +80,7 @@ AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
         [gl_func_list="$gl_func_list gl_FUNC_NAME"])
       gl_FUNCS_EXPANSION
       AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
-        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
+        [Define to 1 if you have the ']m4_defn([gl_FUNC_NAME])[' function.])
     ])
     AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
   ])

diff --git a/m4/posixver.m4 b/m4/posixver.m4
index 4db1c97..c4b9ed3 100644 (file)
--- a/m4/posixver.m4
+++ b/m4/posixver.m4
@@ -1,4 +1,4 @@
-# posixver.m4 serial 11
+# posixver.m4 serial 12
 dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -27,12 +27,12 @@ AC_DEFUN([gl_DEFAULT_POSIX2_VERSION],
        the form YYYYMM, specifying the year and month the standard was
        adopted. If not defined here, it defaults to the value of
        _POSIX2_VERSION in <unistd.h>. Define to 199209 to default to
-       POSIX 1003.2-1992, which makes standard programs like `head',
-       `tail', and `sort' accept obsolete options like `+10' and
-       `-10'. Define to 200112 to default to POSIX 1003.1-2001, which
-       makes these standard programs treat leading-`+' operands as
-       file names and require modern usages like `-n 10' instead of
-       `-10'. Whether defined here or not, the default can be
+       POSIX 1003.2-1992, which makes standard programs like 'head',
+       'tail', and 'sort' accept obsolete options like '+10' and
+       '-10'. Define to 200112 to default to POSIX 1003.1-2001, which
+       makes these standard programs treat leading-'+' operands as
+       file names and require modern usages like '-n 10' instead of
+       '-10'. Whether defined here or not, the default can be
        overridden at run time via the _POSIX2_VERSION environment
        variable.])
   fi

diff --git a/tests/test-dirname.c b/tests/test-dirname.c
index bc1c57a..5fcaee6 100644 (file)
--- a/tests/test-dirname.c
+++ b/tests/test-dirname.c
@@ -149,14 +149,15 @@ main (void)
                  || (dirlen + 1 == strlen (dir) && dir[dirlen] == '.'))))
         {
           ok = false;
-          printf ("dir_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+          printf ("dir_name '%s': got '%s' len %d,"
+                  " expected '%s' len %ld\n",
                   t->name, dir, dirlen,
                   t->dir, (unsigned long) strlen (t->dir));
         }
       if (strcmp (last, t->last))
         {
           ok = false;
-          printf ("last_component `%s': got `%s', expected `%s'\n",
+          printf ("last_component '%s': got '%s', expected '%s'\n",
                   t->name, last, t->last);
         }
       if (! (strcmp (base, t->base) == 0
@@ -165,21 +166,22 @@ main (void)
                      && ISSLASH (base[baselen])))))
         {
           ok = false;
-          printf ("base_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+          printf ("base_name '%s': got '%s' len %d,"
+                  " expected '%s' len %ld\n",
                   t->name, base, baselen,
                   t->base, (unsigned long) strlen (t->base));
         }
       if (strcmp (stripped, t->stripped) || modified != t->modified)
         {
           ok = false;
-          printf ("strip_trailing_slashes `%s': got %s %s, expected %s %s\n",
+          printf ("strip_trailing_slashes '%s': got %s %s, expected %s %s\n",
                   t->name, stripped, modified ? "changed" : "unchanged",
                   t->stripped, t->modified ? "changed" : "unchanged");
         }
       if (t->absolute != absolute)
         {
           ok = false;
-          printf ("`%s': got %s, expected %s\n", t->name,
+          printf ("'%s': got %s, expected %s\n", t->name,
                   absolute ? "absolute" : "relative",
                   t->absolute ? "absolute" : "relative");
         }

diff --git a/tests/test-getpass.c b/tests/test-getpass.c
index 86cb61f..6d8ab41 100644 (file)
--- a/tests/test-getpass.c
+++ b/tests/test-getpass.c
@@ -25,7 +25,7 @@ main (int argc, char *argv[])
 {
   char *pass = getpass ("Enter password: ");
 
-  printf ("The password is `%s'\n", pass);
+  printf ("The password is '%s'\n", pass);
 
   return 0;
 }

diff --git a/tests/test-iconvme.c b/tests/test-iconvme.c
index 44df371..dc08a9b 100644 (file)
--- a/tests/test-iconvme.c
+++ b/tests/test-iconvme.c
@@ -66,9 +66,9 @@ int main (int ac, char *av[])
         from[strlen (from) - 1] = '\0';
     }
 
-  printf (" Input string: `%s'\n"
-          "From code set: `%s'\n"
-          "  To code set: `%s'\n",
+  printf (" Input string: '%s'\n"
+          "From code set: '%s'\n"
+          "  To code set: '%s'\n",
           in, from, to);
 
   out = iconv_string (in, from, to);
@@ -77,7 +77,7 @@ int main (int ac, char *av[])
     perror ("iconv");
   else
     {
-      printf ("\nOutput: `%s'\n", out);
+      printf ("\nOutput: '%s'\n", out);
       free (out);
     }
 

diff --git a/tests/test-parse-datetime.c b/tests/test-parse-datetime.c
index 4818de1..902025f 100644 (file)
--- a/tests/test-parse-datetime.c
+++ b/tests/test-parse-datetime.c
@@ -30,7 +30,7 @@
 
 #ifdef DEBUG
 #define LOG(str, now, res)                                              \
-  printf ("string `%s' diff %d %d\n",                   \
+  printf ("string '%s' diff %d %d\n",                                 \
           str, res.tv_sec - now.tv_sec, res.tv_nsec - now.tv_nsec);
 #else
 #define LOG(str, now, res) (void) 0

diff --git a/tests/test-xstrtoimax.sh b/tests/test-xstrtoimax.sh
index 3e3b06c..3a0f9d2 100755 (executable)
--- a/tests/test-xstrtoimax.sh
+++ b/tests/test-xstrtoimax.sh
@@ -33,10 +33,10 @@ cat > exp <<EOF
 1->1 ()
 -1->-1 ()
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument '${too_big}h'
+X argument '$too_big' too large
+invalid X argument 'x'
+invalid suffix in X argument '9x'
 010->8 ()
 MiB->1048576 ()
 EOF

diff --git a/tests/test-xstrtol.sh b/tests/test-xstrtol.sh
index 1a2f7ca..f718d8f 100755 (executable)
--- a/tests/test-xstrtol.sh
+++ b/tests/test-xstrtol.sh
@@ -45,19 +45,19 @@ cat > expected <<EOF
 1->1 ()
 -1->-1 ()
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument '${too_big}h'
+X argument '$too_big' too large
+invalid X argument 'x'
+invalid suffix in X argument '9x'
 010->8 ()
 MiB->1048576 ()
 1->1 ()
-invalid X argument \`-1'
+invalid X argument '-1'
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument '${too_big}h'
+X argument '$too_big' too large
+invalid X argument 'x'
+invalid suffix in X argument '9x'
 010->8 ()
 MiB->1048576 ()
 EOF

diff --git a/tests/test-xstrtoll.sh b/tests/test-xstrtoll.sh
index 78a08c8..8d8df68 100755 (executable)
--- a/tests/test-xstrtoll.sh
+++ b/tests/test-xstrtoll.sh
@@ -45,19 +45,19 @@ cat > expected <<EOF
 1->1 ()
 -1->-1 ()
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument '${too_big}h'
+X argument '$too_big' too large
+invalid X argument 'x'
+invalid suffix in X argument '9x'
 010->8 ()
 MiB->1048576 ()
 1->1 ()
-invalid X argument \`-1'
+invalid X argument '-1'
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument '${too_big}h'
+X argument '$too_big' too large
+invalid X argument 'x'
+invalid suffix in X argument '9x'
 010->8 ()
 MiB->1048576 ()
 EOF

diff --git a/tests/test-xstrtoumax.sh b/tests/test-xstrtoumax.sh
index 68abb93..bdbdbf5 100755 (executable)
--- a/tests/test-xstrtoumax.sh
+++ b/tests/test-xstrtoumax.sh
@@ -31,12 +31,12 @@ mv k out
 # compare expected output
 cat > exp <<EOF
 1->1 ()
-invalid X argument \`-1'
+invalid X argument '-1'
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument '${too_big}h'
+X argument '$too_big' too large
+invalid X argument 'x'
+invalid suffix in X argument '9x'
 010->8 ()
 MiB->1048576 ()
 EOF

diff --git a/tests/unigbrk/test-uc-is-grapheme-break.c b/tests/unigbrk/test-uc-is-grapheme-break.c
index b77b03c..f527a3e 100644 (file)
--- a/tests/unigbrk/test-uc-is-grapheme-break.c
+++ b/tests/unigbrk/test-uc-is-grapheme-break.c
@@ -109,7 +109,7 @@ main (int argc, char *argv[])
             }
           else
             {
-              fprintf (stderr, "%s:%d.%d: syntax error expecting `÷' or `÷'\n",
+              fprintf (stderr, "%s:%d.%d: syntax error expecting '÷' or '÷'\n",
                        filename, lineno, (int) (p - line + 1));
               exit (1);
             }
@@ -124,8 +124,8 @@ main (int argc, char *argv[])
 
               if (sscanf (p, "%x%n", &next_int, &n) != 1)
                 {
-                  fprintf (stderr, "%s:%d.%d: syntax error at `%s' expecting "
-                           "hexadecimal Unicode code point number\n",
+                  fprintf (stderr, "%s:%d.%d: syntax error at '%s' "
+                           "expecting hexadecimal Unicode code point number\n",
                            filename, lineno, (int) (p - line + 1), p);
                   exit (1);
                 }

diff --git a/top/GNUmakefile b/top/GNUmakefile
index f343cef..5b06f6a 100644 (file)
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -114,7 +114,7 @@ endif
 
 abort-due-to-no-makefile:
        @echo There seems to be no Makefile in this directory.   1>&2
-       @echo "You must run ./configure before running \`make'." 1>&2
+       @echo "You must run ./configure before running 'make'." 1>&2
        @exit 1
 
 endif