New separately configurable autoconf-lib-link directory.

81 files changed, 920 insertions, 208 deletions

diff --git a/autoconf-lib-link/.cvsignore b/autoconf-lib-link/.cvsignore
new file mode 100644
index 0000000..04290fc
--- /dev/null
+++ b/autoconf-lib-link/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+config.cache
+config.log
+config.status
diff --git a/autoconf-lib-link/AUTHORS b/autoconf-lib-link/AUTHORS
new file mode 100644
index 0000000..31b3bc9
--- /dev/null
+++ b/autoconf-lib-link/AUTHORS
@@ -0,0 +1 @@
+Bruno Haible wrote these autoconf macros.
diff --git a/autoconf-lib-link/COPYING b/autoconf-lib-link/COPYING
new file mode 100644
index 0000000..5b8319d
--- /dev/null
+++ b/autoconf-lib-link/COPYING
@@ -0,0 +1 @@
+This subpackage is under the GPL, see file COPYING in the toplevel directory.
diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog
new file mode 100644
index 0000000..4e2c8ec
--- /dev/null
+++ b/autoconf-lib-link/ChangeLog
@@ -0,0 +1,24 @@
+2003-02-12  Bruno Haible  <bruno@clisp.org>
+
+	Extracted from gettext package.
+	* configure.ac: New file.
+	* Makefile.am: New file.
+	* AUTHORS, COPYING, INSTALL, NEWS, README: New files.
+	* m4/Makefile.am: New file.
+	* tests/Makefile.am: New file.
+	* tests/rpath-1: Move temporary directories down under tstdir.
+	Rename global_top_srcdir to global_top_auxdir.
+	* tests/rpath-2_a: Likewise.
+	* tests/rpath-2_b: Likewise.
+	* tests/rpath-3_a: Likewise.
+	* tests/rpath-3_b: Likewise.
+	* tests/rpath-2???: Use $srcdir instead of $top_srcdir/tests.
+	* tests/rpath-3???: Likewise.
+	* tests/rpathcfg.sh: Move temporary directories down under tstdir.
+	Use $srcdir instead of $top_srcdir/tests.
+	* tests/rpath*/Makefile.am: Use global_top_auxdir instead of
+	global_top_srcdir.
+	* tests/rpath*/configure.ac: Use AC_CONFIG_AUX_DIR instead of
+	AC_CONFIG_AUX_DIRS; the latter is undocumented and doesn't work
+	with automake-1.7.2.
+
diff --git a/autoconf-lib-link/INSTALL b/autoconf-lib-link/INSTALL
new file mode 100644
index 0000000..863ccc3
--- /dev/null
+++ b/autoconf-lib-link/INSTALL
@@ -0,0 +1,207 @@
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH 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 `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   For packages that use the GNU libiconv library, you can use the
+`configure' option `--with-libiconv-prefix' to specify the prefix you
+used while installing libiconv.
+
+Particular Systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
+is not installed, it is recommended to use the following options in order
+to use an ANSI C compiler:
+
+     env CC="cc -Ae" ./configure
+
+   On AIX 3, the C include files by default don't define some necessary
+prototype declarations.  If GNU CC is not installed, it is recommended to
+use the following options:
+
+     env CC="xlc -D_ALL_SOURCE" ./configure
+
+   On BeOS, user installed software goes in /boot/home/config, not
+/usr/local.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/home/config
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on.  Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+     CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+   If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
+
+`--help'
+     Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
+
diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am
new file mode 100644
index 0000000..a591aab
--- /dev/null
+++ b/autoconf-lib-link/Makefile.am
@@ -0,0 +1,164 @@
+## Makefile for the autoconf-lib-link directory of GNU gettext
+## Copyright (C) 1995-1999, 2000-2003 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ACLOCAL_AMFLAGS = -I m4 -I ../config/m4
+EXTRA_DIST =
+DISTCLEANFILES =
+
+SUBDIRS = m4 tests
+
+EXTRA_DIST += config.rpath
+
+
+# We want to maintain only one copy of config.rpath. The one in this directory
+# is the source.
+
+all-local: $(srcdir)/../config/config.rpath
+
+$(srcdir)/../config/config.rpath: $(srcdir)/config.rpath
+	cp $(srcdir)/config.rpath $(srcdir)/../config/config.rpath
+
+
+# The AC_CONFIG_AUX_DIR argument in the tests/rpath*/configure.ac files is
+# interpreted in two different contexts:
+#   1. at "make distrib" time, when we call automake, relative to
+#      SRCDIR/tests/rpath*/,
+#   2. at "make check" time, when the directory is copied and configured,
+#      relative to BUILDDIR/tests/tstdir/rp-*/.
+# We choose this argument to be '../../../config', for case 1, and therefore
+# we need to make a local copy of the config directory, for case 2.
+
+all-local: config/config.guess config/config.sub config/install-sh config/ltmain.sh config/mkinstalldirs config/missing config/config.rpath
+
+config/config.guess: $(srcdir)/../config/config.guess
+	test -d config || mkdir config
+	cp $(srcdir)/../config/config.guess config/config.guess
+
+config/config.sub: $(srcdir)/../config/config.sub
+	test -d config || mkdir config
+	cp $(srcdir)/../config/config.sub config/config.sub
+
+config/install-sh: $(srcdir)/../config/install-sh
+	test -d config || mkdir config
+	cp $(srcdir)/../config/install-sh config/install-sh
+
+config/ltmain.sh: $(srcdir)/../config/ltmain.sh
+	test -d config || mkdir config
+	cp $(srcdir)/../config/ltmain.sh config/ltmain.sh
+
+config/mkinstalldirs: $(srcdir)/../config/mkinstalldirs
+	test -d config || mkdir config
+	cp $(srcdir)/../config/mkinstalldirs config/mkinstalldirs
+
+config/missing: $(srcdir)/../config/missing
+	test -d config || mkdir config
+	cp $(srcdir)/../config/missing config/missing
+
+config/config.rpath: $(srcdir)/config.rpath
+	test -d config || mkdir config
+	cp $(srcdir)/config.rpath config/config.rpath
+
+DISTCLEANFILES += config/config.guess config/config.sub config/install-sh config/ltmain.sh config/mkinstalldirs config/missing config/config.rpath
+
+distclean-am:
+	rm -rf config
+
+
+# Documentation tags not known to automake.
+
+ps:
+
+pdf:
+
+html:
+
+
+# Subdirectories with separate autoconfiguration.
+
+CONFIGURES_RPATHX = $(srcdir)/tests/rpathx/Makefile.in $(srcdir)/tests/rpathx/aclocal.m4 $(srcdir)/tests/rpathx/configure
+$(srcdir)/tests/rpathx/Makefile.in: $(srcdir)/tests/rpathx/Makefile.am $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4
+	cd $(srcdir)/tests/rpathx && automake Makefile
+$(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/../config/m4/libtool.m4
+	cd $(srcdir)/tests/rpathx && aclocal -I ../../m4 -I ../../../config/m4
+$(srcdir)/tests/rpathx/configure: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4
+	cd $(srcdir)/tests/rpathx && autoconf
+
+CONFIGURES_RPATHY = $(srcdir)/tests/rpathy/Makefile.in $(srcdir)/tests/rpathy/aclocal.m4 $(srcdir)/tests/rpathy/configure
+$(srcdir)/tests/rpathy/Makefile.in: $(srcdir)/tests/rpathy/Makefile.am $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4
+	cd $(srcdir)/tests/rpathy && automake Makefile
+$(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/../config/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathy && aclocal -I ../../m4 -I ../../../config/m4
+$(srcdir)/tests/rpathy/configure: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4
+	cd $(srcdir)/tests/rpathy && autoconf
+
+CONFIGURES_RPATHZ = $(srcdir)/tests/rpathz/Makefile.in $(srcdir)/tests/rpathz/aclocal.m4 $(srcdir)/tests/rpathz/configure
+$(srcdir)/tests/rpathz/Makefile.in: $(srcdir)/tests/rpathz/Makefile.am $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4
+	cd $(srcdir)/tests/rpathz && automake Makefile
+$(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/../config/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathz && aclocal -I ../../m4 -I ../../../config/m4
+$(srcdir)/tests/rpathz/configure: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4
+	cd $(srcdir)/tests/rpathz && autoconf
+
+CONFIGURES_RPATHLX = $(srcdir)/tests/rpathlx/Makefile.in $(srcdir)/tests/rpathlx/aclocal.m4 $(srcdir)/tests/rpathlx/configure
+$(srcdir)/tests/rpathlx/Makefile.in: $(srcdir)/tests/rpathlx/Makefile.am $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/tests/rpathlx/aclocal.m4
+	cd $(srcdir)/tests/rpathlx && automake Makefile
+$(srcdir)/tests/rpathlx/aclocal.m4: $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathlx && aclocal -I ../../m4
+$(srcdir)/tests/rpathlx/configure: $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/tests/rpathlx/aclocal.m4
+	cd $(srcdir)/tests/rpathlx && autoconf
+
+CONFIGURES_RPATHLY = $(srcdir)/tests/rpathly/Makefile.in $(srcdir)/tests/rpathly/aclocal.m4 $(srcdir)/tests/rpathly/configure
+$(srcdir)/tests/rpathly/Makefile.in: $(srcdir)/tests/rpathly/Makefile.am $(srcdir)/tests/rpathly/configure.ac $(srcdir)/tests/rpathly/aclocal.m4
+	cd $(srcdir)/tests/rpathly && automake Makefile
+$(srcdir)/tests/rpathly/aclocal.m4: $(srcdir)/tests/rpathly/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathly && aclocal -I ../../m4
+$(srcdir)/tests/rpathly/configure: $(srcdir)/tests/rpathly/configure.ac $(srcdir)/tests/rpathly/aclocal.m4
+	cd $(srcdir)/tests/rpathly && autoconf
+
+CONFIGURES_RPATHLYX = $(srcdir)/tests/rpathlyx/Makefile.in $(srcdir)/tests/rpathlyx/aclocal.m4 $(srcdir)/tests/rpathlyx/configure
+$(srcdir)/tests/rpathlyx/Makefile.in: $(srcdir)/tests/rpathlyx/Makefile.am $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/tests/rpathlyx/aclocal.m4
+	cd $(srcdir)/tests/rpathlyx && automake Makefile
+$(srcdir)/tests/rpathlyx/aclocal.m4: $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathlyx && aclocal -I ../../m4
+$(srcdir)/tests/rpathlyx/configure: $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/tests/rpathlyx/aclocal.m4
+	cd $(srcdir)/tests/rpathlyx && autoconf
+
+CONFIGURES_RPATHLZ = $(srcdir)/tests/rpathlz/Makefile.in $(srcdir)/tests/rpathlz/aclocal.m4 $(srcdir)/tests/rpathlz/configure
+$(srcdir)/tests/rpathlz/Makefile.in: $(srcdir)/tests/rpathlz/Makefile.am $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/tests/rpathlz/aclocal.m4
+	cd $(srcdir)/tests/rpathlz && automake Makefile
+$(srcdir)/tests/rpathlz/aclocal.m4: $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathlz && aclocal -I ../../m4
+$(srcdir)/tests/rpathlz/configure: $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/tests/rpathlz/aclocal.m4
+	cd $(srcdir)/tests/rpathlz && autoconf
+
+CONFIGURES_RPATHLZYX = $(srcdir)/tests/rpathlzyx/Makefile.in $(srcdir)/tests/rpathlzyx/aclocal.m4 $(srcdir)/tests/rpathlzyx/configure
+$(srcdir)/tests/rpathlzyx/Makefile.in: $(srcdir)/tests/rpathlzyx/Makefile.am $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/tests/rpathlzyx/aclocal.m4
+	cd $(srcdir)/tests/rpathlzyx && automake Makefile
+$(srcdir)/tests/rpathlzyx/aclocal.m4: $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+	cd $(srcdir)/tests/rpathlzyx && aclocal -I ../../m4
+$(srcdir)/tests/rpathlzyx/configure: $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/tests/rpathlzyx/aclocal.m4
+	cd $(srcdir)/tests/rpathlzyx && autoconf
+
+SUBCONFIGURES = $(CONFIGURES_RPATHX) $(CONFIGURES_RPATHY) $(CONFIGURES_RPATHZ) $(CONFIGURES_RPATHLX) $(CONFIGURES_RPATHLY) $(CONFIGURES_RPATHLYX) $(CONFIGURES_RPATHLZ) $(CONFIGURES_RPATHLZYX)
+
+subconfigures: $(SUBCONFIGURES)
+
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: subconfigures
diff --git a/autoconf-lib-link/NEWS b/autoconf-lib-link/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/autoconf-lib-link/NEWS
diff --git a/autoconf-lib-link/README b/autoconf-lib-link/README
new file mode 100644
index 0000000..ca04d46
--- /dev/null
+++ b/autoconf-lib-link/README
@@ -0,0 +1 @@
+This subpackage defines autoconf macros for linking with shared libraries.
diff --git a/autoconf-lib-link/configure.ac b/autoconf-lib-link/configure.ac
new file mode 100644
index 0000000..889fbd8
--- /dev/null
+++ b/autoconf-lib-link/configure.ac
@@ -0,0 +1,67 @@
+dnl Configuration for the autoconf-lib-link directory of GNU gettext
+dnl Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.57)
+AC_INIT
+AC_CONFIG_SRCDIR(tests/rpath-1a)
+AC_CONFIG_AUX_DIR(../config)
+. $srcdir/../version.sh
+AM_INIT_AUTOMAKE(autoconf-lib-link, $VERSION_NUMBER)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+
+dnl Check for host type.
+AC_CANONICAL_HOST
+
+dnl Checks for UNIX variants that set DEFS,
+
+dnl Checks for compiler output filename suffixes.
+AC_OBJEXT
+AC_EXEEXT
+
+dnl Check for build configuration.
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+dnl Checks for libraries.
+
+dnl Checks for header files.
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+
+dnl Checks for library functions.
+
+dnl Checks for tests/rpathcfg.
+AC_SUBST(GCC)
+AC_SUBST(LD)
+AC_SUBST(with_gnu_ld)
+
+aclocaldir='${datadir}/aclocal'
+AC_SUBST(aclocaldir)
+
+AC_CONFIG_FILES([Makefile],
+                [FIX_MAKEFILE_DISTRIB([Makefile])])
+
+AC_CONFIG_FILES([m4/Makefile])
+
+AC_CONFIG_FILES([tests/Makefile])
+
+AC_OUTPUT
diff --git a/autoconf-lib-link/m4/Makefile.am b/autoconf-lib-link/m4/Makefile.am
new file mode 100644
index 0000000..7102e38
--- /dev/null
+++ b/autoconf-lib-link/m4/Makefile.am
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+
+# Files installed for use by aclocal.
+
+aclocaldir = @aclocaldir@
+aclocal_DATA = \
+  lib-ld.m4 \
+  lib-link.m4 \
+  lib-prefix.m4
+
+# Generate this list with
+# find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
+EXTRA_DIST = README \
+lib-ld.m4 \
+lib-link.m4 \
+lib-prefix.m4
diff --git a/autoconf-lib-link/tests/Makefile.am b/autoconf-lib-link/tests/Makefile.am
new file mode 100644
index 0000000..3424f61
--- /dev/null
+++ b/autoconf-lib-link/tests/Makefile.am
@@ -0,0 +1,79 @@
+## Makefile for the autoconf-lib-link/tests subdirectory of GNU gettext
+## Copyright (C) 1995-1997, 2001-2003 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
+MOSTLYCLEANFILES =
+
+TESTS = rpath-1a rpath-1b \
+	rpath-2aaa rpath-2aab rpath-2aac rpath-2aad \
+	rpath-2aba rpath-2abb rpath-2abc rpath-2abd \
+	rpath-2baa rpath-2bab rpath-2bac rpath-2bad \
+	rpath-2bba rpath-2bbb rpath-2bbc rpath-2bbd \
+	rpath-3aaa rpath-3aab rpath-3aac rpath-3aad \
+	           rpath-3aaf            rpath-3aah \
+	rpath-3aba rpath-3abb rpath-3abc rpath-3abd \
+	           rpath-3abf            rpath-3abh \
+	rpath-3baa rpath-3bab rpath-3bac rpath-3bad \
+	rpath-3bae rpath-3baf rpath-3bag rpath-3bah \
+	rpath-3bba rpath-3bbb rpath-3bbc rpath-3bbd \
+	rpath-3bbe rpath-3bbf rpath-3bbg rpath-3bbh
+
+EXTRA_DIST = $(TESTS) \
+	rpathx/configure.ac rpathx/aclocal.m4 rpathx/configure \
+	rpathx/Makefile.am rpathx/Makefile.in rpathx/rpathx.c \
+	rpathy/configure.ac rpathy/aclocal.m4 rpathy/configure \
+	rpathy/Makefile.am rpathy/Makefile.in rpathy/rpathy.c \
+	rpathz/configure.ac rpathz/aclocal.m4 rpathz/configure \
+	rpathz/Makefile.am rpathz/Makefile.in rpathz/rpathz.c \
+	rpathlx/configure.ac rpathlx/aclocal.m4 rpathlx/configure \
+	rpathlx/Makefile.am rpathlx/Makefile.in rpathlx/usex.c \
+	rpathly/configure.ac rpathly/aclocal.m4 rpathly/configure \
+	rpathly/Makefile.am rpathly/Makefile.in rpathly/usey.c \
+	rpathlyx/configure.ac rpathlyx/aclocal.m4 rpathlyx/configure \
+	rpathlyx/Makefile.am rpathlyx/Makefile.in rpathlyx/usey.c \
+	rpathlz/configure.ac rpathlz/aclocal.m4 rpathlz/configure \
+	rpathlz/Makefile.am rpathlz/Makefile.in rpathlz/usez.c \
+	rpathlzyx/configure.ac rpathlzyx/aclocal.m4 rpathlzyx/configure \
+	rpathlzyx/Makefile.am rpathlzyx/Makefile.in rpathlzyx/usez.c \
+	rpath-1 rpath-2_a rpath-2_b rpath-3_a rpath-3_b rpath.README \
+	rpath-3aae rpath-3aag rpath-3abe rpath-3abg \
+	rpathcfg.sh
+
+TESTS_ENVIRONMENT = top_srcdir=$(srcdir)/../.. srcdir=$(srcdir) \
+		    OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
+		    LIBTOOL='@LIBTOOL@' \
+		    CC='@CC@' CFLAGS='@CFLAGS@' \
+		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
+		    CONFIG_SHELL='$(SHELL)' \
+		    $(SHELL)
+
+# Help maintaining config.rpath.
+rpathcfg: rpathcfg.sh
+	top_srcdir=$(srcdir)/../.. srcdir=$(srcdir) \
+	CONFIG_SHELL='$(SHELL)' \
+	CC='@CC@' GCC='@GCC@' \
+	LDFLAGS='@LDFLAGS@' \
+	LD='@LD@' with_gnu_ld='@with_gnu_ld@' \
+	host='@host@' \
+	$(SHELL) $(srcdir)/rpathcfg.sh > rpathcfg 2> rpathcfg.log
+MOSTLYCLEANFILES += rpathcfg rpathcfg.log
+
+# Clean up the intermediate directory created by running the tests.
+distclean-am:
+	rm -rf tstdir
diff --git a/autoconf-lib-link/tests/rpath-1 b/autoconf-lib-link/tests/rpath-1
index bf186be..0abcff5 100644
--- a/autoconf-lib-link/tests/rpath-1
+++ b/autoconf-lib-link/tests/rpath-1
@@ -4,28 +4,30 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 builddir=`pwd`
-global_top_srcdir=`cd "$top_srcdir" && pwd`
-export global_top_srcdir
+global_top_auxdir=`cd "$top_srcdir"/config && pwd`
+export global_top_auxdir
+
+test -d tstdir || mkdir tstdir
 
 tmpfiles="$tmpfiles $rp-prefix"
 rm -rf $rp-prefix
 mkdir $rp-prefix
 
-tmpfiles="$tmpfiles $rp-build1"
-rm -rf $rp-build1
-mkdir $rp-build1
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd $rp-build1 && tar xf -)
-(cd $rp-build1
+tmpfiles="$tmpfiles tstdir/$rp-build1"
+rm -rf tstdir/$rp-build1
+mkdir tstdir/$rp-build1
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
+(cd tstdir/$rp-build1
  ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
 
-tmpfiles="$tmpfiles $rp-build2"
-rm -rf $rp-build2
-mkdir $rp-build2
-(cd $top_srcdir/tests/rpathlx && tar cf - *) | (cd $rp-build2 && tar xf -)
-(cd $rp-build2
+tmpfiles="$tmpfiles tstdir/$rp-build2"
+rm -rf tstdir/$rp-build2
+mkdir tstdir/$rp-build2
+(cd $srcdir/rpathlx && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
+(cd tstdir/$rp-build2
  ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
diff --git a/autoconf-lib-link/tests/rpath-2_a b/autoconf-lib-link/tests/rpath-2_a
index cbe0e7e..86a743e 100644
--- a/autoconf-lib-link/tests/rpath-2_a
+++ b/autoconf-lib-link/tests/rpath-2_a
@@ -4,18 +4,20 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 builddir=`pwd`
-global_top_srcdir=`cd "$top_srcdir" && pwd`
-export global_top_srcdir
+global_top_auxdir=`cd "$top_srcdir"/config && pwd`
+export global_top_auxdir
+
+test -d tstdir || mkdir tstdir
 
 tmpfiles="$tmpfiles $rp-prefix"
 rm -rf $rp-prefix
 mkdir $rp-prefix
 
-tmpfiles="$tmpfiles $rp-build1"
-rm -rf $rp-build1
-mkdir $rp-build1
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd $rp-build1 && tar xf -)
-(cd $rp-build1
+tmpfiles="$tmpfiles tstdir/$rp-build1"
+rm -rf tstdir/$rp-build1
+mkdir tstdir/$rp-build1
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
+(cd tstdir/$rp-build1
  ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -24,11 +26,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix/lib/librpathx.la
 fi
 
-tmpfiles="$tmpfiles $rp-build2"
-rm -rf $rp-build2
-mkdir $rp-build2
-(cd $top_srcdir/tests/rpathy && tar cf - *) | (cd $rp-build2 && tar xf -)
-(cd $rp-build2
+tmpfiles="$tmpfiles tstdir/$rp-build2"
+rm -rf tstdir/$rp-build2
+mkdir tstdir/$rp-build2
+(cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
+(cd tstdir/$rp-build2
  ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -37,11 +39,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix/lib/librpathy.la
 fi
 
-tmpfiles="$tmpfiles $rp-build3"
-rm -rf $rp-build3
-mkdir $rp-build3
-(cd $top_srcdir/tests/$build3_package && tar cf - *) | (cd $rp-build3 && tar xf -)
-(cd $rp-build3
+tmpfiles="$tmpfiles tstdir/$rp-build3"
+rm -rf tstdir/$rp-build3
+mkdir tstdir/$rp-build3
+(cd $srcdir/$build3_package && tar cf - *) | (cd tstdir/$rp-build3 && tar xf -)
+(cd tstdir/$rp-build3
  ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
diff --git a/autoconf-lib-link/tests/rpath-2_b b/autoconf-lib-link/tests/rpath-2_b
index da6a3c4..354a425 100644
--- a/autoconf-lib-link/tests/rpath-2_b
+++ b/autoconf-lib-link/tests/rpath-2_b
@@ -4,8 +4,10 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 builddir=`pwd`
-global_top_srcdir=`cd "$top_srcdir" && pwd`
-export global_top_srcdir
+global_top_auxdir=`cd "$top_srcdir"/config && pwd`
+export global_top_auxdir
+
+test -d tstdir || mkdir tstdir
 
 tmpfiles="$tmpfiles $rp-prefix1"
 rm -rf $rp-prefix1
@@ -19,11 +21,11 @@ tmpfiles="$tmpfiles $rp-prefix"
 rm -rf $rp-prefix
 mkdir $rp-prefix
 
-tmpfiles="$tmpfiles $rp-build1"
-rm -rf $rp-build1
-mkdir $rp-build1
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd $rp-build1 && tar xf -)
-(cd $rp-build1
+tmpfiles="$tmpfiles tstdir/$rp-build1"
+rm -rf tstdir/$rp-build1
+mkdir tstdir/$rp-build1
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
+(cd tstdir/$rp-build1
  ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix1 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -32,11 +34,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix1/lib/librpathx.la
 fi
 
-tmpfiles="$tmpfiles $rp-build2"
-rm -rf $rp-build2
-mkdir $rp-build2
-(cd $top_srcdir/tests/rpathy && tar cf - *) | (cd $rp-build2 && tar xf -)
-(cd $rp-build2
+tmpfiles="$tmpfiles tstdir/$rp-build2"
+rm -rf tstdir/$rp-build2
+mkdir tstdir/$rp-build2
+(cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
+(cd tstdir/$rp-build2
  ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix2 --with-librpathx-prefix=$builddir/$rp-prefix1 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -45,11 +47,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix2/lib/librpathy.la
 fi
 
-tmpfiles="$tmpfiles $rp-build3"
-rm -rf $rp-build3
-mkdir $rp-build3
-(cd $top_srcdir/tests/$build3_package && tar cf - *) | (cd $rp-build3 && tar xf -)
-(cd $rp-build3
+tmpfiles="$tmpfiles tstdir/$rp-build3"
+rm -rf tstdir/$rp-build3
+mkdir tstdir/$rp-build3
+(cd $srcdir/$build3_package && tar cf - *) | (cd tstdir/$rp-build3 && tar xf -)
+(cd tstdir/$rp-build3
  if test $remove_la = yes; then
    build3_configure_flags=--with-librpathx-prefix=$builddir/$rp-prefix1
  else
diff --git a/autoconf-lib-link/tests/rpath-2aaa b/autoconf-lib-link/tests/rpath-2aaa
index 1c69777..02b0bdd 100755
--- a/autoconf-lib-link/tests/rpath-2aaa
+++ b/autoconf-lib-link/tests/rpath-2aaa
@@ -9,4 +9,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2aab b/autoconf-lib-link/tests/rpath-2aab
index c06cff1..a8e8760 100755
--- a/autoconf-lib-link/tests/rpath-2aab
+++ b/autoconf-lib-link/tests/rpath-2aab
@@ -9,4 +9,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2aac b/autoconf-lib-link/tests/rpath-2aac
index 08779b6..9bf805e 100755
--- a/autoconf-lib-link/tests/rpath-2aac
+++ b/autoconf-lib-link/tests/rpath-2aac
@@ -9,4 +9,4 @@ build2_configure_flags=
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2aad b/autoconf-lib-link/tests/rpath-2aad
index 749a243..17ac5d6 100755
--- a/autoconf-lib-link/tests/rpath-2aad
+++ b/autoconf-lib-link/tests/rpath-2aad
@@ -9,4 +9,4 @@ build2_configure_flags=
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2aba b/autoconf-lib-link/tests/rpath-2aba
index dd39860..507e7de 100755
--- a/autoconf-lib-link/tests/rpath-2aba
+++ b/autoconf-lib-link/tests/rpath-2aba
@@ -10,4 +10,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-2abb b/autoconf-lib-link/tests/rpath-2abb
index 86b37b2..95ce66e 100755
--- a/autoconf-lib-link/tests/rpath-2abb
+++ b/autoconf-lib-link/tests/rpath-2abb
@@ -10,4 +10,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-2abc b/autoconf-lib-link/tests/rpath-2abc
index b38d21d..39b39fc 100755
--- a/autoconf-lib-link/tests/rpath-2abc
+++ b/autoconf-lib-link/tests/rpath-2abc
@@ -10,4 +10,4 @@ build2_configure_flags=
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-2abd b/autoconf-lib-link/tests/rpath-2abd
index 3c54053..7182fb3 100755
--- a/autoconf-lib-link/tests/rpath-2abd
+++ b/autoconf-lib-link/tests/rpath-2abd
@@ -10,4 +10,4 @@ build2_configure_flags=
 build3_package=rpathly
 remove_la=no
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-2baa b/autoconf-lib-link/tests/rpath-2baa
index b056e7f..916c6fd 100755
--- a/autoconf-lib-link/tests/rpath-2baa
+++ b/autoconf-lib-link/tests/rpath-2baa
@@ -11,4 +11,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2bab b/autoconf-lib-link/tests/rpath-2bab
index 57bdd25..00b35aa 100755
--- a/autoconf-lib-link/tests/rpath-2bab
+++ b/autoconf-lib-link/tests/rpath-2bab
@@ -11,4 +11,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2bac b/autoconf-lib-link/tests/rpath-2bac
index a4d9f5c..ba379b9 100755
--- a/autoconf-lib-link/tests/rpath-2bac
+++ b/autoconf-lib-link/tests/rpath-2bac
@@ -11,4 +11,4 @@ build2_configure_flags=
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2bad b/autoconf-lib-link/tests/rpath-2bad
index 8768b9c..0dabed0 100755
--- a/autoconf-lib-link/tests/rpath-2bad
+++ b/autoconf-lib-link/tests/rpath-2bad
@@ -11,4 +11,4 @@ build2_configure_flags=
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_a
+. $srcdir/rpath-2_a
diff --git a/autoconf-lib-link/tests/rpath-2bba b/autoconf-lib-link/tests/rpath-2bba
index 13069ee..64f8a64 100755
--- a/autoconf-lib-link/tests/rpath-2bba
+++ b/autoconf-lib-link/tests/rpath-2bba
@@ -12,4 +12,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-2bbb b/autoconf-lib-link/tests/rpath-2bbb
index 09a5442..2591047 100755
--- a/autoconf-lib-link/tests/rpath-2bbb
+++ b/autoconf-lib-link/tests/rpath-2bbb
@@ -12,4 +12,4 @@ build2_configure_flags=--disable-shared
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-2bbc b/autoconf-lib-link/tests/rpath-2bbc
index e62a9ef..0423d3e 100755
--- a/autoconf-lib-link/tests/rpath-2bbc
+++ b/autoconf-lib-link/tests/rpath-2bbc
@@ -12,4 +12,4 @@ build2_configure_flags=
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-2bbd b/autoconf-lib-link/tests/rpath-2bbd
index 9f97ec1..921d014 100755
--- a/autoconf-lib-link/tests/rpath-2bbd
+++ b/autoconf-lib-link/tests/rpath-2bbd
@@ -12,4 +12,4 @@ build2_configure_flags=
 build3_package=rpathlyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-2_b
+. $srcdir/rpath-2_b
diff --git a/autoconf-lib-link/tests/rpath-3_a b/autoconf-lib-link/tests/rpath-3_a
index 4d5d660..4185288 100644
--- a/autoconf-lib-link/tests/rpath-3_a
+++ b/autoconf-lib-link/tests/rpath-3_a
@@ -4,18 +4,20 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 builddir=`pwd`
-global_top_srcdir=`cd "$top_srcdir" && pwd`
-export global_top_srcdir
+global_top_auxdir=`cd "$top_srcdir"/config && pwd`
+export global_top_auxdir
+
+test -d tstdir || mkdir tstdir
 
 tmpfiles="$tmpfiles $rp-prefix"
 rm -rf $rp-prefix
 mkdir $rp-prefix
 
-tmpfiles="$tmpfiles $rp-build1"
-rm -rf $rp-build1
-mkdir $rp-build1
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd $rp-build1 && tar xf -)
-(cd $rp-build1
+tmpfiles="$tmpfiles tstdir/$rp-build1"
+rm -rf tstdir/$rp-build1
+mkdir tstdir/$rp-build1
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
+(cd tstdir/$rp-build1
  ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -24,11 +26,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix/lib/librpathx.la
 fi
 
-tmpfiles="$tmpfiles $rp-build2"
-rm -rf $rp-build2
-mkdir $rp-build2
-(cd $top_srcdir/tests/rpathy && tar cf - *) | (cd $rp-build2 && tar xf -)
-(cd $rp-build2
+tmpfiles="$tmpfiles tstdir/$rp-build2"
+rm -rf tstdir/$rp-build2
+mkdir tstdir/$rp-build2
+(cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
+(cd tstdir/$rp-build2
  ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -37,11 +39,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix/lib/librpathy.la
 fi
 
-tmpfiles="$tmpfiles $rp-build3"
-rm -rf $rp-build3
-mkdir $rp-build3
-(cd $top_srcdir/tests/rpathz && tar cf - *) | (cd $rp-build3 && tar xf -)
-(cd $rp-build3
+tmpfiles="$tmpfiles tstdir/$rp-build3"
+rm -rf tstdir/$rp-build3
+mkdir tstdir/$rp-build3
+(cd $srcdir/rpathz && tar cf - *) | (cd tstdir/$rp-build3 && tar xf -)
+(cd tstdir/$rp-build3
  ${CONFIG_SHELL-/bin/sh} ./configure $build3_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -50,11 +52,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix/lib/librpathz.la
 fi
 
-tmpfiles="$tmpfiles $rp-build4"
-rm -rf $rp-build4
-mkdir $rp-build4
-(cd $top_srcdir/tests/$build4_package && tar cf - *) | (cd $rp-build4 && tar xf -)
-(cd $rp-build4
+tmpfiles="$tmpfiles tstdir/$rp-build4"
+rm -rf tstdir/$rp-build4
+mkdir tstdir/$rp-build4
+(cd $srcdir/$build4_package && tar cf - *) | (cd tstdir/$rp-build4 && tar xf -)
+(cd tstdir/$rp-build4
  ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
diff --git a/autoconf-lib-link/tests/rpath-3_b b/autoconf-lib-link/tests/rpath-3_b
index 875ff24..bdcbe55 100644
--- a/autoconf-lib-link/tests/rpath-3_b
+++ b/autoconf-lib-link/tests/rpath-3_b
@@ -4,8 +4,10 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 builddir=`pwd`
-global_top_srcdir=`cd "$top_srcdir" && pwd`
-export global_top_srcdir
+global_top_auxdir=`cd "$top_srcdir"/config && pwd`
+export global_top_auxdir
+
+test -d tstdir || mkdir tstdir
 
 tmpfiles="$tmpfiles $rp-prefix1"
 rm -rf $rp-prefix1
@@ -23,11 +25,11 @@ tmpfiles="$tmpfiles $rp-prefix"
 rm -rf $rp-prefix
 mkdir $rp-prefix
 
-tmpfiles="$tmpfiles $rp-build1"
-rm -rf $rp-build1
-mkdir $rp-build1
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd $rp-build1 && tar xf -)
-(cd $rp-build1
+tmpfiles="$tmpfiles tstdir/$rp-build1"
+rm -rf tstdir/$rp-build1
+mkdir tstdir/$rp-build1
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
+(cd tstdir/$rp-build1
  ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix1 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -36,11 +38,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix1/lib/librpathx.la
 fi
 
-tmpfiles="$tmpfiles $rp-build2"
-rm -rf $rp-build2
-mkdir $rp-build2
-(cd $top_srcdir/tests/rpathy && tar cf - *) | (cd $rp-build2 && tar xf -)
-(cd $rp-build2
+tmpfiles="$tmpfiles tstdir/$rp-build2"
+rm -rf tstdir/$rp-build2
+mkdir tstdir/$rp-build2
+(cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
+(cd tstdir/$rp-build2
  ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix2 --with-librpathx-prefix=$builddir/$rp-prefix1 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -49,11 +51,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix2/lib/librpathy.la
 fi
 
-tmpfiles="$tmpfiles $rp-build3"
-rm -rf $rp-build3
-mkdir $rp-build3
-(cd $top_srcdir/tests/rpathz && tar cf - *) | (cd $rp-build3 && tar xf -)
-(cd $rp-build3
+tmpfiles="$tmpfiles tstdir/$rp-build3"
+rm -rf tstdir/$rp-build3
+mkdir tstdir/$rp-build3
+(cd $srcdir/rpathz && tar cf - *) | (cd tstdir/$rp-build3 && tar xf -)
+(cd tstdir/$rp-build3
  ${CONFIG_SHELL-/bin/sh} ./configure $build3_configure_flags --prefix=$builddir/$rp-prefix3 --with-librpathx-prefix=$builddir/$rp-prefix1 --with-librpathy-prefix=$builddir/$rp-prefix2 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
@@ -62,11 +64,11 @@ if test $remove_la = yes; then
   rm -f $rp-prefix3/lib/librpathz.la
 fi
 
-tmpfiles="$tmpfiles $rp-build4"
-rm -rf $rp-build4
-mkdir $rp-build4
-(cd $top_srcdir/tests/$build4_package && tar cf - *) | (cd $rp-build4 && tar xf -)
-(cd $rp-build4
+tmpfiles="$tmpfiles tstdir/$rp-build4"
+rm -rf tstdir/$rp-build4
+mkdir tstdir/$rp-build4
+(cd $srcdir/$build4_package && tar cf - *) | (cd tstdir/$rp-build4 && tar xf -)
+(cd tstdir/$rp-build4
  if test $remove_la = yes; then
    build4_configure_flags="--with-librpathx-prefix=$builddir/$rp-prefix1 --with-librpathy-prefix=$builddir/$rp-prefix2"
  else
diff --git a/autoconf-lib-link/tests/rpath-3aaa b/autoconf-lib-link/tests/rpath-3aaa
index f1ec2d2..f353d80 100755
--- a/autoconf-lib-link/tests/rpath-3aaa
+++ b/autoconf-lib-link/tests/rpath-3aaa
@@ -11,4 +11,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aab b/autoconf-lib-link/tests/rpath-3aab
index 9f828eb..93d157e 100755
--- a/autoconf-lib-link/tests/rpath-3aab
+++ b/autoconf-lib-link/tests/rpath-3aab
@@ -11,4 +11,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aac b/autoconf-lib-link/tests/rpath-3aac
index 19494cd..3d2d6cc 100755
--- a/autoconf-lib-link/tests/rpath-3aac
+++ b/autoconf-lib-link/tests/rpath-3aac
@@ -11,4 +11,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aad b/autoconf-lib-link/tests/rpath-3aad
index 3b6bc6e..3e35be0 100755
--- a/autoconf-lib-link/tests/rpath-3aad
+++ b/autoconf-lib-link/tests/rpath-3aad
@@ -11,4 +11,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aae b/autoconf-lib-link/tests/rpath-3aae
index 2f22fd0..6bea00f 100755
--- a/autoconf-lib-link/tests/rpath-3aae
+++ b/autoconf-lib-link/tests/rpath-3aae
@@ -11,4 +11,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aaf b/autoconf-lib-link/tests/rpath-3aaf
index d4a5e4a..102d4eb 100755
--- a/autoconf-lib-link/tests/rpath-3aaf
+++ b/autoconf-lib-link/tests/rpath-3aaf
@@ -11,4 +11,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aag b/autoconf-lib-link/tests/rpath-3aag
index 72b1863..e7f6368 100755
--- a/autoconf-lib-link/tests/rpath-3aag
+++ b/autoconf-lib-link/tests/rpath-3aag
@@ -11,4 +11,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aah b/autoconf-lib-link/tests/rpath-3aah
index 96580e7..21677ee 100755
--- a/autoconf-lib-link/tests/rpath-3aah
+++ b/autoconf-lib-link/tests/rpath-3aah
@@ -11,4 +11,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3aba b/autoconf-lib-link/tests/rpath-3aba
index ba01523..020cf21 100755
--- a/autoconf-lib-link/tests/rpath-3aba
+++ b/autoconf-lib-link/tests/rpath-3aba
@@ -12,4 +12,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3abb b/autoconf-lib-link/tests/rpath-3abb
index 0420668..89542f6 100755
--- a/autoconf-lib-link/tests/rpath-3abb
+++ b/autoconf-lib-link/tests/rpath-3abb
@@ -12,4 +12,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3abc b/autoconf-lib-link/tests/rpath-3abc
index f216b5d..9fd9896 100755
--- a/autoconf-lib-link/tests/rpath-3abc
+++ b/autoconf-lib-link/tests/rpath-3abc
@@ -12,4 +12,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3abd b/autoconf-lib-link/tests/rpath-3abd
index 864b00e..ecf34b9 100755
--- a/autoconf-lib-link/tests/rpath-3abd
+++ b/autoconf-lib-link/tests/rpath-3abd
@@ -12,4 +12,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3abe b/autoconf-lib-link/tests/rpath-3abe
index b7016e9..2590a85 100755
--- a/autoconf-lib-link/tests/rpath-3abe
+++ b/autoconf-lib-link/tests/rpath-3abe
@@ -12,4 +12,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3abf b/autoconf-lib-link/tests/rpath-3abf
index 9fe55dd..860c77a 100755
--- a/autoconf-lib-link/tests/rpath-3abf
+++ b/autoconf-lib-link/tests/rpath-3abf
@@ -12,4 +12,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3abg b/autoconf-lib-link/tests/rpath-3abg
index b01f42f..56c6db5 100755
--- a/autoconf-lib-link/tests/rpath-3abg
+++ b/autoconf-lib-link/tests/rpath-3abg
@@ -12,4 +12,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3abh b/autoconf-lib-link/tests/rpath-3abh
index 4e9e637..c088dbd 100755
--- a/autoconf-lib-link/tests/rpath-3abh
+++ b/autoconf-lib-link/tests/rpath-3abh
@@ -12,4 +12,4 @@ build3_configure_flags=
 build4_package=rpathlz
 remove_la=no
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3baa b/autoconf-lib-link/tests/rpath-3baa
index eeada94..721d4f4 100755
--- a/autoconf-lib-link/tests/rpath-3baa
+++ b/autoconf-lib-link/tests/rpath-3baa
@@ -13,4 +13,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3bab b/autoconf-lib-link/tests/rpath-3bab
index 9eb1d8d..ed5038b 100755
--- a/autoconf-lib-link/tests/rpath-3bab
+++ b/autoconf-lib-link/tests/rpath-3bab
@@ -13,4 +13,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3bac b/autoconf-lib-link/tests/rpath-3bac
index f504388..27f5b49 100755
--- a/autoconf-lib-link/tests/rpath-3bac
+++ b/autoconf-lib-link/tests/rpath-3bac
@@ -13,4 +13,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3bad b/autoconf-lib-link/tests/rpath-3bad
index 728e454..95b3c2f 100755
--- a/autoconf-lib-link/tests/rpath-3bad
+++ b/autoconf-lib-link/tests/rpath-3bad
@@ -13,4 +13,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3bae b/autoconf-lib-link/tests/rpath-3bae
index 8766b1f..c90beb3 100755
--- a/autoconf-lib-link/tests/rpath-3bae
+++ b/autoconf-lib-link/tests/rpath-3bae
@@ -13,4 +13,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3baf b/autoconf-lib-link/tests/rpath-3baf
index fd140a4..57b906d 100755
--- a/autoconf-lib-link/tests/rpath-3baf
+++ b/autoconf-lib-link/tests/rpath-3baf
@@ -13,4 +13,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3bag b/autoconf-lib-link/tests/rpath-3bag
index be5c714..52a83a3 100755
--- a/autoconf-lib-link/tests/rpath-3bag
+++ b/autoconf-lib-link/tests/rpath-3bag
@@ -13,4 +13,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3bah b/autoconf-lib-link/tests/rpath-3bah
index a6d8112..2ec9519 100755
--- a/autoconf-lib-link/tests/rpath-3bah
+++ b/autoconf-lib-link/tests/rpath-3bah
@@ -13,4 +13,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_a
+. $srcdir/rpath-3_a
diff --git a/autoconf-lib-link/tests/rpath-3bba b/autoconf-lib-link/tests/rpath-3bba
index a90ee14..33fa2d9 100755
--- a/autoconf-lib-link/tests/rpath-3bba
+++ b/autoconf-lib-link/tests/rpath-3bba
@@ -14,4 +14,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3bbb b/autoconf-lib-link/tests/rpath-3bbb
index 1276d7e..32dcde7 100755
--- a/autoconf-lib-link/tests/rpath-3bbb
+++ b/autoconf-lib-link/tests/rpath-3bbb
@@ -14,4 +14,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3bbc b/autoconf-lib-link/tests/rpath-3bbc
index 14cd18f..f37295a 100755
--- a/autoconf-lib-link/tests/rpath-3bbc
+++ b/autoconf-lib-link/tests/rpath-3bbc
@@ -14,4 +14,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3bbd b/autoconf-lib-link/tests/rpath-3bbd
index df72cf7..9d5faef 100755
--- a/autoconf-lib-link/tests/rpath-3bbd
+++ b/autoconf-lib-link/tests/rpath-3bbd
@@ -14,4 +14,4 @@ build3_configure_flags=--disable-shared
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3bbe b/autoconf-lib-link/tests/rpath-3bbe
index ea9c458..3e2d96d 100755
--- a/autoconf-lib-link/tests/rpath-3bbe
+++ b/autoconf-lib-link/tests/rpath-3bbe
@@ -14,4 +14,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3bbf b/autoconf-lib-link/tests/rpath-3bbf
index 674fac1..b03f0db 100755
--- a/autoconf-lib-link/tests/rpath-3bbf
+++ b/autoconf-lib-link/tests/rpath-3bbf
@@ -14,4 +14,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3bbg b/autoconf-lib-link/tests/rpath-3bbg
index d824b5d..0a6476c 100755
--- a/autoconf-lib-link/tests/rpath-3bbg
+++ b/autoconf-lib-link/tests/rpath-3bbg
@@ -14,4 +14,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpath-3bbh b/autoconf-lib-link/tests/rpath-3bbh
index 6bf6c9a..02c0bda 100755
--- a/autoconf-lib-link/tests/rpath-3bbh
+++ b/autoconf-lib-link/tests/rpath-3bbh
@@ -14,4 +14,4 @@ build3_configure_flags=
 build4_package=rpathlzyx
 remove_la=yes
 
-. $top_srcdir/tests/rpath-3_b
+. $srcdir/rpath-3_b
diff --git a/autoconf-lib-link/tests/rpathcfg.sh b/autoconf-lib-link/tests/rpathcfg.sh
index 11f241e..25b828b 100755
--- a/autoconf-lib-link/tests/rpathcfg.sh
+++ b/autoconf-lib-link/tests/rpathcfg.sh
@@ -2,32 +2,34 @@
 # Prints information for maintaining config.rpath.
 
 # The caller should set the environment variables
-# top_srcdir, CONFIG_SHELL, CC, GCC, LDFLAGS, LD, with_gnu_ld, host.
+# top_srcdir, srcdir, CONFIG_SHELL, CC, GCC, LDFLAGS, LD, with_gnu_ld, host.
 
 echo "=============== rpathcfg for $host ==============="
 echo
 echo "--------------- config.rpath output ---------------"
-${CONFIG_SHELL-/bin/sh} $top_srcdir/config.rpath "$host" | sed -e 's/^acl_cv_//'
+${CONFIG_SHELL-/bin/sh} $srcdir/../config.rpath "$host" | sed -e 's/^acl_cv_//'
 echo "--------------- experimentally determined ---------------"
-abs_top_srcdir=`cd $top_srcdir && pwd`
 builddir=`pwd`
-global_top_srcdir=`cd "$top_srcdir" && pwd`
-export global_top_srcdir
-rm -rf tstprefix tstbuild tstlib
+global_top_auxdir=`cd "$top_srcdir"/config && pwd`
+export global_top_auxdir
 
-eval `${CONFIG_SHELL-/bin/sh} $top_srcdir/config.rpath "$host" | grep '^acl_cv_wl='`
+test -d tstdir || mkdir tstdir
+
+rm -rf tstprefix tstdir/build tstlib
+
+eval `${CONFIG_SHELL-/bin/sh} $srcdir/../config.rpath "$host" | grep '^acl_cv_wl='`
 wl="$acl_cv_wl"
 
 # Static library suffix (normally "a").
 mkdir tstprefix
-mkdir tstbuild
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd tstbuild && tar xf -)
-(cd tstbuild
+mkdir tstdir/build
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/build && tar xf -)
+(cd tstdir/build
  ${CONFIG_SHELL-/bin/sh} ./configure --disable-shared --prefix=$builddir/tstprefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
-rm -rf tstbuild
+rm -rf tstdir/build
 libext=
 cd tstprefix/lib
 for f in *; do
@@ -45,14 +47,14 @@ rm -rf tstprefix
 
 # Shared library suffix (normally "so").
 mkdir tstprefix
-mkdir tstbuild
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd tstbuild && tar xf -)
-(cd tstbuild
+mkdir tstdir/build
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/build && tar xf -)
+(cd tstdir/build
  ${CONFIG_SHELL-/bin/sh} ./configure --disable-static --prefix=$builddir/tstprefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
-rm -rf tstbuild
+rm -rf tstdir/build
 shlibext=
 cd tstprefix/lib || exit 1
 for f in *; do
@@ -70,14 +72,14 @@ rm -rf tstprefix
 
 # Prepare hardcoding tests.
 mkdir tstprefix
-mkdir tstbuild
-(cd $top_srcdir/tests/rpathx && tar cf - *) | (cd tstbuild && tar xf -)
-(cd tstbuild
+mkdir tstdir/build
+(cd $srcdir/rpathx && tar cf - *) | (cd tstdir/build && tar xf -)
+(cd tstdir/build
  ${CONFIG_SHELL-/bin/sh} ./configure --disable-static --prefix=$builddir/tstprefix > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
-rm -rf tstbuild
+rm -rf tstdir/build
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
@@ -95,8 +97,8 @@ for spec in \
   libdir=`pwd`/tstprefix/lib
   eval flag=\"$spec\"
   echo 1>&2
-  echo "$CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out" 1>&2
-  $CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out
+  echo "$CC $LDFLAGS $srcdir/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out" 1>&2
+  $CC $LDFLAGS $srcdir/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out
   if test $? = 0; then
     mv tstlib tstprefix/lib
     echo "ok, running created a.out." 1>&2
@@ -121,8 +123,8 @@ if test -n "$hardcode_libdir_flag_spec"; then
   libdir=/tmp
   eval flag2=\"$spec\"
   echo 1>&2
-  echo "$CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstlib/librpathx.$shlibext $flag1 $flag2 -o a.out" 1>&2
-  $CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstlib/librpathx.$shlibext $flag1 $flag2 -o a.out
+  echo "$CC $LDFLAGS $srcdir/rpathlx/usex.c tstlib/librpathx.$shlibext $flag1 $flag2 -o a.out" 1>&2
+  $CC $LDFLAGS $srcdir/rpathlx/usex.c tstlib/librpathx.$shlibext $flag1 $flag2 -o a.out
   if test $? = 0; then
     mv tstlib tstprefix/lib
     echo "ok, running created a.out." 1>&2
@@ -139,8 +141,8 @@ if test -n "$hardcode_libdir_flag_spec"; then
     libdir=`pwd`/tstprefix/lib:/tmp
     eval flag=\"$spec\"
     echo 1>&2
-    echo "$CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out" 1>&2
-    $CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out
+    echo "$CC $LDFLAGS $srcdir/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out" 1>&2
+    $CC $LDFLAGS $srcdir/rpathlx/usex.c tstlib/librpathx.$shlibext $flag -o a.out
     if test $? = 0; then
       mv tstlib tstprefix/lib
       echo "ok, running created a.out." 1>&2
@@ -165,8 +167,8 @@ fi
 # resulting binary.
 hardcode_direct=no
 echo 1>&2
-echo "$CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstprefix/lib/librpathx.$shlibext -o a.out" 1>&2
-$CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c tstprefix/lib/librpathx.$shlibext -o a.out
+echo "$CC $LDFLAGS $srcdir/rpathlx/usex.c tstprefix/lib/librpathx.$shlibext -o a.out" 1>&2
+$CC $LDFLAGS $srcdir/rpathlx/usex.c tstprefix/lib/librpathx.$shlibext -o a.out
 if test $? = 0; then
   echo "ok, running created a.out." 1>&2
   if ./a.out; then
@@ -179,8 +181,8 @@ rm -f a.out
 # resulting binary.
 hardcode_minus_L=no
 echo 1>&2
-echo "$CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c -Ltstprefix/lib -lrpathx -o a.out" 1>&2
-$CC $LDFLAGS $top_srcdir/tests/rpathlx/usex.c -Ltstprefix/lib -lrpathx -o a.out
+echo "$CC $LDFLAGS $srcdir/rpathlx/usex.c -Ltstprefix/lib -lrpathx -o a.out" 1>&2
+$CC $LDFLAGS $srcdir/rpathlx/usex.c -Ltstprefix/lib -lrpathx -o a.out
 if test $? = 0; then
   echo "ok, running created a.out." 1>&2
   if ./a.out; then
@@ -190,7 +192,7 @@ fi
 rm -f a.out
 
 # Clean up.
-rm -rf tstprefix
+rm -rf tstprefix tstdir
 
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
diff --git a/autoconf-lib-link/tests/rpathlx/Makefile.am b/autoconf-lib-link/tests/rpathlx/Makefile.am
index a104bf5..233aa84 100644
--- a/autoconf-lib-link/tests/rpathlx/Makefile.am
+++ b/autoconf-lib-link/tests/rpathlx/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 bin_PROGRAMS = usex
 usex_SOURCES = usex.c
 LDADD = @LIBRPATHX@
diff --git a/autoconf-lib-link/tests/rpathlx/configure.ac b/autoconf-lib-link/tests/rpathlx/configure.ac
index cfcbd3d..73b180e 100644
--- a/autoconf-lib-link/tests/rpathlx/configure.ac
+++ b/autoconf-lib-link/tests/rpathlx/configure.ac
@@ -1,8 +1,25 @@
-# Configuration of a program that links with librpathx.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of a program that links with librpathx.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathlx, 0)
 AC_PROG_CC
 AC_LIB_LINKFLAGS([rpathx])
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])
diff --git a/autoconf-lib-link/tests/rpathly/Makefile.am b/autoconf-lib-link/tests/rpathly/Makefile.am
index 46be50d..d0d4a27 100644
--- a/autoconf-lib-link/tests/rpathly/Makefile.am
+++ b/autoconf-lib-link/tests/rpathly/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 bin_PROGRAMS = usey
 usey_SOURCES = usey.c
 LDADD = @LIBRPATHY@
diff --git a/autoconf-lib-link/tests/rpathly/configure.ac b/autoconf-lib-link/tests/rpathly/configure.ac
index e793eb0..53559f1 100644
--- a/autoconf-lib-link/tests/rpathly/configure.ac
+++ b/autoconf-lib-link/tests/rpathly/configure.ac
@@ -1,8 +1,25 @@
-# Configuration of a program that links with librpathy.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of a program that links with librpathy.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathly, 0)
 AC_PROG_CC
 AC_LIB_LINKFLAGS([rpathy])
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])
diff --git a/autoconf-lib-link/tests/rpathlyx/Makefile.am b/autoconf-lib-link/tests/rpathlyx/Makefile.am
index 46be50d..d0d4a27 100644
--- a/autoconf-lib-link/tests/rpathlyx/Makefile.am
+++ b/autoconf-lib-link/tests/rpathlyx/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 bin_PROGRAMS = usey
 usey_SOURCES = usey.c
 LDADD = @LIBRPATHY@
diff --git a/autoconf-lib-link/tests/rpathlyx/configure.ac b/autoconf-lib-link/tests/rpathlyx/configure.ac
index 47cccb1..6d685c5 100644
--- a/autoconf-lib-link/tests/rpathlyx/configure.ac
+++ b/autoconf-lib-link/tests/rpathlyx/configure.ac
@@ -1,10 +1,27 @@
-# Configuration of a program that links with librpathy.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of a program that links with librpathy.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathlyx, 0)
 AC_PROG_CC
 AC_LIB_LINKFLAGS([rpathx])
 AC_LIB_LINKFLAGS([rpathy],[rpathx])
 LIBRPATHY="$LIBRPATHY $LIBRPATHX"
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])
diff --git a/autoconf-lib-link/tests/rpathlz/Makefile.am b/autoconf-lib-link/tests/rpathlz/Makefile.am
index 5359cea..8c4327c 100644
--- a/autoconf-lib-link/tests/rpathlz/Makefile.am
+++ b/autoconf-lib-link/tests/rpathlz/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 bin_PROGRAMS = usez
 usez_SOURCES = usez.c
 LDADD = @LIBRPATHZ@
diff --git a/autoconf-lib-link/tests/rpathlz/configure.ac b/autoconf-lib-link/tests/rpathlz/configure.ac
index cf45456..e9e8963 100644
--- a/autoconf-lib-link/tests/rpathlz/configure.ac
+++ b/autoconf-lib-link/tests/rpathlz/configure.ac
@@ -1,8 +1,25 @@
-# Configuration of a program that links with librpathz.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of a program that links with librpathz.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathlz, 0)
 AC_PROG_CC
 AC_LIB_LINKFLAGS([rpathz])
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])
diff --git a/autoconf-lib-link/tests/rpathlzyx/Makefile.am b/autoconf-lib-link/tests/rpathlzyx/Makefile.am
index 5359cea..8c4327c 100644
--- a/autoconf-lib-link/tests/rpathlzyx/Makefile.am
+++ b/autoconf-lib-link/tests/rpathlzyx/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 bin_PROGRAMS = usez
 usez_SOURCES = usez.c
 LDADD = @LIBRPATHZ@
diff --git a/autoconf-lib-link/tests/rpathlzyx/configure.ac b/autoconf-lib-link/tests/rpathlzyx/configure.ac
index b8f4799..a1e5b3b 100644
--- a/autoconf-lib-link/tests/rpathlzyx/configure.ac
+++ b/autoconf-lib-link/tests/rpathlzyx/configure.ac
@@ -1,11 +1,28 @@
-# Configuration of a program that links with librpathz.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of a program that links with librpathz.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathlzyx, 0)
 AC_PROG_CC
 AC_LIB_LINKFLAGS([rpathx])
 AC_LIB_LINKFLAGS([rpathy],[rpathx])
 AC_LIB_LINKFLAGS([rpathz],[rpathx rpathy])
 LIBRPATHZ="$LIBRPATHZ $LIBRPATHY $LIBRPATHX"
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])
diff --git a/autoconf-lib-link/tests/rpathx/Makefile.am b/autoconf-lib-link/tests/rpathx/Makefile.am
index 378fda3..525ce4d 100644
--- a/autoconf-lib-link/tests/rpathx/Makefile.am
+++ b/autoconf-lib-link/tests/rpathx/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 lib_LTLIBRARIES = librpathx.la
 librpathx_la_SOURCES = rpathx.c
 librpathx_la_LDFLAGS = -lc -no-undefined
diff --git a/autoconf-lib-link/tests/rpathx/configure.ac b/autoconf-lib-link/tests/rpathx/configure.ac
index 5308a0c..4975c31 100644
--- a/autoconf-lib-link/tests/rpathx/configure.ac
+++ b/autoconf-lib-link/tests/rpathx/configure.ac
@@ -1,8 +1,25 @@
-# Configuration of librpathx.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of librpathx.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathx, 0)
 AC_PROG_CC
 AM_PROG_LIBTOOL
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])
diff --git a/autoconf-lib-link/tests/rpathy/Makefile.am b/autoconf-lib-link/tests/rpathy/Makefile.am
index 8859f84..26f288b 100644
--- a/autoconf-lib-link/tests/rpathy/Makefile.am
+++ b/autoconf-lib-link/tests/rpathy/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 lib_LTLIBRARIES = librpathy.la
 librpathy_la_SOURCES = rpathy.c
 librpathy_la_LDFLAGS = @LTLIBRPATHX@ -lc -no-undefined
diff --git a/autoconf-lib-link/tests/rpathy/configure.ac b/autoconf-lib-link/tests/rpathy/configure.ac
index 6b7a44e..e415df0 100644
--- a/autoconf-lib-link/tests/rpathy/configure.ac
+++ b/autoconf-lib-link/tests/rpathy/configure.ac
@@ -1,9 +1,26 @@
-# Configuration of librpathy that depends on librpathx.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of librpathy that depends on librpathx.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathy, 0)
 AC_PROG_CC
 AM_PROG_LIBTOOL
 AC_LIB_LINKFLAGS([rpathx])
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])
diff --git a/autoconf-lib-link/tests/rpathz/Makefile.am b/autoconf-lib-link/tests/rpathz/Makefile.am
index 34b8513..e90f44a 100644
--- a/autoconf-lib-link/tests/rpathz/Makefile.am
+++ b/autoconf-lib-link/tests/rpathz/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
-mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
+mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs
 lib_LTLIBRARIES = librpathz.la
 librpathz_la_SOURCES = rpathz.c
 librpathz_la_LDFLAGS = @LTLIBRPATHX@ @LTLIBRPATHY@ -lc -no-undefined
diff --git a/autoconf-lib-link/tests/rpathz/configure.ac b/autoconf-lib-link/tests/rpathz/configure.ac
index 87db95f..3dc8f0c 100644
--- a/autoconf-lib-link/tests/rpathz/configure.ac
+++ b/autoconf-lib-link/tests/rpathz/configure.ac
@@ -1,10 +1,27 @@
-# Configuration of librpathz that depends on librpathx and librpathy.
-AC_INIT(configure.in)
-AC_CONFIG_AUX_DIRS($global_top_srcdir ../..)
+dnl Configuration of librpathz that depends on librpathx and librpathy.
+dnl
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_INIT(configure.ac)
+AC_CONFIG_AUX_DIR(../../../config)
 AM_INIT_AUTOMAKE(gettext_rpathz, 0)
 AC_PROG_CC
 AM_PROG_LIBTOOL
 AC_LIB_LINKFLAGS([rpathx])
 AC_LIB_LINKFLAGS([rpathy],[rpathx])
-AC_SUBST(global_top_srcdir)
+AC_SUBST(global_top_auxdir)
 AC_OUTPUT([Makefile])