3 maint patches

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm applying the first two - adding some missing Link lines, and changing
"filesystem" to "file system" in modules I've recently touched (the unit
test output on mingw looked rather inconsistent with a mix of both
spellings, and GNU coding standards prefer the latter).  Bruno, I held off
on the third until I get an okay from you, as it touches your relocatable
module.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkrP4TwACgkQ84KuGfSFAYAIBwCgwYKdGqXcBbLqNZBDYde+548N
tBMAn08/OAqgUbu9uNnD/TuEgsbgw46U
=emmC
-----END PGP SIGNATURE-----

>From 0dc2838be531653fc2212bf96722cc99dfb33c6e Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 9 Oct 2009 08:36:22 -0600
Subject: [PATCH 1/3] maint: make realtime library usage explicit

Adding a Link section makes it easier to notice when it a module
may require edits to a user's Makefile.am.

* modules/gethrxtime (Link): Mention LIB_GETHRXTIME.
* modules/gettime (Link): Mention LIB_CLOCK_GETTIME.
* modules/settime (Link): Likewise.
* modules/xnanosleep (Link): Mention LIB_NANOSLEEP.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog          |    6 ++++++
 modules/gethrxtime |    3 +++
 modules/gettime    |    3 +++
 modules/settime    |    3 +++
 modules/xnanosleep |    3 +++
 5 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 649dfb1..0c57ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-09  Eric Blake  <address@hidden>

+       maint: make realtime library usage explicit
+       * modules/gethrxtime (Link): Mention LIB_GETHRXTIME.
+       * modules/gettime (Link): Mention LIB_CLOCK_GETTIME.
+       * modules/settime (Link): Likewise.
+       * modules/xnanosleep (Link): Mention LIB_NANOSLEEP.
+
        test-stat-time: speed up execution
        * tests/test-stat-time.c (test_ctime) [!W32]: Avoid compiler
        warning on mingw.
diff --git a/modules/gethrxtime b/modules/gethrxtime
index 1a2ac83..ab9507b 100644
--- a/modules/gethrxtime
+++ b/modules/gethrxtime
@@ -22,6 +22,9 @@ Makefile.am:
 Include:
 "xtime.h"

+Link:
+$(LIB_GETHRXTIME)
+
 License:
 GPL

diff --git a/modules/gettime b/modules/gettime
index 1b31e31..988d293 100644
--- a/modules/gettime
+++ b/modules/gettime
@@ -20,6 +20,9 @@ Makefile.am:
 Include:
 "timespec.h"

+Link:
+$(LIB_CLOCK_GETTIME)
+
 License:
 GPL

diff --git a/modules/settime b/modules/settime
index 79a268b..c2e1b3c 100644
--- a/modules/settime
+++ b/modules/settime
@@ -20,6 +20,9 @@ Makefile.am:
 Include:
 "timespec.h"

+Link:
+$(LIB_CLOCK_GETTIME)
+
 License:
 GPL

diff --git a/modules/xnanosleep b/modules/xnanosleep
index b8c758c..937bba0 100644
--- a/modules/xnanosleep
+++ b/modules/xnanosleep
@@ -17,6 +17,9 @@ gl_XNANOSLEEP

 Makefile.am:

+Link:
+$(LIB_NANOSLEEP)
+
 Include:
 "xnanosleep.h"

-- 
1.6.5.rc1


>From 231bdaf6198a766ae5442fef6f4b8e661d523868 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 9 Oct 2009 19:17:17 -0600
Subject: [PATCH 2/3] maint: prefer 'file system' over 'filesystem'

