autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

"path", "filename" -> "file name" for Autoconf


From: Paul Eggert
Subject: "path", "filename" -> "file name" for Autoconf
Date: Fri, 20 Aug 2004 13:00:10 -0700
User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)

I installed the following patch to fix minor terminology issues
that RMS mentioned to me a while ago:

2004-08-20  Paul Eggert  <address@hidden>

        * NEWS, TODO, configure.ac, bin/autoscan.in,
        bin/autoupdate.in, bin/ifnames.in, doc/autoconf.texi,
        doc/install.texi, lib/Autom4te/Configure_ac.pm,
        lib/Autom4te/FileUtils.pm, lib/autoconf/general.m4,
        lib/autoconf/programs.m4, lib/autoconf/status.m4,
        lib/autotest/general.m4, lib/m4sugar/m4sh.m4,
        lib/m4sugar/m4sugar.m4, tests/local.at, tests/m4sh.at,
        tests/tools.at, tests/torture.at:
        Use "file name" rather than "filename" or "path",
        to be consistent with the terminology of the GNU coding standards.
        
Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.328
diff -p -u -r1.328 NEWS
--- NEWS        3 Aug 2004 22:06:10 -0000       1.328
+++ NEWS        20 Aug 2004 19:53:01 -0000
@@ -36,7 +36,7 @@
   Released 2003-11-04, by Akim Demaille
 
 ** ac_abs_builddir etc.
-  Absolute paths were actually relative in 2.58.
+  Absolute file names were actually relative in 2.58.
 
 * Major changes in Autoconf 2.58
 
@@ -885,7 +885,7 @@ Major changes in Autoconf 2.5:
 * New macro: AC_CACHE_CHECK, to make using the cache easier.
 * config.log contains the command being run as well as any output from it.
 * AC_CHECK_LIB can check for libraries with "." or "/" or "+" in their name.
-* AC_PROG_INSTALL doesn't cache a path to install-sh, for sharing caches.
+* AC_PROG_INSTALL doesn't cache a name for install-sh, for sharing caches.
 * AC_CHECK_PROG, AC_PATH_PROG, AC_CHECK_PROGS, AC_PATH_PROGS, and
   AC_CHECK_TOOL can search a path other than $PATH.
 * AC_CHECK_SIZEOF takes an optional size to use when cross-compiling.
@@ -1096,7 +1096,7 @@ Major changes in Autoconf 1.8:
   warns about unknown options.
 * config.status accepts --help, --version options.
 
-** Paths and other changes:
+** File names and other changes:
 * Relative srcdir values are not made absolute.
 * The values of @prefix@ and @exec_prefix@ and @top_srcdir@ get substituted.
 * Autoconf library files are installed in ${datadir}/autoconf, not ${datadir}.
@@ -1142,7 +1142,7 @@ Major changes in Autoconf 1.4:
 * New macros AC_HAVE_POUNDBANG, AC_TIME_WITH_SYS_TIME, AC_LONG_DOUBLE,
   AC_GETGROUPS_T, AC_DEFINE_UNQUOTED.
 * autoconf and autoheader use the M4 environment variable to determine the
-  path of the m4 program to use.
+  name of the m4 program to use.
 * The --macrodir option to autoconf and autoheader specifies the directory
   in which acspecific.m4, acgeneral.m4, etc. reside if not the default.
 * autoconf and autoheader can take `-' as their file names, which means to
@@ -1155,9 +1155,9 @@ Major changes in Autoconf 1.4:
   AC_DEFINE_UNQUOTED instead.
 * Much textual processing done with external calls to tr and sed have been
   internalized with builtin m4 `patsubst' and `translit' calls.
-* AC_OUTPUT doesn't hardwire the filenames it outputs.  Instead, you can
+* AC_OUTPUT doesn't hardwire the file names it outputs.  Instead, you can
   set the shell variables `gen_files' and `gen_config' to the list of
