diff -ru ../autoconf/ChangeLog ./ChangeLog
--- ../autoconf/ChangeLog	Sun Dec  2 12:48:13 2001
+++ ./ChangeLog	Mon Dec 10 18:29:08 2001
@@ -1,3 +1,14 @@
+2001-12-10  Peter Eisentraut  <address@hidden>
+
+	* lib/autoconf/status.m4 (_AC_SRCPATHS): Rename buildpath to
+	abs_builddir, top_buildpath to abs_top_builddir, srcpath to
+	abs_srcdir, top_srcpath to abs_top_srcdir.
+	(_AC_OUTPUT_FILES): Adjust.
+	* NEWS, doc/autoconf.texi, lib/autoconf/autotest.m4,
+	* tests/atspecific.m4, tests/autoreconf.in, tests/tools.at,
+	* tests/wrappl.in, tests/wrapsh.in: Adjust.
+
+	
 2001-11-26  Akim Demaille  <address@hidden>
 
 	* bin/autoscan.in (%c_keywords): Build it at top level.
diff -ru ../autoconf/NEWS ./NEWS
--- ../autoconf/NEWS	Sun Dec  2 12:48:16 2001
+++ ./NEWS	Mon Dec 10 18:18:17 2001
@@ -25,8 +25,8 @@
   pressure over control version archives.
   Automatic replacement for shells that don't support this feature.
 - New output variables
-  @builddir@, @top_builddir@, @srcpath@, @top_srcpath@, @buildpath@,
-  @address@hidden
+  @builddir@, @top_builddir@, @abs_srcdir@, @abs_top_srcdir@, @abs_builddir@,
+  @address@hidden
 
 ** Emacs
 
@@ -75,8 +75,8 @@
 
 - AC_CONFIG_COMMANDS, HEADERS, FILES, LINKS.
   Provide the user with srcdir, ac_srcdir, ac_top_srcdir, ac_builddir,
-  ac_top_builddir, ac_srcpath, ac_top_srcpath, ac_buildpath,
-  ac_top_buildpath.
+  ac_top_builddir, ac_abs_srcdir, ac_abs_top_srcdir, ac_abs_builddir,
+  ac_abs_top_builddir.
 
 - AC_CONFIG_COMMANDS, HEADERS, FILES, LINKS and AC_OUTPUT.
   Are much less expensive when using long lists of files.
diff -ru ../autoconf/doc/autoconf.texi ./doc/autoconf.texi
--- ../autoconf/doc/autoconf.texi	Sun Dec  2 12:48:50 2001
+++ ./doc/autoconf.texi	Mon Dec 10 18:04:54 2001
@@ -2039,8 +2039,8 @@
 Rigorously equal to @samp{.}.  Added for symmetry only.
 @end defvar
 
address@hidden buildpath
address@hidden buildpath
address@hidden abs_builddir
address@hidden abs_builddir
 Absolute path of @code{builddir}.
 @end defvar
 
@@ -2050,8 +2050,8 @@
 top-level directory, this is the same as @code{srcbuild}.
 @end defvar
 
address@hidden top_buildpath
address@hidden top_buildpath
address@hidden abs_top_builddir
address@hidden abs_top_builddir
 Absolute path of @code{top_builddir}.
 @end defvar
 
@@ -2061,8 +2061,8 @@
 that @file{Makefile}.
 @end defvar
 
address@hidden srcpath
address@hidden srcpath
address@hidden abs_srcdir
address@hidden abs_srcdir
 Absolute path of @code{srcdir}.
 @end defvar
 
@@ -2072,8 +2072,8 @@
 package.  In the top-level directory, this is the same as @code{srcdir}.
 @end defvar
 
address@hidden top_srcpath
address@hidden top_srcpath
address@hidden abs_top_srcdir
address@hidden abs_top_srcdir
 Absolute path of @code{top_srcdir}.
 @end defvar
 
diff -ru ../autoconf/lib/autoconf/autotest.m4 ./lib/autoconf/autotest.m4
--- ../autoconf/lib/autoconf/autotest.m4	Mon Nov 26 11:50:36 2001
+++ ./lib/autoconf/autotest.m4	Mon Dec 10 18:10:42 2001
@@ -87,13 +87,13 @@
 
 # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
 at_testdir='$1'