* doc/posix-functions/fstatat.texi (fstatat): Likewise.
* doc/posix-functions/lstat.texi (lstat): Likewise.
* lib/file-has-acl.c (file_has_acl): Likewise.
* lib/fwriteerror.c [TEST]: Likewise.
* tests/test-areadlink.h (test_areadlink): Likewise.
* tests/test-areadlinkat-with-size.c (main): Likewise.
* tests/test-areadlinkat.c (main): Likewise.
* tests/test-canonicalize-lgpl.c (main): Likewise.
* tests/test-canonicalize.c (main): Likewise.
* tests/test-fstatat.c (main): Likewise.
* tests/test-linkat.c (main): Likewise.
* tests/test-lstat.h (test_lstat_func): Likewise.
* tests/test-mkdir.h (test_mkdir): Likewise.
* tests/test-readlink.h (test_readlink): Likewise.
* tests/test-remove.c (main): Likewise.
* tests/test-rename.h (test_rename): Likewise.
* tests/test-renameat.c (main): Likewise.
* tests/test-rmdir.h (test_rmdir_func): Likewise.
* tests/test-symlink.h (test_symlink): Likewise.
* tests/test-symlinkat.c (main): Likewise.
* tests/test-unlink.h (test_unlink_func): Likewise.
* tests/test-unlinkat.c (main): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                          |   24 ++++++++++++++++++++++++
 doc/posix-functions/fstatat.texi   |    2 +-
 doc/posix-functions/lstat.texi     |    2 +-
 lib/file-has-acl.c                 |    2 +-
 lib/fwriteerror.c                  |    4 ++--
 tests/test-areadlink.h             |    2 +-
 tests/test-areadlinkat-with-size.c |    2 +-
 tests/test-areadlinkat.c           |    2 +-
 tests/test-canonicalize-lgpl.c     |    2 +-
 tests/test-canonicalize.c          |    2 +-
 tests/test-fstatat.c               |    2 +-
 tests/test-linkat.c                |    2 +-
 tests/test-lstat.h                 |    2 +-
 tests/test-mkdir.h                 |    2 +-
 tests/test-readlink.h              |    2 +-
 tests/test-remove.c                |    2 +-
 tests/test-rename.h                |    2 +-
 tests/test-renameat.c              |    2 +-
 tests/test-rmdir.h                 |    2 +-
 tests/test-symlink.h               |    2 +-
 tests/test-symlinkat.c             |    2 +-
 tests/test-unlink.h                |    2 +-
 tests/test-unlinkat.c              |    2 +-
 23 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c57ea1..61e6168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 2009-10-09  Eric Blake  <address@hidden>

+       maint: prefer 'file system' over 'filesystem'
+       * doc/posix-functions/fstatat.texi (fstatat): Likewise.
+       * doc/posix-functions/lstat.texi (lstat): Likewise.
+       * lib/file-has-acl.c (file_has_acl): Likewise.
+       * lib/fwriteerror.c [TEST]: Likewise.
+       * tests/test-areadlink.h (test_areadlink): Likewise.
+       * tests/test-areadlinkat-with-size.c (main): Likewise.
+       * tests/test-areadlinkat.c (main): Likewise.
+       * tests/test-canonicalize-lgpl.c (main): Likewise.
+       * tests/test-canonicalize.c (main): Likewise.
+       * tests/test-fstatat.c (main): Likewise.
+       * tests/test-linkat.c (main): Likewise.
+       * tests/test-lstat.h (test_lstat_func): Likewise.
+       * tests/test-mkdir.h (test_mkdir): Likewise.
+       * tests/test-readlink.h (test_readlink): Likewise.
+       * tests/test-remove.c (main): Likewise.
+       * tests/test-rename.h (test_rename): Likewise.
+       * tests/test-renameat.c (main): Likewise.
+       * tests/test-rmdir.h (test_rmdir_func): Likewise.
+       * tests/test-symlink.h (test_symlink): Likewise.
+       * tests/test-symlinkat.c (main): Likewise.
+       * tests/test-unlink.h (test_unlink_func): Likewise.
+       * tests/test-unlinkat.c (main): Likewise.
+
        maint: make realtime library usage explicit
        * modules/gethrxtime (Link): Mention LIB_GETHRXTIME.
        * modules/gettime (Link): Mention LIB_CLOCK_GETTIME.
diff --git a/doc/posix-functions/fstatat.texi b/doc/posix-functions/fstatat.texi
index b96fc4d..6a3827b 100644
--- a/doc/posix-functions/fstatat.texi
+++ b/doc/posix-functions/fstatat.texi
@@ -32,7 +32,7 @@ fstatat
 @item
 On Windows platforms (excluding Cygwin), @code{st_ino} is always 0.
 @item
-On some filesystems, @code{st_size} contains bogus information for
+On some file systems, @code{st_size} contains bogus information for
 symlinks; use the gnulib module areadlink-with-size for a better way
 to get symlink contents.
 @end itemize
diff --git a/doc/posix-functions/lstat.texi b/doc/posix-functions/lstat.texi
index 328b896..39d2dce 100644
--- a/doc/posix-functions/lstat.texi
+++ b/doc/posix-functions/lstat.texi
@@ -36,7 +36,7 @@ lstat
 portable, and should instead be written @code{islnk ? lstat (name,
 buf) : stat (name, buf)}.
 @item