-  filenames to output.
+  file names to output.
 * AC_DECLARE_YYTEXT does an AC_SUBST of `LEX_OUTPUT_ROOT', which may be
   "lex.yy" or "lexyy", depending on the system.
 * AC_PROGRAMS_CHECK takes an optional third arg.  If given, it is used as
Index: TODO
===================================================================
RCS file: /cvsroot/autoconf/autoconf/TODO,v
retrieving revision 1.127
diff -p -u -r1.127 TODO
--- TODO        24 Nov 2003 14:17:34 -0000      1.127
+++ TODO        20 Aug 2004 19:53:01 -0000
@@ -406,9 +406,9 @@ In config.status comment, put the host/t
 
 ------------------------------------------------------------------------------
 
-It would be nice if I could (in the Makefile.in files) set
-the path to config.h. You have config.h ../config.h ../../config.h's all
-over the place, in the findutils-4.1 directory.
+It would be nice if I could (in the Makefile.in files) set the
+relative name of config.h. You have config.h ../config.h
+../../config.h's all over the place, in the findutils-4.1 directory.
 From: "Randall S. Winchester" <address@hidden>
 
 ------------------------------------------------------------------------------
@@ -436,7 +436,7 @@ AC_PKG_WITH(hesiod,
 ,,-lhesiod,HESIOD,,)
 AC_PKG_WITH(glue,,,-lglue,GLUE,,)
 AC_PKG_WITH(bind,,/usr/local/bind, [lib/resolv.a lib/lib44bsd.a], ,include)
-After the appropriate checks, the existence of the paths, and libs and such
+After the appropriate checks, the existence of the files, and libs and such
 LIBS=$LIBS $PKG-LIBS
 DEFS=$DEFS $PKG-DEFS
 CPPFLAGS=$PKG-CPPFLAGS $CPPFLAGS
@@ -449,7 +449,7 @@ as order matters.
 
 also an AC_PKG_CHK_HEADER
 and an AC_PKG_CHK_FUNCTION
-so one can give alternate paths to check for stuff ($PKG-ROOT/lib for
+so one can give alternate names to check for stuff ($PKG-ROOT/lib for
 example)
 From: Randall Winchester
 
@@ -532,7 +532,7 @@ Of course, this can be done locally with
 
 ------------------------------------------------------------------------------
 
-I wonder if it is possible to get the path for X11's app-defaults
+I wonder if it is possible to get the name of X11's app-defaults
 directory by autoconf. Moreover, I'd like to have a general way of
 accessing imake variables by autoconf, something like
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/autoconf/autoconf/configure.ac,v
retrieving revision 1.69
diff -p -u -r1.69 configure.ac
--- configure.ac        3 May 2004 06:20:09 -0000       1.69
+++ configure.ac        20 Aug 2004 19:53:01 -0000
@@ -99,7 +99,7 @@ AC_PATH_PROG([EXPR], [expr])
 ## M4.  ##
 ## ---- ##
 
-# We use a path for GNU m4 so even if users have another m4 first in
+# We use an absolute name for GNU m4 so even if users have another m4 first in
 # their path, the installer can configure with a path that has GNU m4
 # first and get that path embedded in the installed autoconf and
 # autoheader scripts.
@@ -120,7 +120,7 @@ AM_MISSING_PROG(HELP2MAN, help2man)
 ## Perl.  ##
 ## ------ ##
 
-# We use a path for perl so the #! line in autoscan will work.
+# We use an absolute name for perl so the #! line in autoscan will work.
 AC_PATH_PROG([PERL], perl, no)
 AC_SUBST([PERL])dnl
 if test "$PERL" = no; then
Index: bin/autoscan.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoscan.in,v
retrieving revision 1.98
diff -p -u -r1.98 autoscan.in
--- bin/autoscan.in     3 Mar 2004 21:40:46 -0000       1.98
+++ bin/autoscan.in     20 Aug 2004 19:53:01 -0000
@@ -231,17 +231,17 @@ sub used ($$;$)
 ## ----------------------- ##
 
 
-# scan_c_file ($FILENAME)
-# -----------------------
+# scan_c_file ($FILE-NAME)
+# ------------------------
 sub scan_c_file ($)
 {
-  my ($filename) = @_;
+  my ($file_name) = @_;
   push @cfiles, $File::Find::name;
 
   # Nonzero if in a multiline comment.
   my $in_comment = 0;
 
-  my $file = new Autom4te::XFile "<$filename";
+  my $file = new Autom4te::XFile "<$file_name";
 
   while ($_ = $file->getline)
     {
@@ -304,10 +304,10 @@ sub scan_c_file ($)
 # -----------------------------
 sub scan_makefile ($)
 {
-  my ($filename) = @_;
+  my ($file_name) = @_;
   push @makefiles, $File::Find::name;
 
-  my $file = new Autom4te::XFile "<$filename";
+  my $file = new Autom4te::XFile "<$file_name";
 
   while ($_ = $file->getline)
     {
@@ -346,10 +346,10 @@ sub scan_makefile ($)
 # --------------------------------
 sub scan_sh_file ($)
 {
-  my ($filename) = @_;
+  my ($file_name) = @_;
   push @shfiles, $File::Find::name;
 
-  my $file = new Autom4te::XFile "<$filename";
+  my $file = new Autom4te::XFile "<$file_name";
 
   while ($_ = $file->getline)
     {
@@ -371,7 +371,7 @@ sub scan_sh_file ($)
 
 # scan_file ()
 # ------------
-# Called by &find on each file.  $_ contains the current filename with
+# Called by &find on each file.  $_ contains the current file name with
 # the current directory of the walk through.
 sub scan_file ()
 {
Index: bin/autoupdate.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoupdate.in,v
retrieving revision 1.52
diff -p -u -r1.52 autoupdate.in
--- bin/autoupdate.in   3 Mar 2004 21:40:46 -0000       1.52
+++ bin/autoupdate.in   20 Aug 2004 19:53:01 -0000
@@ -265,7 +265,6 @@ xsystem ("$autoconf --trace AU_DEFINE:'_
 
 foreach my $file (@ARGV)
   {
-    my $filename = $file;
     # We need an actual file.
     if ($file eq '-')
       {
Index: bin/ifnames.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/ifnames.in,v
retrieving revision 1.32
diff -p -u -r1.32 ifnames.in
--- bin/ifnames.in      27 Jan 2004 19:02:51 -0000      1.32
+++ bin/ifnames.in      20 Aug 2004 19:53:01 -0000
@@ -88,12 +88,12 @@ sub parse_args ()
 my %occurrence;
 
 
-# &scan_file ($FILENAME)
-# ----------------------
+# &scan_file ($FILE_NAME)
+# -----------------------
 sub scan_file ($)
 {
-  my ($filename) = @_;
-  my $file = new Autom4te::XFile ($filename);
+  my ($file_name) = @_;
+  my $file = new Autom4te::XFile ($file_name);
   while ($_ = $file->getline)
     {
       # Continuation lines.
@@ -111,7 +111,7 @@ sub scan_file ($)
            {
              next
                if $word eq 'defined' || $word !~ /^[a-zA-Z_]/;
-             $occurrence{$word}{$filename} = 1;
+             $occurrence{$word}{$file_name} = 1;
            }
        }
     }
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.827
diff -p -u -r1.827 autoconf.texi
--- doc/autoconf.texi   12 Aug 2004 21:51:48 -0000      1.827
+++ doc/autoconf.texi   20 Aug 2004 19:53:02 -0000
@@ -465,7 +465,7 @@ Portable Shell Programming
 * Shellology::                  A zoology of shells
 * Here-Documents::              Quirks and tricks
 * File Descriptors::            FDs and redirections
-* File System Conventions::     File- and pathnames
+* File System Conventions::     File names
 * Shell Substitutions::         Variable and command expansions
 * Assignments::                 Varying side effects of assignments
 * Parentheses::                 Parentheses in shell scripts
@@ -1728,7 +1728,7 @@ Invocation}, for more information.
 @c @acindex{INCLUDE}
 @c @c FIXME: There is no longer shell globbing.
 @c Read the macro definitions that appear in the listed files.  A list of
address@hidden space-separated filenames or shell globbing patterns is 
expected.  The
address@hidden space-separated file names or shell globbing patterns is 
expected.  The
 @c files will be read in the order they're listed.
 @c
 @c Because the order of definition of macros is important (only the last
@@ -1762,7 +1762,7 @@ name is obsolete because some @code{make
 @file{install} from it if there is no @file{Makefile}.
 
 The auxiliary directory should not be named @file{aux} for portability
-to MS-DOS, because the filename @file{aux} is reserved under MS-DOS.
+to MS-DOS, because the file name @file{aux} is reserved under MS-DOS.
 @end defmac
 
 @defmac AC_REQUIRE_AUX_FILE (@var{file})
@@ -1919,7 +1919,7 @@ when used in @var{output}, or the standa
 interface of @file{./config.status}, see @ref{config.status Invocation},
 for more details.
 
-The @var{inputs} may be absolute or relative filenames.  In the latter
+The @var{inputs} may be absolute or relative file names.  In the latter
 case they are first looked for in the build tree, and then in the source
 tree.
 
@@ -1936,21 +1936,24 @@ The variables set during the execution o
 
 @table @code
 @item srcdir
-The path from the top build directory to the top source directory.  This
+The name of the top source directory, assuming that the working
+directory is the top build directory.  This
 is what @command{configure}'s option @option{--srcdir} sets.
 
 @item ac_top_srcdir
-The path from the current build directory to the top source directory.
+The name of the top source directory, assuming that the working
+directory is the current build directory.
 
 
 @item ac_top_builddir
-The path from the current build directory to the top build directory.
+The name of the top build directory, assuming that the working
+directory is the current build directory.
 It can be empty, or else ends with a slash, so that you may concatenate
 it.
 
 @item ac_srcdir
-The path from the current build directory to the corresponding source
-directory.
+The name of the corresponding source directory, assuming that the
+working directory is the current build directory.
 @end table
 
 @noindent
@@ -2216,40 +2219,40 @@ Rigorously equal to @samp{.}.  Added for
 
 @defvar abs_builddir
 @ovindex abs_builddir
-Absolute path of @code{builddir}.
+Absolute name of @code{builddir}.
 @end defvar
 
 @defvar top_builddir
 @ovindex top_builddir
-The relative path to the top-level of the current build tree.  In the
+The relative name of the top level of the current build tree.  In the
 top-level directory, this is the same as @code{builddir}.
 @end defvar
 
 @defvar abs_top_builddir
 @ovindex abs_top_builddir
-Absolute path of @code{top_builddir}.
+Absolute name of @code{top_builddir}.
 @end defvar
 
 @defvar srcdir
 @ovindex srcdir
-The relative path to the directory that contains the source code for
+The relative name of the directory that contains the source code for
 that @file{Makefile}.
 @end defvar
 
 @defvar abs_srcdir
 @ovindex abs_srcdir
-Absolute path of @code{srcdir}.
+Absolute name of @code{srcdir}.
 @end defvar
 
 @defvar top_srcdir
 @ovindex top_srcdir
-The relative path to the top-level source code directory for the
+The relative name of the top-level source code directory for the
 package.  In the top-level directory, this is the same as @code{srcdir}.
 @end defvar
 
 @defvar abs_top_srcdir
 @ovindex abs_top_srcdir
-Absolute path of @code{top_srcdir}.
+Absolute name of @code{top_srcdir}.
 @end defvar
 
 @node Installation Directory Variables
@@ -2443,8 +2446,8 @@ autoconf autoheader: Makefile
 @xref{Limitations of Make}, for details.
 
 @item @samp{$(srcdir)}
-Be sure to specify the path to the sources, otherwise the package won't
-support separated builds.
+Be sure to specify the name of the source directory,
+otherwise the package won't support separated builds.
 @end table
 
 
@@ -2738,11 +2741,11 @@ Remake the template file even if newer t
 
 @item address@hidden
 @itemx -I @var{dir}
-Append @var{dir} to include path.  Multiple invocations accumulate.
+Append @var{dir} to the include path.  Multiple invocations accumulate.
 
 @item address@hidden
 @item -B @var{dir}
-Prepend @var{dir} to include path.  Multiple invocations accumulate.
+Prepend @var{dir} to the include path.  Multiple invocations accumulate.
 
 @item address@hidden
 @itemx -W @var{category}
@@ -2999,10 +3002,10 @@ changes if needed, which include:
 
 @itemize @minus
 @item
-adjusting a relative path for the cache file;
+adjusting a relative name for the cache file;
 
 @item
-adjusting a relative path for the source directory;
+adjusting a relative name for the source directory;
 
 @item
 propagating the current value of @code{$prefix}, including if it was
@@ -3047,11 +3050,11 @@ have already installed.  If you wish to 
 @acindex{PREFIX_PROGRAM}
 If the user did not specify an installation prefix (using the
 @option{--prefix} option), guess a value for it by looking for
address@hidden in @code{PATH}, the way the shell does.  If @var{program}
address@hidden in @env{PATH}, the way the shell does.  If @var{program}
 is found, set the prefix to the parent of the directory containing
 @var{program}, else default the prefix as described above
 (@file{/usr/local} or @code{AC_PREFIX_DEFAULT}).  For example, if
address@hidden is @code{gcc} and the @code{PATH} contains
address@hidden is @code{gcc} and the @env{PATH} contains
 @file{/usr/local/gnu/bin/gcc}, set the prefix to @file{/usr/local/gnu}.
 @end defmac
 
@@ -3282,8 +3285,8 @@ lines.
 @ovindex INSTALL_PROGRAM
 @ovindex INSTALL_DATA
 @ovindex INSTALL_SCRIPT
-Set output variable @code{INSTALL} to the path of a @acronym{BSD}-compatible
address@hidden program, if one is found in the current @code{PATH}.
+Set output variable @code{INSTALL} to the name of a @acronym{BSD}-compatible
address@hidden program, if one is found in the current @env{PATH}.
 Otherwise, set @code{INSTALL} to @address@hidden/install-sh -c},
 checking the directories specified to @code{AC_CONFIG_AUX_DIR} (or its
 default directories) to determine @var{dir} (@pxref{Output}).  Also set
@@ -3395,7 +3398,7 @@ is found, and otherwise to @samp{:} (do 
 @defmac AC_PROG_SED
 @acindex{PROG_SED}
 @ovindex SED
-Set output variable @code{SED} to a @code{sed} on @samp{PATH} that
+Set output variable @code{SED} to a @code{sed} on @env{PATH} that
 truncates as few characters as possible.  If @sc{gnu} Sed is found,
 use that instead.
 @end defmac
@@ -3415,8 +3418,8 @@ These macros are used to find programs n
 test macros.  If you need to check the behavior of a program as well as
 find out whether it is present, you have to write your own test for it
 (@pxref{Writing Tests}).  By default, these macros use the environment
-variable @code{PATH}.  If you need to check for a program that might not
-be in the user's @code{PATH}, you can pass a modified path to use
+variable @env{PATH}.  If you need to check for a program that might not
+be in the user's @env{PATH}, you can pass a modified path to use
 instead, like this:
 
 @example
@@ -3430,7 +3433,7 @@ You are strongly encouraged to declare t
 
 @defmac AC_CHECK_PROG (@var{variable}, @var{prog-to-check-for}, 
@var{value-if-found}, @ovar{value-if-not-found}, @ovar{path},  @ovar{reject})
 @acindex{CHECK_PROG}
-Check whether program @var{prog-to-check-for} exists in @code{PATH}.  If
+Check whether program @var{prog-to-check-for} exists in @env{PATH}.  If
 it is found, set @var{variable} to @var{value-if-found}, otherwise to
 @var{value-if-not-found}, if given.  Always pass over @var{reject} (an
 absolute file name) even if it is the first found in the search path; in
@@ -3443,7 +3446,7 @@ that case, set @var{variable} using the 
 @defmac AC_CHECK_PROGS (@var{variable}, @var{progs-to-check-for}, 
@ovar{value-if-not-found}, @ovar{path})
 @acindex{CHECK_PROGS}
 Check for each program in the whitespace-separated list
address@hidden existing in the @code{PATH}.  If one is found, set
address@hidden existing in the @env{PATH}.  If one is found, set
 @var{variable} to the name of that program.  Otherwise, continue
 checking the next program in the list.  If none of the programs in the
 list are found, set @var{variable} to @var{value-if-not-found}; if
@@ -3480,8 +3483,8 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 @end example
 @noindent
 sets @code{RANLIB} to @file{i386-gnu-ranlib} if that program exists in
address@hidden, or otherwise to @samp{ranlib} if that program exists in
address@hidden, or to @samp{:} if neither program exists.
address@hidden, or otherwise to @samp{ranlib} if that program exists in
address@hidden, or to @samp{:} if neither program exists.
 
 In the future, when cross-compiling this macro will @emph{only}
 accept program names that are prefixed with the host type.
@@ -3521,27 +3524,27 @@ accept program names that are not prefix
 
 @defmac AC_PATH_PROG (@var{variable}, @var{prog-to-check-for}, 
@ovar{value-if-not-found}, @ovar{path})
 @acindex{PATH_PROG}
-Like @code{AC_CHECK_PROG}, but set @var{variable} to the entire
-path of @var{prog-to-check-for} if found.
+Like @code{AC_CHECK_PROG}, but set @var{variable} to the absolute
+name of @var{prog-to-check-for} if found.
 @end defmac
 
 @defmac AC_PATH_PROGS (@var{variable}, @var{progs-to-check-for}, 
@ovar{value-if-not-found}, @ovar{path})
 @acindex{PATH_PROGS}
 Like @code{AC_CHECK_PROGS}, but if any of @var{progs-to-check-for}
-are found, set @var{variable} to the entire path of the program
+are found, set @var{variable} to the absolute name of the program
 found.
 @end defmac
 
 @defmac AC_PATH_TARGET_TOOL (@var{variable}, @var{prog-to-check-for}, 
@ovar{value-if-not-found}, @ovar{path})
 @acindex{PATH_TARGET_TOOL}
-Like @code{AC_CHECK_TARGET_TOOL}, but set @var{variable} to the entire
-path of the program if it is found.
+Like @code{AC_CHECK_TARGET_TOOL}, but set @var{variable} to the absolute
+name of the program if it is found.
 @end defmac
 
 @defmac AC_PATH_TOOL (@var{variable}, @var{prog-to-check-for}, 
@ovar{value-if-not-found}, @ovar{path})
 @acindex{PATH_TOOL}
-Like @code{AC_CHECK_TOOL}, but set @var{variable} to the entire
-path of the program if it is found.
+Like @code{AC_CHECK_TOOL}, but set @var{variable} to the absolute
+name of the program if it is found.
 
 In the future, when cross-compiling this macro will @emph{not}
 accept program names that are not prefixed with the host type.
@@ -4526,7 +4529,7 @@ AC_LIBOBJ($foo_or_bar)
 @defmac AC_CONFIG_LIBOBJ_DIR (@var{directory})
 @acindex{CONFIG_LIBOBJ_DIR}
 Specify that @code{AC_LIBOBJ} replacement files are to be found in
address@hidden, a relative path starting from the top level of the
address@hidden, a name relative to the top level of the
 source tree.  The replacement directory defaults to @file{.}, the top
 level directory, and the most typical value is @file{lib}, corresponding
 to @samp{AC_CONFIG_LIBOBJ_DIR(lib)}.
@@ -6141,7 +6144,7 @@ extension for source-code files.  Some c
 newer language features for appropriately named files, e.g. Fortran 90
 features only for @file{.f90} files.  On the other hand, some other
 compilers expect all source files to end in @file{.f} and require
-special flags to support other filename extensions.  The
+special flags to support other file name extensions.  The
 @code{AC_FC_SRCEXT} macro deals with both of these issues.
 
 The @code{AC_FC_SRCEXT} tries to get the @code{FC} compiler to accept files
@@ -6161,7 +6164,7 @@ The @address@hidden can @emph{n
 compilers.  First, only one @address@hidden can be used at a
 time, so files with different extensions must be compiled separately.
 Second, @address@hidden must appear @emph{immediately} before
-the source-code filename when compiling.  So, continuing the example
+the source-code file name when compiling.  So, continuing the example
 above, you might compile a @file{foo.f90} file in your Makefile with the
 command:
 
@@ -8342,7 +8345,7 @@ considers it is trashed).
 @itemx -C @var{directory}
 Specify the name of the directory where the result should be cached.
 Passing an empty value disables caching.  Be sure to pass a relative
-path name, as for the time being, global caches are not supported.
+file name, as for the time being, global caches are not supported.
 
 @item --no-cache
 Don't cache the results.
@@ -8376,7 +8379,7 @@ use the following special escapes:
 The character @samp{$}.
 
 @item $f
-The filename from which @var{macro} is called.
+The file name from which @var{macro} is called.
 
 @item $l
 The line number from which @var{macro} is called.
@@ -8713,9 +8716,9 @@ For the time being, it is not mature eno
 M4sh provides portable alternatives for some common shell constructs
 that unfortunately are not portable in practice.
 
address@hidden AS_DIRNAME (@var{pathname})
address@hidden AS_DIRNAME (@var{file-name})
 @asindex{DIRNAME}
-Return the directory portion of @var{pathname}, using the algorithm
+Return the directory portion of @var{file-name}, using the algorithm
 required by @acronym{POSIX}.  @xref{Limitations of Usual Tools}, for more
 details about what this returns and why it is more portable than the
 @command{dirname} command.
@@ -8728,13 +8731,13 @@ RUN-IF-TRUE, else run shell code RUN-IF-
 RUN-IF-TRUE or RUN-IF-FALSE is empty.
 @end defmac
 
address@hidden AS_MKDIR_P (@var{filename})
address@hidden AS_MKDIR_P (@var{file-name})
 @asindex{MKDIR_P}
-Make the directory @var{filename}, including intervening directories
-as necessary.  This is equivalent to @samp{mkdir -p @var{filename}},
+Make the directory @var{file-name}, including intervening directories
+as necessary.  This is equivalent to @samp{mkdir -p @var{file-name}},
 except that it is portable to older versions of @command{mkdir} that
 lack support for the @option{-p} option.  Also, @code{AS_MKDIR_P}
-succeeds if @var{filename} is a symbolic link to an existing directory,
+succeeds if @var{file-name} is a symbolic link to an existing directory,
 even though @acronym{POSIX} is unclear whether @samp{mkdir -p} should
 succeed in that case.
 @end defmac
@@ -8855,7 +8858,7 @@ Header files.
 @item LIB
 C libraries.
 @item PATH
-The full path names to files, including programs.
+Absolute names of files, including programs.
 @item PROG
 The base names of programs.
 @item MEMBER
@@ -9344,7 +9347,8 @@ after the exclamation point in interpret
 @end example
 
 @noindent
-If you omit the space before the path, then address@hidden based systems
+If you omit the space before the absolute file name,
+then address@hidden based systems
 (such as DYNIX) will ignore the line, because they interpret
 @samp{#! /} as a 4-byte magic number.  Some old systems have quite
 small limits on the length of the @samp{#!} line too, for instance 32
@@ -9367,7 +9371,7 @@ There are other sources of documentation
 * Shellology::                  A zoology of shells
 * Here-Documents::              Quirks and tricks
 * File Descriptors::            FDs and redirections
-* File System Conventions::     File- and pathnames
+* File System Conventions::     File names
 * Shell Substitutions::         Variable and command expansions
 * Assignments::                 Varying side effects of assignments
 * Parentheses::                 Parentheses in shell scripts
@@ -9697,8 +9701,7 @@ bar}; see @ref{Limitations of Builtins},
 
 While @command{autoconf} and friends will usually be run on some Unix
 variety, it can and will be used on other systems, most notably @acronym{DOS}
-variants.  This impacts several assumptions regarding file and
-path names.
+variants.  This impacts several assumptions regarding file names.
 
 @noindent
 For example, the following code:
@@ -9713,7 +9716,7 @@ esac
 @end example
 
 @noindent
-will fail to properly detect absolute paths on those systems, because
+will fail to properly detect absolute file names on those systems, because
 they can use a drivespec, and will usually use a backslash as directory
 separator.  If you want to be portable to @acronym{DOS} variants (at the
 price of rejecting valid but oddball Unix file names like @file{a:\b}),
@@ -9752,7 +9755,7 @@ identifies problems that exist even unde
 
 @table @asis
 @item No multiple dots (@sc{sfn})
address@hidden cannot handle multiple dots in filenames.  This is an especially
address@hidden cannot handle multiple dots in file names.  This is an especially
 important thing to remember when building a portable configure script,
 as @command{autoconf} uses a .in suffix for template files.
 
@@ -9776,7 +9779,7 @@ AC_OUTPUT
 @end example
 
 @item No leading dot (@sc{sfn})
address@hidden cannot handle filenames that start with a dot.  This is usually
address@hidden cannot handle file names that start with a dot.  This is usually
 not a very important issue for @command{autoconf}.
 
 @item Case insensitivity (@sc{lfn})
@@ -9788,21 +9791,21 @@ the directory, @samp{make install} will 
 
 @item The 8+3 limit (@sc{sfn})
 Because the @acronym{DOS} file system only stores the first 8 characters of
-the filename and the first 3 of the extension, those must be unique.
+the file name and the first 3 of the extension, those must be unique.
 That means that @file{foobar-part1.c}, @file{foobar-part2.c} and
address@hidden all resolve to the same filename
address@hidden all resolve to the same file name
 (@file{FOOBAR-P.C}).  The same goes for @file{foo.bar} and
 @file{foo.bartender}.
 
 Note: This is not usually a problem under Windows, as it uses numeric
-tails in the short version of filenames to make them unique.  However, a
+tails in the short version of file names to make them unique.  However, a
 registry setting can turn this behavior off.  While this makes it
 possible to share file trees containing long file names between @sc{sfn}
 and @sc{lfn} environments, it also means the above problem applies there
 as well.
 
 @item Invalid characters (@sc{lfn})
-Some characters are invalid in @acronym{DOS} filenames, and should therefore
+Some characters are invalid in @acronym{DOS} file names, and should therefore
 be avoided.  In a @sc{lfn} environment, these are @samp{/}, @samp{\},
 @samp{?}, @samp{*}, @samp{:}, @samp{<}, @samp{>}, @samp{|} and @samp{"}.
 In a @sc{sfn} environment, other characters are also invalid.  These
@@ -10174,7 +10177,7 @@ parentheses.  There is a similar problem
 parentheses like this:
 
 @example
-case $filename in
+case $file_name in
 (*.c) echo "C source code";;
 esac
 @end example
@@ -10222,11 +10225,11 @@ fallback value is needed.  We list these
 @item CDPATH
 @evindex CDPATH
 When this variable is set it specifies a list of directories to search
-when invoking @code{cd} with a relative filename.  @acronym{POSIX}
+when invoking @code{cd} with a relative file name.  @acronym{POSIX}
 1003.1-2001 says that if a nonempty directory name from @code{CDPATH}
 is used successfully, @code{cd} prints the resulting absolute
-filename.  Unfortunately this output can break idioms like
address@hidden src && pwd`} because @code{abs} receives the path twice.
+file name.  Unfortunately this output can break idioms like
address@hidden src && pwd`} because @code{abs} receives the name twice.
 Also, many shells do not conform to this part of @acronym{POSIX}; for
 example, @command{zsh} prints the result only if a directory name
 other than @file{.} was chosen from @code{CDPATH}.
@@ -10429,7 +10432,7 @@ PS4='+ '
 @evindex PWD
 @acronym{POSIX} 1003.1-2001 requires that @command{cd} and
 @command{pwd} must update the @env{PWD} environment variable to point
-to the logical path to the current directory, but traditional shells
+to the logical name of the current directory, but traditional shells
 do not support this.  This can cause confusion if one shell instance
 maintains @env{PWD} but a subsidiary and different shell does not know
 about @env{PWD} and executes @command{cd}; in this case @env{PWD} will
@@ -10450,7 +10453,7 @@ variable accordingly.
 On DJGPP systems, the @code{PATH_SEPARATOR} environment variable can be
 set to either @samp{:} or @samp{;} to control the path separator
 Bash uses to set up certain environment variables (such as
address@hidden).  Since this only works inside Bash, you want
address@hidden).  Since this only works inside Bash, you want
 @command{configure} to detect the regular @acronym{DOS} path separator
 (@samp{;}), so it can be safely substituted in files that may not support
 @samp{;} as path separator.  So it is recommended to either unset this
@@ -10559,7 +10562,7 @@ bash-2.02$
 
 @noindent
 This is extremely unfortunate, since you are likely to use this code to
-handle Unix or @sc{ms-dos} absolute paths.  To work around this
+handle Unix or @sc{ms-dos} absolute file names.  To work around this
 bug, always put the backslash first:
 
 @example
@@ -11278,15 +11281,15 @@ This handles a few subtleties in the sta
 
 @quotation
 No, under some older flavors of Unix, leading @samp{//} is a special
-path name: it refers to a ``super-root'' and is used to access other
+file name: it refers to a ``super-root'' and is used to access other
 machines' files.  Leading @samp{///}, @samp{////}, etc.@: are equivalent
 to @samp{/}; but leading @samp{//} is special.  I think this tradition
 started with Apollo Domain/OS, an OS that is still in use on some older
 hosts.
 
 @acronym{POSIX} allows but does not require the special treatment for
address@hidden//}.  It says that the behavior of dirname on path names of the
-form @samp{//([^/]+/*)?}  is implementation defined.  In these cases,
address@hidden//}.  It says that the behavior of @command{dirname} on file 
names of the
+form @samp{//([^/]+/*)?} is implementation defined.  In these cases,
 @acronym{GNU} @command{dirname} returns @samp{/}, but it's more
 portable to return @samp{//} as this works even on those older flavors
 of Unix.
@@ -11521,8 +11524,8 @@ found"} if there are no @samp{.c} files.
 @prindex @command{mkdir}
 @cindex Making directories
 None of @command{mkdir}'s options are portable to older systems.  Instead of
address@hidden -p @var{filename}}, you should use use
address@hidden(@var{filename})} (@pxref{Programming in M4sh}).
address@hidden -p @var{file-name}}, you should use use
address@hidden(@var{file-name})} (@pxref{Programming in M4sh}).
 
 @acronym{POSIX} does not clearly specify whether @samp{mkdir -p foo}
 should succeed when @file{foo} is a symbolic link to an already-existing
@@ -12319,13 +12322,13 @@ Algorithm,, How Directory Searches are P
 Manual}.
 
 If a target needs to be rebuilt, @acronym{GNU} @command{make} discards the
-filename found during the @code{VPATH} search for this target, and
-builds the file locally using the filename given in the @file{Makefile}.
+file name found during the @code{VPATH} search for this target, and
+builds the file locally using the file name given in the @file{Makefile}.
 If a target does not need to be rebuilt, @acronym{GNU} @command{make} uses the
-filename found during the @code{VPATH} search.
+file name found during the @code{VPATH} search.
 
 Other @command{make} implementations, like NetBSD @command{make}, are
-easier to describe: the filename found during the @code{VPATH} search
+easier to describe: the file name found during the @code{VPATH} search
 will be used whether the target needs to be rebuilt or not.  Therefore
 new files are created locally, but existing files are updated at their
 @code{VPATH} location.
@@ -12379,7 +12382,7 @@ location, and how FreeBSD, OpenBSD, and 
 update @file{bar.x}, even when @file{../bar.x} is up to date.
 
 Another point worth mentioning is that once @acronym{GNU} @command{make} has
-decided to ignore a @code{VPATH} filename (e.g., it ignored
+decided to ignore a @code{VPATH} file name (e.g., it ignored
 @file{../bar.x} in the above example) it will continue to ignore it when
 the target occurs as a prerequisite of another rule.
 
@@ -12763,7 +12766,7 @@ case $host in
 esac
 @end example
 
-Another example is filenames made to vary according to system
+Another example is file names made to vary according to system
 conventions.  On Unix-like systems ``dot'' files are usual but on DOS
 systems @file{ini} files are usual.  It may be worth allowing the user
 to override such things though, if it's a matter of personal preference,
@@ -13356,7 +13359,7 @@ Require that @var{file} be instantiated 
 @samp{AC_CONFIG_FILES(@var{file}:@var{template})} was used.  Both
 @var{file} and @var{template} may be @samp{-} in which case the standard
 output and/or standard input, respectively, is used.  If a
address@hidden filename is relative, it is first looked for in the build
address@hidden file name is relative, it is first looked for in the build
 tree, and then in the source tree.  @xref{Configuration Actions}, for
 more details.
 
@@ -14964,7 +14967,7 @@ AC_LIBOBJ([malloc])
 @ovindex U
 @cindex @code{$U}
 When asked for automatic de-ANSI-fication, Automake needs
address@hidden'ed filenames to have @samp{$U} appended to the base
address@hidden'ed file names to have @samp{$U} appended to the base
 names.  Libtool requires the definition of @code{LTLIBOBJS}, whose
 suffixes are mapped to @samp{.lo}.  People used to run snippets such as:
 
@@ -15282,7 +15285,7 @@ variables.
 @c of address@hidden'?  This would help both Autoconf and Autotest.
 
 @item tested programs
-The absolute path and answers to @option{--version} of the tested
+The absolute file name and answers to @option{--version} of the tested
 programs (see @ref{Writing testsuite.at}, @code{AT_TESTED}).
 
 @item configuration log
@@ -15315,14 +15318,14 @@ inherits the package bug report address.
 
 @defmac AT_TESTED (@var{executables})
 @atindex{TESTED}
-Log the path and answer to @option{--version} of each program in
+Log the file name and answer to @option{--version} of each program in
 space-separated list @var{executables}.  Several invocations register
 new executables, in other words, don't fear registering one program
 several times.
 @end defmac
 
-Autotest test suites rely on the @code{PATH} to find the tested program.
-This saves from generating the absolute paths to the various tools, and
+Autotest test suites rely on the @env{PATH} to find the tested program.
+This saves from generating the absolute names of the various tools, and
 makes it possible to test installed programs.  Therefore, knowing what
 programs are being exercised is crucial to understand some problems in
 the test suite itself, or its occasional misuses.  It is a good idea to
@@ -15443,15 +15446,15 @@ different environment.
 
 @cindex @code{AUTOTEST_PATH}
 The variable @code{AUTOTEST_PATH} specifies the testing path to prepend
-to @code{PATH}.  It handles specially relative paths (not starting with
address@hidden/}): they are considered to be relative to the top level of the
+to @env{PATH}.  Relative directory names (not starting with
address@hidden/}) are considered to be relative to the top level of the
 package being built.  All the directories are made absolute, first
 starting from the top level @emph{build} tree, then from the
 @emph{source} tree.  For instance @samp{./testsuite
 AUTOTEST_PATH=tests:bin} for a @file{/src/foo-1.0} source package built
 in @file{/tmp/foo} results in @samp{/tmp/foo/tests:/tmp/foo/bin} and
 then @samp{/src/foo-1.0/tests:/src/foo-1.0/bin} being prepended to
address@hidden
address@hidden
 
 @item @var{number}
 @itemx @address@hidden
@@ -15850,9 +15853,9 @@ Archive}.
 This solution does not conform to the @acronym{GNU} Coding Standards.
 
 @item
-Note that all the previous solutions hard wire the absolute path to
+Note that all the previous solutions hard wire the absolute name of
 these directories in the executables, which is not a good property.  You
-may try to compute the paths relatively to @code{prefix}, and try to
+may try to compute the names relative to @code{prefix}, and try to
 find @code{prefix} at runtime, this way your package is relocatable.
 Some macros are already available to address this issue: see
 @code{adl_COMPUTE_RELATIVE_PATHS} and
Index: doc/install.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/install.texi,v
retrieving revision 1.40
diff -p -u -r1.40 install.texi
--- doc/install.texi    29 Jul 2002 08:20:52 -0000      1.40
+++ doc/install.texi    20 Aug 2004 19:53:02 -0000
@@ -3,8 +3,10 @@
 
 @ifclear autoconf
 
-Copyright @copyright{} 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
address@hidden Installation Instructions
+
+Copyright @copyright{} 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004
+Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -121,17 +123,17 @@ before reconfiguring for another archite
 By default, @samp{make install} will install the package's files in
 @file{/usr/local/bin}, @file{/usr/local/man}, etc.  You can specify an
 installation prefix other than @file{/usr/local} by giving
address@hidden the option @address@hidden
address@hidden the option @address@hidden
 
 You can specify separate installation prefixes for architecture-specific
 files and architecture-independent files.  If you give
address@hidden the option @address@hidden, the
-package will use @var{path} as the prefix for installing programs and
address@hidden the option @address@hidden, the
+package will use @var{prefix} as the prefix for installing programs and
 libraries.  Documentation and other data files will still use the
 regular prefix.
 
 In addition, if you use an unusual directory layout you can give options
-like @address@hidden to specify different values for
+like @address@hidden to specify different values for
 particular kinds of files.  Run @samp{configure --help} for a list of
 the directories you can set and what kinds of files go in them.
 
Index: lib/Autom4te/Configure_ac.pm
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/Autom4te/Configure_ac.pm,v
retrieving revision 1.3
diff -p -u -r1.3 Configure_ac.pm
--- lib/Autom4te/Configure_ac.pm        12 Sep 2003 08:40:36 -0000      1.3
+++ lib/Autom4te/Configure_ac.pm        20 Aug 2004 19:53:02 -0000
@@ -37,14 +37,14 @@ Autom4te::Configure_ac - Locate configur
 
   # Try to locate configure.in or configure.ac in the current
   # directory.  It may be absent.  Complain if both files exist.
-  my $filename = find_configure_ac;
+  my $file_name = find_configure_ac;
 
   # Likewise, but bomb out if the file does not exist.
-  my $filename = require_configure_ac;
+  my $file_name = require_configure_ac;
 
   # Likewise, but in $dir.
-  my $filename = find_configure_ac ($dir);
-  my $filename = require_configure_ac ($dir);
+  my $file_name = find_configure_ac ($dir);
+  my $file_name = require_configure_ac ($dir);
 
 =cut
 
Index: lib/Autom4te/FileUtils.pm
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/Autom4te/FileUtils.pm,v
retrieving revision 1.5
diff -p -u -r1.5 FileUtils.pm
--- lib/Autom4te/FileUtils.pm   9 Sep 2003 15:44:57 -0000       1.5
+++ lib/Autom4te/FileUtils.pm   20 Aug 2004 19:53:02 -0000
@@ -47,9 +47,9 @@ use vars qw (@ISA @EXPORT);
              &xsystem &xqx);
 
 
-=item C<find_file ($filename, @include)>
+=item C<find_file ($file_name, @include)>
 
-Return the first path for a C<$filename> in the C<include>s.
+Return the first name for a C<$file_name> in the C<include>s path.
 
 We match exactly the behavior of GNU M4: first look in the current
 directory (which includes the case of absolute file names), and, if
@@ -60,36 +60,36 @@ if absent, otherwise exit with error.
 
 =cut
 
-# $FILENAME
-# find_file ($FILENAME, @INCLUDE)
-# -------------------------------
+# $FILE-NAME
+# find_file ($FILE-NAME, @INCLUDE)
+# --------------------------------
 sub find_file ($@)
 {
   use File::Spec;
 
-  my ($filename, @include) = @_;
+  my ($file_name, @include) = @_;
   my $optional = 0;
 
   $optional = 1
-    if $filename =~ s/\?$//;
+    if $file_name =~ s/\?$//;
 
-  return File::Spec->canonpath ($filename)
-    if -e $filename;
+  return File::Spec->canonpath ($file_name)
+    if -e $file_name;
 
-  if (File::Spec->file_name_is_absolute ($filename))
+  if (File::Spec->file_name_is_absolute ($file_name))
     {
-      fatal "$filename: no such file or directory"
+      fatal "$file_name: no such file or directory"
        unless $optional;
       return undef;
     }
 
-  foreach my $path (@include)
+  foreach my $dir (@include)
     {
-      return File::Spec->canonpath (File::Spec->catfile ($path, $filename))
-       if -e File::Spec->catfile ($path, $filename)
+      return File::Spec->canonpath (File::Spec->catfile ($dir, $file_name))
+       if -e File::Spec->catfile ($dir, $file_name)
     }
 
-  fatal "$filename: no such file or directory"
+  fatal "$file_name: no such file or directory"
     unless $optional;
 
   return undef;
@@ -290,14 +290,14 @@ sub xsystem ($)
 }
 
 
-=item C<contents ($filename)>
+=item C<contents ($file_name)>
 
-Return the contents of c<$filename>.
+Return the contents of c<$file_name>.
 
 =cut
 
-# contents ($FILENAME)
-# --------------------
+# contents ($FILE-NAME)
+# ---------------------
 sub contents ($)
 {
   my ($file) = @_;
Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.832
diff -p -u -r1.832 general.m4
--- lib/autoconf/general.m4     20 Aug 2004 06:20:11 -0000      1.832
+++ lib/autoconf/general.m4     20 Aug 2004 19:53:02 -0000
@@ -458,7 +458,7 @@ fi
 
 # AC_CONFIG_SRCDIR([UNIQUE-FILE-IN-SOURCE-DIR])
 # ---------------------------------------------
-# UNIQUE-FILE-IN-SOURCE-DIR is a filename unique to this package,
+# UNIQUE-FILE-IN-SOURCE-DIR is a file name unique to this package,
 # relative to the directory that configure is in, which we can look
 # for to find out if srcdir is correct.
 AC_DEFUN([AC_CONFIG_SRCDIR],
@@ -492,7 +492,7 @@ if test ! -r $srcdir/$ac_unique_file; th
 fi
 (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
   AC_MSG_ERROR([sources are in $srcdir, but `cd $srcdir' does not work])