-buildpath='$ac_buildpath'
+abs_builddir='$ac_abs_builddir'
 at_srcdir='$ac_srcdir'
-srcpath='$ac_srcpath'
+abs_srcdir='$ac_abs_srcdir'
 at_top_srcdir='$ac_top_srcdir'
-top_srcpath='$ac_top_srcpath'
+abs_top_srcdir='$ac_abs_top_srcdir'
 at_top_builddir='$ac_top_builddir'
-top_buildpath='$ac_top_buildpath'
+abs_top_builddir='$ac_abs_top_builddir'
 
 AUTOTEST_PATH='m4_default([$2], [$1])'
 
diff -ru ../autoconf/lib/autoconf/status.m4 ./lib/autoconf/status.m4
--- ../autoconf/lib/autoconf/status.m4	Mon Nov  5 14:04:41 2001
+++ ./lib/autoconf/status.m4	Mon Dec 10 18:07:17 2001
@@ -133,7 +133,7 @@
 # - `ac_srcdir' is `build -> src'.
 # - `ac_top_srcdir' is `build -> top-src'.
 #
-# and `ac_buildpath' etc., the absolute paths.
+# and `ac_abs_builddir' etc., the absolute paths.
 m4_define([_AC_SRCPATHS],
 [ac_builddir=.
 
@@ -162,10 +162,10 @@
 esac
 # Don't blindly perform a `cd $1/$ac_foo && pwd` since $ac_foo can be
 # absolute.
-ac_buildpath=`cd $1 && cd $ac_builddir && pwd`
-ac_top_buildpath=`cd $1 && cd $ac_top_builddir && pwd`
-ac_srcpath=`cd $1 && cd $ac_srcdir && pwd`
-ac_top_srcpath=`cd $1 && cd $ac_top_srcdir && pwd`
+ac_abs_builddir=`cd $1 && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd $1 && cd $ac_top_builddir && pwd`
+ac_abs_srcdir=`cd $1 && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd $1 && cd $ac_top_srcdir && pwd`
 ])# _AC_SRCPATHS
 
 
@@ -965,13 +965,13 @@
 [/@[a-zA-Z_][a-zA-Z_0-9]*@/!b]
 s,@configure_input@,$configure_input,;t t
 s,@srcdir@,$ac_srcdir,;t t
-s,@srcpath@,$ac_srcpath,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
 s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@top_srcpath@,$ac_top_srcpath,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
 s,@builddir@,$ac_builddir,;t t
-s,@buildpath@,$ac_buildpath,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
 s,@top_builddir@,$ac_top_builddir,;t t
-s,@top_buildpath@,$ac_top_buildpath,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
 AC_PROVIDE_IFELSE([AC_PROG_INSTALL], [s,@INSTALL@,$ac_INSTALL,;t t
 ])dnl
 dnl The parens around the eval prevent an "illegal io" in Ultrix sh.
diff -ru ../autoconf/tests/atspecific.m4 ./tests/atspecific.m4
--- ../autoconf/tests/atspecific.m4	Sun Dec  2 12:49:32 2001
+++ ./tests/atspecific.m4	Mon Dec 10 18:16:53 2001
@@ -185,10 +185,10 @@
 #                    [EXIT-STATUS = 0],
 #                    [SDOUT = IGNORE], STDERR)
 # --------------------------------------------