-On some filesystems, @code{st_size} contains bogus information for
+On some file systems, @code{st_size} contains bogus information for
 symlinks; use the gnulib module areadlink-with-size for a better way
 to get symlink contents.
 @end itemize
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index 5e6bfe6..4dda3ad 100644
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -354,7 +354,7 @@ file_has_acl (char const *name, struct stat const *sb)
              /* On Linux, FreeBSD, IRIX, acl_get_file (name, ACL_TYPE_ACCESS)
                 and acl_get_file (name, ACL_TYPE_DEFAULT) on a directory
                 either both succeed or both fail; it depends on the
-                filesystem.  Therefore there is no point in making the second
+                file system.  Therefore there is no point in making the second
                 call if the first one already failed.  */
              if (ret == 0 && S_ISDIR (sb->st_mode))
                {
diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c
index 21bd098..325f9bf 100644
--- a/lib/fwriteerror.c
+++ b/lib/fwriteerror.c
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008, 2009 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2003.

    This program is free software: you can redistribute it and/or modify
@@ -125,7 +125,7 @@ fwriteerror_no_ebadf (FILE *fp)
 #if TEST

 /* Name of a file on which writing fails.  On systems without /dev/full,
-   you can choose a filename on a full filesystem.  */
+   you can choose a filename on a full file system.  */
 #define UNWRITABLE_FILE "/dev/full"

 int
diff --git a/tests/test-areadlink.h b/tests/test-areadlink.h
index 07ccf23..57fdb7a 100644
--- a/tests/test-areadlink.h
+++ b/tests/test-areadlink.h
@@ -56,7 +56,7 @@ test_areadlink (char * (*func) (char const *, size_t), bool 
print)
   if (symlink (BASE "dir", BASE "link"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }
diff --git a/tests/test-areadlinkat-with-size.c 
b/tests/test-areadlinkat-with-size.c
index 43715d0..df4afc2 100644
--- a/tests/test-areadlinkat-with-size.c
+++ b/tests/test-areadlinkat-with-size.c
@@ -70,7 +70,7 @@ main ()

   /* Relative tests.  */
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
            stderr);
   else
     {
diff --git a/tests/test-areadlinkat.c b/tests/test-areadlinkat.c
index 6b0c96c..5f8d4b0 100644
--- a/tests/test-areadlinkat.c
+++ b/tests/test-areadlinkat.c
@@ -70,7 +70,7 @@ main ()

   /* Relative tests.  */
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
            stderr);
   else
     {
diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index 6efd714..cb09790 100644
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -103,7 +103,7 @@ main ()
     {
       ASSERT (remove (BASE "/tra") == 0);
       ASSERT (rmdir (BASE) == 0);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
             stderr);
       return 77;
     }
diff --git a/tests/test-canonicalize.c b/tests/test-canonicalize.c
index 6589877..7de6059 100644
--- a/tests/test-canonicalize.c
+++ b/tests/test-canonicalize.c
@@ -121,7 +121,7 @@ main ()
     {
       ASSERT (remove (BASE "/tra") == 0);
       ASSERT (rmdir (BASE) == 0);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
             stderr);
       return 77;
     }
diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index 28a71fa..2c65262 100644
--- a/tests/test-fstatat.c
+++ b/tests/test-fstatat.c
@@ -79,7 +79,7 @@ main ()
   /* FIXME - add additional tests of dfd not at current directory.  */

   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
           stderr);
   return result;
 }
diff --git a/tests/test-linkat.c b/tests/test-linkat.c
index 6aa3ca7..9740d26 100644
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -166,7 +166,7 @@ main ()
       ASSERT (rmdir (BASE "sub1") == 0);
       ASSERT (rmdir (BASE "sub2") == 0);
       free (cwd);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
              stderr);
       return result;
     }