-dnl Double slashes in pathnames in object file debugging info
+dnl Double slashes in file names in object file debugging info
 dnl mess up M-x gdb in Emacs.
 srcdir=`echo "$srcdir" | sed 's%\([[^\\/]]\)[[\\/]]*$%\1%'`
 m4_divert_pop([PARSE_ARGS])dnl
@@ -840,7 +840,7 @@ if test -n "$ac_prev"; then
   AC_MSG_ERROR([missing argument to $ac_option])
 fi
 
-# Be sure to have absolute paths.
+# Be sure to have absolute directory names.
 for ac_var in exec_prefix prefix
 do
   eval ac_val=$`echo $ac_var`
@@ -850,7 +850,7 @@ do
   esac
 done
 
-# Be sure to have absolute paths.
+# Be sure to have absolute directory names.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
              localstatedir libdir includedir oldincludedir infodir mandir
 do
@@ -1000,7 +1000,7 @@ if test "$ac_init_help" = "recursive"; t
   ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
     test -d $ac_dir || continue
-    _AC_SRCPATHS(["$ac_dir"])
+    _AC_SRCDIRS(["$ac_dir"])
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
     if test -f $ac_srcdir/configure.gnu; then
@@ -2406,23 +2406,23 @@ m4_divert_text([DEFAULTS], [ac_config_li
 ])
 
 