-# `top_srcpath' is needed so that `./configure' finds install-sh.
+# `abs_top_srcdir' is needed so that `./configure' finds install-sh.
 # Using --srcdir is more expensive.
 m4_define([AT_CHECK_CONFIGURE],
-[AT_CHECK([top_srcdir=$top_srcpath ./configure $1],
+[AT_CHECK([top_srcdir=$abs_top_srcdir ./configure $1],
           [$2],
           m4_default([$3], [ignore]), [$4],
           [test $at_verbose = echo && echo "$srcdir/AT_LINE: config.log" && cat config.log])])
diff -ru ../autoconf/tests/autoreconf.in ./tests/autoreconf.in
--- ../autoconf/tests/autoreconf.in	Sun Sep 23 19:17:47 2001
+++ ./tests/autoreconf.in	Mon Dec 10 18:13:18 2001
@@ -3,4 +3,4 @@
 
 me=`echo "$0" | sed -e 's,.*[\\/],,'`
 
-exec @top_buildpath@/bin/$me --autoconf-dir @top_buildpath@/lib ${1+"$@"}
+exec @abs_top_builddir@/bin/$me --autoconf-dir @abs_top_builddir@/lib ${1+"$@"}
diff -ru ../autoconf/tests/tools.at ./tests/tools.at
--- ../autoconf/tests/tools.at	Sun Dec  2 12:49:45 2001
+++ ./tests/tools.at	Mon Dec 10 18:17:23 2001
@@ -73,12 +73,12 @@
 # Specify the path to the tool, some shells don't honor PATH when
 # running `sh PROG'.
 
-AT_CHECK([/bin/sh -n $top_buildpath/bin/autoconf],   0)
+AT_CHECK([/bin/sh -n $abs_top_builddir/bin/autoconf],   0)
 
 # These are not built, they are in the src tree.
-AT_CHECK([/bin/sh -n $top_srcpath/config/install-sh], 0)
-AT_CHECK([/bin/sh -n $top_srcpath/config/mkinstalldirs], 0)
-AT_CHECK([/bin/sh -n $top_srcpath/config/missing], 0)
+AT_CHECK([/bin/sh -n $abs_top_srcdir/config/install-sh], 0)
+AT_CHECK([/bin/sh -n $abs_top_srcdir/config/mkinstalldirs], 0)
+AT_CHECK([/bin/sh -n $abs_top_srcdir/config/missing], 0)
 
 AT_CLEANUP
 
@@ -96,7 +96,7 @@
 # | ./autom4te syntax OK
 # Ignore it, it might change between releases.
 m4_define([AT_CHECK_PERL_SYNTAX],
-[AT_CHECK([autom4te_perllibdir=$top_srcpath/lib $PERL -c $top_buildpath/bin/$1],
+[AT_CHECK([autom4te_perllibdir=$abs_top_srcdir/lib $PERL -c $abs_top_builddir/bin/$1],
           0, [], [ignore])])
 
 AT_CHECK_PERL_SYNTAX([autoheader])
diff -ru ../autoconf/tests/wrappl.in ./tests/wrappl.in
--- ../autoconf/tests/wrappl.in	Mon Nov 26 11:52:31 2001
+++ ./tests/wrappl.in	Mon Dec 10 18:14:12 2001
@@ -9,21 +9,21 @@
 # autoconf which runs autom4te) because by themselves, they try to use
 # subtools from the same directory (i.e., foo/autoheader will run
 # foo/autoconf etc.).
address@hidden@/lib
address@hidden@/lib
 export autom4te_perllibdir
 
 case $me in
   ifnames)
      # Does not have lib files.
-     exec @top_buildpath@/bin/$me ${1+"$@"}
+     exec @abs_top_builddir@/bin/$me ${1+"$@"}
      ;;
   autom4te)
-     address@hidden@/lib/autom4te.cfg
+     address@hidden@/lib/autom4te.cfg
      export AUTOM4TE_CFG
      ;;
 esac
 
 # We might need files from build (frozen files), in addition of src files.
-exec @top_buildpath@/bin/$me \
-     -I @top_buildpath@/lib \
-     -I @top_srcpath@/lib ${1+"$@"}
+exec @abs_top_builddir@/bin/$me \
+     -I @abs_top_builddir@/lib \
+     -I @abs_top_srcdir@/lib ${1+"$@"}
diff -ru ../autoconf/tests/wrapsh.in ./tests/wrapsh.in
--- ../autoconf/tests/wrapsh.in	Sun Sep 23 19:17:47 2001
+++ ./tests/wrapsh.in	Mon Dec 10 18:14:40 2001
@@ -3,4 +3,4 @@
 
 me=`echo "$0" | sed -e 's,.*[\\/],,'`
 
-exec @top_buildpath@/bin/$me --include @top_buildpath@/lib ${1+"$@"}
+exec @abs_top_builddir@/bin/$me --include @abs_top_builddir@/lib ${1+"$@"}