diff --git a/tests/test-lstat.h b/tests/test-lstat.h
index 68e4f74..a47eb09 100644
--- a/tests/test-lstat.h
+++ b/tests/test-lstat.h
@@ -74,7 +74,7 @@ test_lstat_func (int (*func) (char const *, struct stat *), 
bool print)
     {
       ASSERT (unlink (BASE "file") == 0);
       if (print)
-       fputs ("skipping test: symlinks not supported on this filesystem\n",
+       fputs ("skipping test: symlinks not supported on this file system\n",
               stderr);
       return 77;
     }
diff --git a/tests/test-mkdir.h b/tests/test-mkdir.h
index 1fd7fe4..61a3ef6 100644
--- a/tests/test-mkdir.h
+++ b/tests/test-mkdir.h
@@ -67,7 +67,7 @@ test_mkdir (int (*func) (char const *, mode_t), bool print)
   if (symlink (BASE "dir", BASE "link"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }
diff --git a/tests/test-readlink.h b/tests/test-readlink.h
index 996e11f..4ce67f7 100644
--- a/tests/test-readlink.h
+++ b/tests/test-readlink.h
@@ -58,7 +58,7 @@ test_readlink (ssize_t (*func) (char const *, char *, 
size_t), bool print)
   if (symlink (BASE "dir", BASE "link"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }
diff --git a/tests/test-remove.c b/tests/test-remove.c
index c084d8c..2d5d633 100644
--- a/tests/test-remove.c
+++ b/tests/test-remove.c
@@ -92,7 +92,7 @@ main ()
      symlink.  */
   if (symlink (BASE "dir", BASE "link") != 0)
     {
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
              stderr);
       return 77;
     }
diff --git a/tests/test-rename.h b/tests/test-rename.h
index 5dc8918..b4f8c12 100644
--- a/tests/test-rename.h
+++ b/tests/test-rename.h
@@ -245,7 +245,7 @@ test_rename (int (*func) (char const *, char const *), bool 
print)
   if (symlink (BASE "file", BASE "link1"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       ASSERT (unlink (BASE "file") == 0);
       ASSERT (rmdir (BASE "dir") == 0);
diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index 09e5119..c69a75f 100644
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -179,7 +179,7 @@ main ()
   free (cwd);

   if (result)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
            stderr);
   return result;
 }
diff --git a/tests/test-rmdir.h b/tests/test-rmdir.h
index 94636dd..a859739 100644
--- a/tests/test-rmdir.h
+++ b/tests/test-rmdir.h
@@ -80,7 +80,7 @@ test_rmdir_func (int (*func) (char const *name), bool print)
   if (symlink (BASE "dir", BASE "link") != 0)
     {
       if (print)
-       fputs ("skipping test: symlinks not supported on this filesystem\n",
+       fputs ("skipping test: symlinks not supported on this file system\n",
               stderr);
       return 77;
     }
diff --git a/tests/test-symlink.h b/tests/test-symlink.h
index 9907293..d009a80 100644
--- a/tests/test-symlink.h
+++ b/tests/test-symlink.h
@@ -28,7 +28,7 @@ test_symlink (int (*func) (char const *, char const *), bool 
print)
   if (func ("nowhere", BASE "link1"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }
diff --git a/tests/test-symlinkat.c b/tests/test-symlinkat.c
index 4a6fe0a..3b542e3 100644
--- a/tests/test-symlinkat.c
+++ b/tests/test-symlinkat.c
@@ -117,7 +117,7 @@ main ()

   ASSERT (close (dfd) == 0);
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
           stderr);
   return result;
 }
diff --git a/tests/test-unlink.h b/tests/test-unlink.h
index 80cce94..6b6384e 100644
--- a/tests/test-unlink.h
+++ b/tests/test-unlink.h
@@ -68,7 +68,7 @@ test_unlink_func (int (*func) (char const *name), bool print)
       ASSERT (func (BASE "dir/file") == 0);
       ASSERT (rmdir (BASE "dir") == 0);
       if (print)
-       fputs ("skipping test: symlinks not supported on this filesystem\n",
+       fputs ("skipping test: symlinks not supported on this file system\n",
               stderr);
       return 77;
     }
diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index 785ede4..851ffe7 100644
--- a/tests/test-unlinkat.c
+++ b/tests/test-unlinkat.c
@@ -79,7 +79,7 @@ main ()
   ASSERT (result1 == result2);
   ASSERT (close (dfd) == 0);
   if (result1 == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
           stderr);
   return result1;
 }
-- 
1.6.5.rc1


>From 91a28ee1cf3b824d0641fafdbfa09eb161b56092 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 9 Oct 2009 19:17:38 -0600
Subject: [PATCH 3/3] relocatable: prefer 'file system' over 'filesystem'

* m4/relocatable-lib.m4 (gl_RELOCATABLE_NOP): Use AS_HELP_STRING.
(gl_RELOCATABLE_LIBRARY_BODY): Fix spelling.
* doc/relocatable-maint.texi (Supporting Relocation): Likewise.
* doc/relocatable.texi (Enabling Relocatability): Likewise.
* lib/relocatable.c (compute_curr_prefix): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                  |    7 +++++++
 doc/relocatable-maint.texi |    2 +-
 doc/relocatable.texi       |    2 +-
 lib/relocatable.c          |    8 ++++----
 m4/relocatable-lib.m4      |    8 +++++---
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61e6168..02503f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-10-09  Eric Blake  <address@hidden>

+       relocatable: prefer 'file system' over 'filesystem'
+       * m4/relocatable-lib.m4 (gl_RELOCATABLE_NOP): Use AS_HELP_STRING.
+       (gl_RELOCATABLE_LIBRARY_BODY): Fix spelling.
+       * doc/relocatable-maint.texi (Supporting Relocation): Likewise.
+       * doc/relocatable.texi (Enabling Relocatability): Likewise.
+       * lib/relocatable.c (compute_curr_prefix): Likewise.
+
        maint: prefer 'file system' over 'filesystem'
        * doc/posix-functions/fstatat.texi (fstatat): Likewise.
        * doc/posix-functions/lstat.texi (lstat): Likewise.
diff --git a/doc/relocatable-maint.texi b/doc/relocatable-maint.texi
index ab7cdcd..7c24b28 100644
--- a/doc/relocatable-maint.texi
+++ b/doc/relocatable-maint.texi
@@ -15,7 +15,7 @@ Supporting Relocation
 different versions of the same binary package.

 A relocatable program can be moved or copied to a different location
-on the filesystem.  It is possible to make symlinks to the installed
+on the file system.  It is possible to make symlinks to the installed
 and moved programs, and invoke them through the symlink. It is
 possible to do the same thing with a hard link @emph{only} if the hard
 link file is in the same directory as the real program.
diff --git a/doc/relocatable.texi b/doc/relocatable.texi
index dc7a4e2..fca0ea5 100644
--- a/doc/relocatable.texi
+++ b/doc/relocatable.texi
@@ -15,7 +15,7 @@ Enabling Relocatability
 different versions of the same binary package.

 A relocatable program can be moved or copied to a different location
-on the filesystem.  It is possible to make symlinks to the installed
+on the file system.  It is possible to make symlinks to the installed
 and moved programs, and invoke them through the symlink. It is
 possible to do the same thing with a hard link @emph{only} if the hard
 link file is in the same directory as the real program.
diff --git a/lib/relocatable.c b/lib/relocatable.c
index 09ff8c9..b494420 100644
--- a/lib/relocatable.c
+++ b/lib/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2009 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2003.

    This program is free software; you can redistribute it and/or modify it
@@ -233,11 +233,11 @@ compute_curr_prefix (const char *orig_installprefix,
                  same = true;
                break;
              }
-           /* Do case-insensitive comparison if the filesystem is always or
+           /* Do case-insensitive comparison if the file system is always or
               often case-insensitive.  It's better to accept the comparison
               if the difference is only in case, rather than to fail.  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined 
__EMX__ || defined __DJGPP__
-           /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */
+           /* Win32, Cygwin, OS/2, DOS - case insignificant file system */
            if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
                != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
              break;
@@ -450,7 +450,7 @@ relocate (const char *pathname)
 #endif

   /* Note: It is not necessary to perform case insensitive comparison here,
-     even for DOS-like filesystems, because the pathname argument was
+     even for DOS-like file systems, because the pathname argument was
      typically created from the same Makefile variable as orig_prefix came
      from.  */
   if (orig_prefix != NULL && curr_prefix != NULL
diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4
index fd99cda..48e4297 100644
--- a/m4/relocatable-lib.m4
+++ b/m4/relocatable-lib.m4
@@ -1,4 +1,4 @@
-# relocatable-lib.m4 serial 4
+# relocatable-lib.m4 serial 5
 dnl Copyright (C) 2003, 2005-2007, 2009 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,7 +27,8 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
     [Define to the value of ${prefix}, as a string.])
   if test $RELOCATABLE = yes; then
     AC_DEFINE([ENABLE_RELOCATABLE], [1],
-      [Define to 1 if the package shall run at any location in the 
filesystem.])
+      [Define to 1 if the package shall run at any location in the file
+       system.])
   fi
 ])

@@ -43,7 +44,8 @@ AC_DEFUN([gl_RELOCATABLE_NOP],
 [
   AC_MSG_CHECKING([whether to activate relocatable installation])
   AC_ARG_ENABLE([relocatable],
-    [  --enable-relocatable    install a package that can be moved in the 
filesystem],
+    [AS_HELP_STRING([--enable-relocatable],
+      [install a package that can be moved in the file system])],
     [if test "$enableval" != no; then
        RELOCATABLE=yes
      else
-- 
1.6.5.rc1