-# AC_LIBSOURCE(FILENAME)
-# ----------------------
-# Announce we might need the file `FILENAME'.
+# AC_LIBSOURCE(FILE-NAME)
+# -----------------------
+# Announce we might need the file `FILE-NAME'.
 m4_define([AC_LIBSOURCE], [])
 
 
-# AC_LIBSOURCES([FILENAME1, ...])
+# AC_LIBSOURCES([FILE-NAME1, ...])
 # -------------------------------
 # Announce we might need these files.
 m4_define([AC_LIBSOURCES],
-[m4_foreach([_AC_FILENAME], [$1],
-           [AC_LIBSOURCE(_AC_FILENAME)])])
+[m4_foreach([_AC_FILE_NAME], [$1],
+           [AC_LIBSOURCE(_AC_FILE_NAME)])])
 
 
-# _AC_LIBOBJ(FILENAME-NOEXT, ACTION-IF-INDIR)
-# -------------------------------------------
-# We need `FILENAME-NOEXT.o', save this into `LIBOBJS'.
+# _AC_LIBOBJ(FILE-NAME-NOEXT, ACTION-IF-INDIR)
+# --------------------------------------------
+# We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
 # We don't use AC_SUBST/2 because it forces an unnecessary eol.
 m4_define([_AC_LIBOBJ],
 [AS_LITERAL_IF([$1],
@@ -2440,9 +2440,9 @@ esac
 
 
 
-# AC_LIBOBJ(FILENAME-NOEXT)
+# AC_LIBOBJ(FILE-NAME-NOEXT)
 # -------------------------
-# We need `FILENAME-NOEXT.o', save this into `LIBOBJS'.
+# We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
 # We don't use AC_SUBST/2 because it forces an unnecessary eol.
 m4_define([AC_LIBOBJ],
 [_AC_LIBOBJ([$1],
Index: lib/autoconf/programs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/programs.m4,v
retrieving revision 1.31
diff -p -u -r1.31 programs.m4
--- lib/autoconf/programs.m4    3 Aug 2004 22:06:10 -0000       1.31
+++ lib/autoconf/programs.m4    20 Aug 2004 19:53:02 -0000
@@ -416,7 +416,7 @@ m4_define([_AC_PROG_GREP],
 # _AC_PATH_PROG_FEATURE_CHECK(VARIABLE, PROGNAME-LIST, FEATURE-TEST, [PATH])
 # --------------------------------------------------------------------------
 # FEATURE-TEST is called repeatedly with $ac_path_VARIABLE set to the
-# path to a program named in PROGNAME-LIST.  FEATURE-TEST must set
+# name of a program in PROGNAME-LIST found in PATH.  FEATURE-TEST must set
 # $ac_cv_path_VARIABLE to the path of an acceptable program, or else
 # _AC_PATH_PROG_FEATURE_CHECK will report that no acceptable program
 # was found, and abort.  If a suitable $ac_path_VARIABLE is found in the
@@ -564,15 +564,15 @@ esac])
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-dnl We do special magic for INSTALL instead of AC_SUBST, to get
-dnl relative paths right.
+dnl Do special magic for INSTALL instead of AC_SUBST, to get
+dnl relative names right.
 AC_MSG_RESULT([$INSTALL])
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
Index: lib/autoconf/status.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.45
diff -p -u -r1.45 status.m4
--- lib/autoconf/status.m4      30 Jan 2004 14:21:36 -0000      1.45
+++ lib/autoconf/status.m4      20 Aug 2004 19:53:03 -0000
@@ -120,8 +120,8 @@
 ## Auxiliary macros.  ##
 ## ------------------ ##
 
-# _AC_SRCPATHS(BUILD-DIR-NAME)
-# ----------------------------
+# _AC_SRCDIRS(BUILD-DIR-NAME)
+# ---------------------------
 # Inputs:
 #   - BUILD-DIR-NAME is `top-build -> build' and `top-src -> src'
 #   - `$srcdir' is `top-build -> top-src'
@@ -133,8 +133,8 @@
 # - `ac_srcdir' is `build -> src'.
 # - `ac_top_srcdir' is `build -> top-src'.
 #
-# and `ac_abs_builddir' etc., the absolute paths.
-m4_define([_AC_SRCPATHS],
+# and `ac_abs_builddir' etc., the absolute directory names.
+m4_define([_AC_SRCDIRS],
 [ac_builddir=.
 
 if test $1 != .; then
@@ -153,22 +153,22 @@ case $srcdir in
     else
        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
     fi ;;
-  [[\\/]]* | ?:[[\\/]]* )  # Absolute path.
+  [[\\/]]* | ?:[[\\/]]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
+  *) # Relative name.
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
+# Do not use `cd foo && pwd` to compute absolute names, because
 # the directories may not exist.
 AS_SET_CATFILE([ac_abs_builddir],   [`pwd`],            [$1])
 AS_SET_CATFILE([ac_abs_top_builddir],
                                    [$ac_abs_builddir], [${ac_top_builddir}.])
 AS_SET_CATFILE([ac_abs_srcdir],     [$ac_abs_builddir], [$ac_srcdir])
 AS_SET_CATFILE([ac_abs_top_srcdir], [$ac_abs_builddir], [$ac_top_srcdir])
-])# _AC_SRCPATHS
+])# _AC_SRCDIRS
 
 
 
@@ -369,7 +369,7 @@ for ac_file in : $CONFIG_COMMANDS; do te
   ac_source=`echo "$ac_file" | sed 's,[[^:]]*:,,'`
   ac_dir=`AS_DIRNAME(["$ac_dest"])`
   AS_MKDIR_P(["$ac_dir"])
-  _AC_SRCPATHS(["$ac_dir"])
+  _AC_SRCDIRS(["$ac_dir"])
 
   AC_MSG_NOTICE([executing $ac_dest commands])
 dnl Some shells don't like empty case/esac
@@ -526,7 +526,7 @@ for ac_file in : $CONFIG_HEADERS; do tes
       [[\\/$]]*)
         # Absolute (can't be DOS-style, as IFS=:)
         test -f "$f" || AC_MSG_ERROR([cannot find input file: $f])
-        # Do quote $f, to prevent DOS paths from being IFS'd.
+        # Quote $f, to prevent DOS file names from being IFS'd.
         echo "$f";;
       *) # Relative
         if test -f "$f"; then
@@ -785,7 +785,7 @@ for ac_file in : $CONFIG_LINKS; do test 
   # Make relative symlinks.
   ac_dest_dir=`AS_DIRNAME(["$ac_dest"])`
   AS_MKDIR_P(["$ac_dest_dir"])
-  _AC_SRCPATHS(["$ac_dest_dir"])
+  _AC_SRCDIRS(["$ac_dest_dir"])
 
   case $srcdir in
   [[\\/$]]* | ?:[[\\/]]* ) ac_rel_source=$srcdir/$ac_source ;;
@@ -949,7 +949,7 @@ for ac_file in : $CONFIG_FILES; do test 
   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
   ac_dir=`AS_DIRNAME(["$ac_file"])`
   AS_MKDIR_P(["$ac_dir"])
-  _AC_SRCPATHS(["$ac_dir"])
+  _AC_SRCDIRS(["$ac_dir"])
 
 AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
 [  case $INSTALL in
@@ -1133,7 +1133,7 @@ if test "$no_recursion" != yes; then
 
     AC_MSG_NOTICE([configuring in $ac_dir])
     AS_MKDIR_P(["$ac_dir"])
-    _AC_SRCPATHS(["$ac_dir"])
+    _AC_SRCDIRS(["$ac_dir"])
 
     cd $ac_dir
 
@@ -1154,7 +1154,7 @@ if test "$no_recursion" != yes; then
       # Make the cache file name correct relative to the subdirectory.
       case $cache_file in
       [[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
+      *) # Relative name.
        ac_sub_cache_file=$ac_top_builddir$cache_file ;;
       esac
 
Index: lib/autotest/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autotest/general.m4,v
retrieving revision 1.157
diff -p -u -r1.157 general.m4
--- lib/autotest/general.m4     20 Aug 2004 06:22:12 -0000      1.157
+++ lib/autotest/general.m4     20 Aug 2004 19:53:03 -0000
@@ -116,7 +116,7 @@ m4_define([_m4_divert(TEST_SCRIPT)],    
 # AT_LINE
 # -------
 # Return the current file sans directory, a colon, and the current
-# line.  Be sure to return a _quoted_ filename, so if, for instance,
+# line.  Be sure to return a _quoted_ file name, so if, for instance,
 # the user is lunatic enough to have a file named `dnl' (and I, for
 # one, love to be brainless and stubborn sometimes), then we return a
 # quoted name.
@@ -159,7 +159,7 @@ do
   . ./$at_file || AS_ERROR([invalid content: $at_file])
 done
 
-# atconfig delivers paths relative to the directory the test suite is
+# atconfig delivers names relative to the directory the test suite is
 # in, but the groups themselves are run in testsuite-dir/group-dir.
 if test -n "$at_top_srcdir"; then
   builddir=../..
@@ -417,7 +417,7 @@ if $at_list_p; then
   cat <<_ATEOF
 AT_TESTSUITE_NAME test groups:
 
- NUM: FILENAME:LINE      TEST-GROUP-NAME
+ NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
 
 _ATEOF
@@ -1026,7 +1026,7 @@ m4_defun([AT_ARG_OPTION_ARG],[_AT_ARG_OP
 # -------------------
 # Specify the list of programs exercised by the test suite.  Their
 # versions are logged, and in the case of embedded test suite, they
-# must correspond to the version of the package..  The PATH should be
+# must correspond to the version of the package.  PATH should be
 # already preset so the proper executable will be selected.
 m4_define([AT_TESTED],
 [m4_append_uniq([AT_tested], [$1], [ ])])
Index: lib/m4sugar/m4sh.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sh.m4,v
retrieving revision 1.119
diff -p -u -r1.119 m4sh.m4
--- lib/m4sugar/m4sh.m4 29 Jul 2004 22:28:54 -0000      1.119
+++ lib/m4sugar/m4sh.m4 20 Aug 2004 19:53:03 -0000
@@ -318,7 +318,7 @@ if test "x$as_myself" = x; then
   as_myself=$[0]
 fi
 if test ! -f "$as_myself"; then
-  AS_ERROR([cannot find myself; rerun with an absolute path])
+  AS_ERROR([cannot find myself; rerun with an absolute file name])
 fi
 
 # Work around bugs in pre-3.0 UWIN ksh.
@@ -585,9 +585,9 @@ m4_define([AS_ERROR],
 # This section is lexicographically sorted.
 
 
-# AS_DIRNAME(PATHNAME)
-# --------------------
-# Simulate running `dirname(1)' on PATHNAME, not all systems have it.
+# AS_DIRNAME(FILE-NAME)
+# ---------------------
+# Simulate running `dirname(1)' on FILE-NAME.  Not all systems have it.
 # This macro must be usable from inside ` `.
 #
 # Prefer expr to echo|sed, since expr is usually faster and it handles
@@ -618,9 +618,9 @@ AS_DIRNAME_EXPR([$1]) 2>/dev/null ||
 AS_DIRNAME_SED([$1])])
 
 
-# AS_BASENAME(PATHNAME)
-# --------------------
-# Simulate running `basename(1)' on PATHNAME, not all systems have it.
+# AS_BASENAME(FILE-NAME)
+# ----------------------
+# Simulate running `basename(1)' on FILE-NAME.  Not all systems have it.
 # Also see the comments for AS_DIRNAME.
 
 m4_defun([AS_BASENAME_EXPR],
@@ -745,7 +745,7 @@ _AS_LINENO_WORKS || {
 
 # _AS_LN_S_PREPARE
 # ----------------
-# Don't use conftest.sym to avoid filename issues on DJGPP, where this
+# Don't use conftest.sym to avoid file name issues on DJGPP, where this
 # would yield conftest.sym.exe for DJGPP < 2.04.  And don't use `conftest'
 # as base name to avoid prohibiting concurrency (e.g., concurrent
 # config.statuses).
@@ -836,8 +836,8 @@ else
 fi
 ])# _AS_MKDIR_P_PREPARE
 
-# AS_MKDIR_P(PATH)
-# ----------------
+# AS_MKDIR_P(DIR)
+# ---------------
 # Emulate `mkdir -p' with plain `mkdir'.
 m4_define([AS_MKDIR_P],
 [AS_REQUIRE([_$0_PREPARE])dnl
Index: lib/m4sugar/m4sugar.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sugar.m4,v
retrieving revision 2.76
diff -p -u -r2.76 m4sugar.m4
--- lib/m4sugar/m4sugar.m4      27 Aug 2003 15:14:04 -0000      2.76
+++ lib/m4sugar/m4sugar.m4      20 Aug 2004 19:53:03 -0000
@@ -60,7 +60,7 @@ changequote([, ])
 # long macros we define.
 ifdef([__gnu__], ,
 [errprint(M4sugar requires GNU M4. Install it before installing M4sugar or
-set the M4 environment variable to its path name.)
+set the M4 environment variable to its absolute file name.)
 m4exit(2)])
 
 
Index: tests/local.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/local.at,v
retrieving revision 1.6
diff -p -u -r1.6 local.at
--- tests/local.at      3 May 2004 05:54:17 -0000       1.6
+++ tests/local.at      20 Aug 2004 19:53:03 -0000
@@ -87,8 +87,8 @@ m4_ifval([$4],
 ## ----------------- ##
 
 
-# AT_DATA_M4SUGAR(FILENAME, CONTENTS)
-# -----------------------------------
+# AT_DATA_M4SUGAR(FILE-NAME, CONTENTS)
+# ------------------------------------
 # Escape the invalid tokens with @&address@hidden
 m4_define([AT_DATA_M4SUGAR],
 [AT_DATA([$1],
@@ -111,8 +111,8 @@ m4_define([AT_CHECK_M4SUGAR],
 ## -------------- ##
 
 
-# AT_DATA_M4SH(FILENAME, CONTENTS)
-# --------------------------------
+# AT_DATA_M4SH(FILE-NAME, CONTENTS)
+# ---------------------------------
 # Escape the invalid tokens with @&address@hidden
 m4_define([AT_DATA_M4SH],
 [AT_DATA([$1],
@@ -135,8 +135,8 @@ m4_define([AT_CHECK_M4SH],
 ## ------------------ ##
 
 
-# AT_DATA_AUTOCONF(FILENAME, CONTENTS)
-# ------------------------------------
+# AT_DATA_AUTOCONF(FILE-NAME, CONTENTS)
+# -------------------------------------
 # Escape the invalid tokens with @&address@hidden
 m4_define([AT_DATA_AUTOCONF],
 [AT_DATA([$1],
Index: tests/m4sh.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/m4sh.at,v
retrieving revision 1.38
diff -p -u -r1.38 m4sh.at
--- tests/m4sh.at       24 Nov 2003 10:44:53 -0000      1.38
+++ tests/m4sh.at       20 Aug 2004 19:53:03 -0000
@@ -2,7 +2,7 @@
 
 AT_BANNER([M4sh.])
 
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,10 +31,10 @@ AT_SETUP([LINENO])
 # So just skip if the shell is ZSH.
 AT_CHECK([test -n "${ZSH_VERSION+set}" && exit 77], ignore)
 
-# AT_DATA_LINENO(FILENAME,
+# AT_DATA_LINENO(FILE-NAME,
 #                UNSET-LINENO = true | false, COUNTER, COUNTER-RE)
 # ----------------------------------------------------------------
-# Produce the FILENAME M4sh script which uses the COUNTER LINENO or
+# Produce the FILE-NAME M4sh script which uses the COUNTER LINENO or
 # _oline_, which we can recognized via COUNTER-RE.  Unset LINENO is
 # UNSET-LINENO.
 #
Index: tests/tools.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/tools.at,v
retrieving revision 1.75
diff -p -u -r1.75 tools.at
--- tests/tools.at      30 Jan 2004 14:21:36 -0000      1.75
+++ tests/tools.at      20 Aug 2004 19:53:03 -0000
@@ -46,7 +46,7 @@ AT_BANNER([Executables (autoheader, auto
 
 AT_SETUP([Syntax of the shell scripts])
 
-# Specify the path to the tool, some shells don't honor PATH when
+# Specify the absolute name of the tool, as some shells don't honor PATH when
 # running `sh PROG'.
 
 AT_CHECK_SHELL_SYNTAX([$abs_top_builddir/bin/autoconf], exit 77)
Index: tests/torture.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/torture.at,v
retrieving revision 1.47
diff -p -u -r1.47 torture.at
--- tests/torture.at    9 Aug 2004 23:13:50 -0000       1.47
+++ tests/torture.at    20 Aug 2004 19:53:03 -0000
@@ -505,10 +505,10 @@ AT_CHECK_AUTOCONF
 # In place.
 AT_CHECK([./configure], [], [ignore])
 
-# Relative path.
+# Relative name.
 AT_CHECK([cd at-dir && ../configure], [], [ignore])
 
-# Absolute path.
+# Absolute name.
 at_here=`pwd`
 AT_CHECK([cd at-dir && $at_here/configure], [], [ignore])
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]