libtool-patches
[Top][All Lists]
Advanced

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

consolidate Makefile.ams [libtool--gary--1.0--patch-17]


From: Gary V. Vaughan
Subject: consolidate Makefile.ams [libtool--gary--1.0--patch-17]
Date: Mon, 11 Apr 2005 17:27:24 +0100 (BST)
User-agent: mailnotify/0.6

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

This changeset came about as a side effect of trying to make
libltdl/Makefile.am work as a standalone top-level Makefile,
for correct installation with `libtoolize --ltdl'.  And Ralf's mail
describing why calling make from a make rule is not a good thing,

The next patch finishes the job, but this one simplifies the interactions
between bootstrap and the various Makefile.ams, as well as speeding things
up a little (no submakes required), and making the dependencies between
files in different directories work implicitly (able to throw away all the
glue rules).

Okay to commit to HEAD?

Should I port to branch-2-0 for ease of future Makefile.am maintenance?

        Since the bootstrap process requires that several of the rules for
        files generated in doc and tests already lived in
        $top_srcdir/Makefile.am, along with proxy rules in sub-Makefiles,
        this changeset consolidates almost everything into the top
        Makefile.am, simplifying things considerably:

        * doc/Makefile.am, tests/Makefile.am: Removed.  All rules moved...
        * Makefile.am: ...to here and adjusted to run from $top_builddir.
        Some reformatting to group rules and declarations by purpose, and
        simplify with respect to removing much of the make recursion.
        * configure.ac (CONF_SUBDIRS): Add tests/ prefix to each subdir to
        compensate.
        (DIST_MAKEFILE_LIST): Adjust.
        (AC_CONFIG_FILES): Remove doc/Makefile and tests/Makefile.
        * tests/defs.m4sh (LIBTOOL, scripts): Adjust paths.
        * tests/cdemo-conf.test, tests/cdemo-exec.test,
        tests/cdemo-make.test, tests/cdemo-shared.test,
        tests/cdemo-static.test, tests/cdemo-undef.test,
        tests/demo-conf.test, tests/demo-deplibs.test,
        tests/demo-exec.test, tests/demo-hardcode.test,
        tests/demo-inst.test, tests/demo-make.test,
        tests/demo-nofast.test, tests/demo-noinst-link.test,
        tests/demo-nopic.test, tests/demo-pic.test,
        tests/demo-relink.test, tests/demo-shared.test,
        tests/demo-static.test, tests/demo-unst.test,
        tests/depdemo-conf.test, tests/depdemo-exec.test,
        tests/depdemo-inst.test, tests/depdemo-make.test,
        tests/depdemo-nofast.test, tests/depdemo-relink.test,
        tests/depdemo-shared.test, tests/depdemo-static.test,
        tests/depdemo-unst.test, tests/f77demo-conf.test,
        tests/f77demo-exec.test, tests/f77demo-make.test,
        tests/f77demo-shared.test, tests/f77demo-static.test,
        tests/link-2.test, tests/link.test, tests/mdemo-conf.test,
        tests/mdemo-dryrun.test, tests/mdemo-exec.test,
        tests/mdemo-inst.test, tests/mdemo-make.test,
        tests/mdemo-shared.test, tests/mdemo-static.test,
        tests/mdemo-unst.test, tests/mdemo2-conf.test,
        tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
        tests/objectlist.test, tests/pdemo-conf.test,
        tests/pdemo-exec.test, tests/pdemo-inst.test,
        tests/pdemo-make.test, tests/quote.test, tests/sh.test,
        tests/suffix.test, tests/tagdemo-conf.test,
        tests/tagdemo-exec.test, tests/tagdemo-make.test,
        tests/tagdemo-shared.test, tests/tagdemo-static.test,
        tests/tagdemo-undef.test, tests/tagtrace.test (func_cd,
        func_require): Adjust paths..

- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCWqVrFRMICSmD1gYRAgYSAJ4hmzFawakMdoJ24Q3EB/cr/pXC0gCfYwUi
VwUkxIptMzZVy5bTTISvNEM=
=Rlxe
-----END PGP SIGNATURE-----
* looking for address@hidden/libtool--gary--1.0--patch-16 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-16
D  doc/.arch-ids/Makefile.am.id
D  doc/Makefile.am
D  tests/.arch-ids/Makefile.am.id
D  tests/Makefile.am
M  Makefile.am
M  tests/depdemo-conf.test
M  tests/depdemo-exec.test
M  tests/depdemo-inst.test
M  tests/depdemo-make.test
M  tests/depdemo-nofast.test
M  tests/depdemo-relink.test
M  tests/depdemo-shared.test
M  tests/depdemo-static.test
M  tests/depdemo-unst.test
M  tests/f77demo-conf.test
M  tests/f77demo-exec.test
M  tests/f77demo-make.test
M  tests/f77demo-shared.test
M  tests/f77demo-static.test
M  tests/link-2.test
M  tests/link.test
M  tests/mdemo-conf.test
M  tests/mdemo-dryrun.test
M  tests/mdemo-exec.test
M  tests/mdemo-inst.test
M  tests/mdemo-make.test
M  tests/mdemo-shared.test
M  tests/mdemo-static.test
M  tests/mdemo-unst.test
M  tests/mdemo2-conf.test
M  tests/mdemo2-exec.test
M  tests/mdemo2-make.test
M  tests/nomode.test
M  tests/pdemo-conf.test
M  tests/pdemo-exec.test
M  tests/pdemo-inst.test
M  tests/pdemo-make.test
M  tests/quote.test
M  tests/sh.test
M  tests/suffix.test
M  tests/tagdemo-conf.test
M  tests/tagdemo-exec.test
M  tests/tagdemo-make.test
M  tests/tagdemo-shared.test
M  tests/tagdemo-static.test
M  configure.ac
M  tests/cdemo-conf.test
M  tests/cdemo-exec.test
M  tests/cdemo-make.test
M  tests/cdemo-shared.test
M  tests/cdemo-static.test
M  tests/defs.m4sh
M  tests/demo-conf.test
M  tests/demo-deplibs.test
M  tests/demo-exec.test
M  tests/demo-hardcode.test
M  tests/demo-inst.test
M  tests/demo-make.test
M  tests/demo-nofast.test
M  tests/demo-noinst-link.test
M  tests/demo-nopic.test
M  tests/demo-pic.test
M  tests/demo-relink.test
M  tests/demo-shared.test
M  tests/demo-static.test
M  tests/demo-unst.test
M  tests/tagtrace.test
M  tests/objectlist.test
M  ChangeLog
M  tests/tagdemo-undef.test
M  tests/cdemo-undef.test

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

        Since the bootstrap process requires that several of the rules for
        files generated in doc and tests already lived in
        $top_srcdir/Makefile.am, along with proxy rules in sub-Makefiles,
        this changeset consolidates almost everything into the top
        Makefile.am, simplifying things considerably:

        * doc/Makefile.am, tests/Makefile.am: Removed.  All rules moved...
        * Makefile.am: ...to here and adjusted to run from $top_builddir.
        Some reformatting to group rules and declarations by purpose, and
        simplify with respect to removing much of the make recursion.
        * configure.ac (CONF_SUBDIRS): Add tests/ prefix to each subdir to
        compensate.
        (DIST_MAKEFILE_LIST): Adjust.
        (AC_CONFIG_FILES): Remove doc/Makefile and tests/Makefile.
        * tests/defs.m4sh (LIBTOOL, scripts): Adjust paths.
        * tests/cdemo-conf.test, tests/cdemo-exec.test,
        tests/cdemo-make.test, tests/cdemo-shared.test,
        tests/cdemo-static.test, tests/cdemo-undef.test,
        tests/demo-conf.test, tests/demo-deplibs.test,
        tests/demo-exec.test, tests/demo-hardcode.test,
        tests/demo-inst.test, tests/demo-make.test,
        tests/demo-nofast.test, tests/demo-noinst-link.test,
        tests/demo-nopic.test, tests/demo-pic.test,
        tests/demo-relink.test, tests/demo-shared.test,
        tests/demo-static.test, tests/demo-unst.test,
        tests/depdemo-conf.test, tests/depdemo-exec.test,
        tests/depdemo-inst.test, tests/depdemo-make.test,
        tests/depdemo-nofast.test, tests/depdemo-relink.test,
        tests/depdemo-shared.test, tests/depdemo-static.test,
        tests/depdemo-unst.test, tests/f77demo-conf.test,
        tests/f77demo-exec.test, tests/f77demo-make.test,
        tests/f77demo-shared.test, tests/f77demo-static.test,
        tests/link-2.test, tests/link.test, tests/mdemo-conf.test,
        tests/mdemo-dryrun.test, tests/mdemo-exec.test,
        tests/mdemo-inst.test, tests/mdemo-make.test,
        tests/mdemo-shared.test, tests/mdemo-static.test,
        tests/mdemo-unst.test, tests/mdemo2-conf.test,
        tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
        tests/objectlist.test, tests/pdemo-conf.test,
        tests/pdemo-exec.test, tests/pdemo-inst.test,
        tests/pdemo-make.test, tests/quote.test, tests/sh.test,
        tests/suffix.test, tests/tagdemo-conf.test,
        tests/tagdemo-exec.test, tests/tagdemo-make.test,
        tests/tagdemo-shared.test, tests/tagdemo-static.test,
        tests/tagdemo-undef.test, tests/tagtrace.test (func_cd,
        func_require): Adjust paths..

--- orig/Makefile.am
+++ mod/Makefile.am
@@ -24,6 +24,55 @@
 
 ACLOCAL_AMFLAGS  = -I m4
 
+BUILD_SUBDIRS  = . libltdl
+SUBDIRS                = $(BUILD_SUBDIRS)
+DIST_SUBDIRS   = $(BUILD_SUBDIRS)
+
+
+## ---------------- ##
+## Libtool scripts. ##
+## ---------------- ##
+
+# The libtool distributor and the standalone libtool script.
+bin_SCRIPTS = libtoolize libtool
+
+libtoolize: $(srcdir)/libtoolize.in
+       rm -f libtoolize.tmp libtoolize
+       $(timestamp); \
+       input="libtoolize.m4sh"; \
+       $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
+               -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \
+               -e "s,@pkgvltdl_files\@,`echo $(ltdldatafiles)`,g" \
+               $(srcdir)/libtoolize.in > libtoolize.tmp
+       chmod a+x libtoolize.tmp
+       chmod a-w libtoolize.tmp
+       mv -f libtoolize.tmp libtoolize
+
+# Use `$(srcdir)' for the benefit of non-GNU makes: this is
+# how libtoolize.in appears in our dependencies.
+EXTRA_DIST += libtoolize.m4sh
+$(srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
+       cd $(srcdir); \
+       rm -f libtoolize.in; \
+       $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in
+
+libtool: $(top_builddir)/config.status $(srcdir)/config/ltmain.sh \
+        $(srcdir)/stamp-vcl
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+
+.PHONY: configure-subdirs
+configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
address@hidden@:
+       dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
+       test -d $$dir || mkdir $$dir || exit 1; \
+       abs_srcdir=`cd $(srcdir) && pwd`; \
+       (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
+
+
+# ---------- #
+# Bootstrap. #
+# ---------- #
+
 edit = sed \
        -e 's,@EGREP\@,$(EGREP),g' \
        -e 's,@FGREP\@,$(FGREP),g' \
@@ -45,39 +94,20 @@
        -e 's,@prefix\@,$(prefix),g' \
        -e "s,@configure_input\@,Generated from $$input; do not edit by hand,g"
 
-timestamp = set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \
+timestamp = set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
        case $(VERSION) in \
          *[acegikmoqsuwy]) TIMESTAMP=" $$1 $$2 $$3" ;; \
          *) TIMESTAMP="" ;; \
        esac
 
-BUILD_SUBDIRS = . libltdl doc tests
-SUBDIRS = $(BUILD_SUBDIRS)
-DIST_SUBDIRS = $(BUILD_SUBDIRS)
-
-sh_files = config/general.m4sh config/getopt.m4sh
-EXTRA_DIST = bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \
-       $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \
-       ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 ChangeLog.2002 \
-       ChangeLog.2003
-CLEANFILES = libtool libtoolize \
-       libtoolize.tmp config/ltmain.tmp m4/ltversion.tmp
-
-## This properly belongs in tests/Makefile.am, but then we would have
-## to pass $(edit) to the submake or, worse, keep two copies of $(edit)
-## in synch, so instead we just build it from this Makefile.am:
-.PHONY: update-package-m4
-update-package-m4: $(top_srcdir)/tests/package.m4
-$(top_srcdir)/tests/package.m4: $(top_srcdir)/configure.ac
-       cd $(top_srcdir); \
-       {                                       \
-         echo '# Signature of the current package.'; \
-         echo 'm4_define([AT_PACKAGE_NAME],      address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_TARNAME],   address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_VERSION],   address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_STRING],    address@hidden@])'; \
-         echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
-       } | $(edit) > tests/package.m4
+sh_files       = config/general.m4sh config/getopt.m4sh
+EXTRA_DIST     = bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \
+                 $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 \
+                 ChangeLog.1998 ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \
+                 ChangeLog.2002 ChangeLog.2003
+CLEANFILES     = libtool libtoolize \
+                 libtoolize.tmp config/ltmain.tmp m4/ltversion.tmp
+DISTCLEANFILES =
 
 # These are required by libtoolize and must be executable when installed.
 # Since _SCRIPTS gets the program transform applied we make them
@@ -90,18 +120,18 @@
 nobase_pkgvdata_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
        m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
 
-## We know that $(top_srcdir)/ChangeLog has been edited if stamp-vcl
-## needs updating, so we assume we have write access to $(top_srcdir).
+## We know that $(srcdir)/ChangeLog has been edited if stamp-vcl
+## needs updating, so we assume we have write access to $(srcdir).
 ## If we try to maintain ./stamp-vcl to avoid writing to a possibly
-## read-only $(top_srcdir), then when the two stamp-vcls differ, distcheck
+## read-only $(srcdir), then when the two stamp-vcls differ, distcheck
 ## will try to update the one in the read-only source tree it makes.
-MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
-$(top_srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog
+MKSTAMP = $(SHELL) $(srcdir)/config/mkstamp
+$(srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog
 vcl-tmp:
-       @set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \
+       @set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
        echo "$$1" > vcl.tmp; \
-       cmp -s vcl.tmp $(top_srcdir)/stamp-vcl \
-         || (echo "Updating stamp-vcl"; cp vcl.tmp $(top_srcdir)/stamp-vcl)
+       cmp -s vcl.tmp $(srcdir)/stamp-vcl \
+         || (echo "Updating stamp-vcl"; cp vcl.tmp $(srcdir)/stamp-vcl)
        address@hidden -f vcl.tmp
 
 ## We used to build ltmain.sh in the build tree, but now it is created
@@ -109,7 +139,7 @@
 ## previous builds left behind in the build tree, that would override the
 ## source tree version in current builds.
 clean-ltmain-sh:
-       @-test "$(top_srcdir)" = "$(top_builddir)" || \
+       @-test "$(srcdir)" = "$(top_builddir)" || \
          rm -f "$(top_builddir)/config/ltmain.sh"
 
 # We build ltversion.m4 here, instead of from config.status,
@@ -117,12 +147,12 @@
 # dependencies change and ltversion.m4 happens to be a configure
 # dependency.  configure and ltversion.m4 would be rebuilt in
 # a loop otherwise.
-# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
+# Use `$(srcdir)/m4' for the benefit of non-GNU makes: this is
 # how ltversion.m4 appears in our dependencies.
 EXTRA_DIST += m4/ltversion.in m4/ltversion.m4
-$(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac 
$(top_srcdir)/stamp-vcl
-       set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \
-       cd $(top_srcdir); \
+$(srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(srcdir)/stamp-vcl
+       set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
+       cd $(srcdir); \
        rm -f m4/ltversion.tmp; \
        serial=`echo $$1 | sed 's,^1[.],,g'`; \
        input="ltversion.in"; \
@@ -134,16 +164,16 @@
 
 ## And for similar reasons, ltmain.sh can't be built from config.status.
 ## !WARNING! If you edit this rule to change the contents of ltmain.sh,
-##           you must `touch $(top_srcdir)/config/ltmain.in' from the
+##           you must `touch $(srcdir)/config/ltmain.in' from the
 ##           shell if you need ltmain.sh to be regenerated.  Ideally, we
 ##           should make this rule depend on Makefile but that will break
 ##           distcheck (at least) by rebuilding ltmain.sh in the source
 ##           tree whenever config.status regenerates the Makefile.
 EXTRA_DIST += config/ltmain.sh
-$(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
-                               $(top_srcdir)/stamp-vcl
+$(srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
+                               $(srcdir)/stamp-vcl
        $(timestamp); \
-       cd $(top_srcdir); \
+       cd $(srcdir); \
        rm -f config/ltmain.in config/ltmain.tmp config/ltmain.sh; \
        $(M4SH) -B ./config config/ltmain.m4sh > config/ltmain.in; \
        input="ltmain.m4sh"; \
@@ -154,63 +184,25 @@
        chmod a-w config/ltmain.tmp; \
        mv -f config/ltmain.tmp config/ltmain.sh
 
-# The libtool distributor and the standalone libtool script.
-bin_SCRIPTS = libtoolize libtool
 
-libtoolize: $(top_srcdir)/libtoolize.in
-       rm -f libtoolize.tmp libtoolize
-       $(timestamp); \
-       input="libtoolize.m4sh"; \
-       $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
-               -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \
-               -e "s,@pkgvltdl_files\@,`echo $(ltdldatafiles)`,g" \
-               $(top_srcdir)/libtoolize.in > libtoolize.tmp
-       chmod a+x libtoolize.tmp
-       chmod a-w libtoolize.tmp
-       mv -f libtoolize.tmp libtoolize
+## -------------- ##
+## Documentation. ##
+## -------------- ##
 
-# Use `$(top_srcdir)' for the benefit of non-GNU makes: this is
-# how libtoolize.in appears in our dependencies.
-EXTRA_DIST += libtoolize.m4sh
-$(top_srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
-       cd $(top_srcdir); \
-       rm -f libtoolize.in; \
-       $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in
+info_TEXINFOS          = doc/libtool.texi
+libtool_TEXINFOS       = doc/PLATFORMS doc/fdl.texi doc/notes.texi
+EXTRA_DIST            += doc/notes.txt
 
-# The defs script shouldn't be recreated whenever the Makefile is
-# regenerated since the source tree can be read-only.
-check-recursive: tests/defs $(top_srcdir)/tests/testsuite
-tests/defs: $(top_srcdir)/tests/defs.in
-       rm -f tests/defs.tmp tests/defs; \
-       input="defs.m4sh"; \
-       $(edit) $(top_srcdir)/tests/defs.in > tests/defs.tmp; \
-       mv -f tests/defs.tmp tests/defs
+all-local: doc/notes.txt
 
-# Use `$(top_srcdir)/tests' for the benefit of non-GNU makes: this is
-# how defs.in appears in our dependencies.
-# No need to EXTRA_DIST defs.m4sh here, that is handled in tests/Makefile.am.
-$(top_srcdir)/tests/defs.in: config/general.m4sh tests/defs.m4sh Makefile.am
-       cd $(top_srcdir); \
-       rm -f tests/defs.in; \
-       $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in
+doc/notes.txt: doc/notes.texi
+       cd $(srcdir)/doc && \
+         $(MAKEINFO) --plaintext $(MAKEINFOFLAGS) -o notes.txt notes.texi
 
-$(top_srcdir)/tests/testsuite:
-       cd tests; \
-       $(MAKE) $(AM_MAKEFLAGS) testsuite
 
-# Automake doesn't want us to generate distributed files from config.status,
-# but the alternative (see libtool-1.4.3) was even uglier!
-libtool: $(top_builddir)/config.status $(top_srcdir)/config/ltmain.sh \
-        $(top_srcdir)/stamp-vcl
-       cd $(top_builddir) && $(SHELL) ./config.status $@
-
-.PHONY: configure-subdirs
-configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
address@hidden@:
-       dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
-       test -d $$dir || mkdir $$dir || exit 1; \
-       abs_srcdir=`cd $(top_srcdir) && pwd`; \
-       (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
+## ------------- ##
+## Installation. ##
+## ------------- ##
 
 ## These are installed as a subdirectory of pkgdatadir so that
 ## libtoolize --ltdl can find them later:
@@ -262,6 +254,11 @@
        chmod +x $(DESTDIR)$(pkgvdatadir)/config/config.sub
        chmod +x $(DESTDIR)$(pkgvdatadir)/config/install-sh
 
+
+## ------------- ##
+## Distribution. ##
+## ------------- ##
+
 ## Make versioned links.  We only run the transform on the root name;
 ## then we make a versioned link with the transformed base name.  This
 ## seemed like the most reasonable approach.
@@ -289,3 +286,179 @@
          *[a-z]) mv $(distdir)/README.alpha $(distdir)/README ;; \
          *)      rm -f $(distdir)/README.alpha ;; \
        esac
+
+
+## ----------- ##
+## Test suite. ##
+## ----------- ##
+
+TESTSUITE      = tests/testsuite
+TESTSUITE_AT   = tests/testsuite.at \
+                 tests/am-subdir.at \
+                 tests/functests.at \
+                 tests/inherited_flags.at \
+                 tests/libtoolize.at \
+                 tests/stresstest.at \
+                 tests/template.at
+
+EXTRA_DIST     += $(TESTSUITE) $(TESTSUITE_AT) tests/package.m4
+
+# Be sure to reexport important environment variables:
+TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
+       CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
+       LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+       OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \
+       CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
+       F77="$(F77)" FFLAGS="$(FFLAGS)"
+
+check-recursive: $(srcdir)/$(TESTSUITE)
+
+# Use `$(srcdir)' for the benefit of non-GNU makes: this is
+# how `testsuite' appears in our dependencies.
+$(srcdir)/$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
+       cd $(srcdir)/tests; \
+       $(AUTOTEST) testsuite.at -o testsuite
+
+$(srcdir)/tests/package.m4: $(srcdir)/configure.ac
+       { \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
+       } | $(edit) > $(srcdir)/tests/package.m4
+
+tests/atconfig: config.status
+       $(SHELL) ./config.status tests/atconfig
+DISTCLEANFILES += atconfig
+
+# Hook the test suite into the check rule
+check-local: tests/atconfig $(srcdir)/$(TESTSUITE)
+       abs_srcdir=`cd $(srcdir); pwd`; \
+       cd tests; \
+       $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) 
$(TESTSUITE_FLAGS)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+       abs_srcdir=`cd $(srcdir); pwd`; \
+       cd tests; \
+       $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) 
$(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
+
+# We need to remove any file droppings left behind by testsuite
+clean-local: clean-local-legacy
+       -test -f $(srcdir)/$(TESTSUITE) && \
+           $(SHELL) $(srcdir)/$(TESTSUITE) --clean
+
+
+## ------------- ##
+## Legacy tests. ##
+## ------------- ##
+
+# !WARNING! Don't add any new tests here, we are migrating to an
+#           Autotest driven framework, please add new test cases
+#           using the new framework above.  When the migration is
+#           complete this section should be removed.
+
+CXX_TESTS = \
+       tests/tagdemo-static.test tests/tagdemo-make.test \
+       tests/tagdemo-exec.test tests/tagdemo-conf.test \
+       tests/tagdemo-make.test tests/tagdemo-exec.test \
+       tests/tagdemo-shared.test tests/tagdemo-make.test \
+       tests/tagdemo-exec.test tests/tagdemo-undef.test \
+       tests/tagdemo-make.test tests/tagdemo-exec.test
+
+F77_TESTS = \
+       tests/f77demo-static.test tests/f77demo-make.test \
+       tests/f77demo-exec.test tests/f77demo-conf.test \
+       tests/f77demo-make.test tests/f77demo-exec.test \
+       tests/f77demo-shared.test tests/f77demo-make.test \
+       tests/f77demo-exec.test
+
+COMMON_TESTS = \
+       tests/link.test tests/link-2.test tests/nomode.test \
+       tests/objectlist.test tests/quote.test tests/sh.test \
+       tests/suffix.test tests/tagtrace.test \
+       tests/cdemo-static.test tests/cdemo-make.test tests/cdemo-exec.test \
+       tests/demo-static.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-unst.test \
+       tests/depdemo-static.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-unst.test \
+       tests/mdemo-static.test tests/mdemo-make.test tests/mdemo-exec.test \
+       tests/mdemo-inst.test tests/mdemo-unst.test \
+       tests/cdemo-conf.test tests/cdemo-make.test tests/cdemo-exec.test \
+       tests/demo-conf.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-unst.test tests/demo-deplibs.test \
+       tests/depdemo-conf.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-unst.test \
+       tests/mdemo-conf.test tests/mdemo-make.test tests/mdemo-exec.test \
+       tests/mdemo-inst.test tests/mdemo-unst.test tests/mdemo-dryrun.test \
+       tests/mdemo2-conf.test tests/mdemo2-make.test tests/mdemo2-exec.test \
+       tests/pdemo-conf.test tests/pdemo-make.test tests/pdemo-exec.test \
+       tests/pdemo-inst.test \
+       tests/demo-nofast.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-unst.test \
+       tests/depdemo-nofast.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-unst.test \
+       tests/demo-pic.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-nopic.test tests/demo-make.test tests/demo-exec.test \
+       tests/cdemo-shared.test tests/cdemo-make.test tests/cdemo-exec.test \
+       tests/demo-shared.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-hardcode.test tests/demo-relink.test \
+       tests/demo-noinst-link.test tests/demo-unst.test \
+       tests/depdemo-shared.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-relink.test tests/depdemo-unst.test \
+       tests/mdemo-shared.test tests/mdemo-make.test tests/mdemo-exec.test \
+       tests/mdemo-inst.test tests/mdemo-unst.test \
+       tests/cdemo-undef.test tests/cdemo-make.test tests/cdemo-exec.test
+
+if HAVE_CXX
+if HAVE_F77
+TESTS = $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
+else
+TESTS = $(COMMON_TESTS) $(CXX_TESTS)
+endif
+else
+if HAVE_F77
+TESTS = $(COMMON_TESTS) $(F77_TESTS)
+else
+TESTS = $(COMMON_TESTS)
+endif
+endif
+
+tests/demo-conf.test: libtool
+
+EXTRA_DIST += defs.in defs.m4sh $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
+DIST_SUBDIRS += $(CONF_SUBDIRS)
+
+# The defs script shouldn't be recreated whenever the Makefile is
+# regenerated since the source tree can be read-only.
+check-recursive: tests/defs
+tests/defs: $(srcdir)/tests/defs.in
+       rm -f tests/defs.tmp tests/defs; \
+       input="defs.m4sh"; \
+       $(edit) $(srcdir)/tests/defs.in > tests/defs.tmp; \
+       mv -f tests/defs.tmp tests/defs
+
+# Use `$(srcdir)/tests' for the benefit of non-GNU makes: this is
+# how defs.in appears in our dependencies.
+$(srcdir)/tests/defs.in: config/general.m4sh tests/defs.m4sh Makefile.am
+       cd $(srcdir); \
+       rm -f tests/defs.in; \
+       $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in
+
+# We need to remove any files that the above tests created.
+clean-local-legacy:
+       -cd tests; \
+       for dir in cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo; \
+       do \
+           test -f $$dir/Makefile && ( cd $$dir && $(MAKE) distclean; ); \
+       done
+       rm -rf _inst
+
+$(TESTS): tests/defs
+DISTCLEANFILES += tests/defs


--- orig/configure.ac
+++ mod/configure.ac
@@ -144,14 +144,14 @@
 fi
 
 # All subdirectories that are configured on demand, but that must be
-# included in the distribution.  This substitution is for tests/Makefile.am,
-# so the directory names are relative to that directory.
-CONF_SUBDIRS="cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo"
+# included in the distribution.
+CONF_SUBDIRS="tests/cdemo tests/demo depdemo tests/f77demo tests/mdemo \
+       tests/mdemo2 tests/pdemo tests/tagdemo"
 AC_SUBST([CONF_SUBDIRS])
 
 DIST_MAKEFILE_LIST=
 for dir in $CONF_SUBDIRS; do
-  DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}tests/$dir/Makefile "
+  DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}$dir/Makefile "
 done
 AC_SUBST([DIST_MAKEFILE_LIST])
 
@@ -208,5 +208,5 @@
 ## -------- ##
 ## Outputs. ##
 ## -------- ##
-AC_CONFIG_FILES([Makefile libltdl/Makefile doc/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile libltdl/Makefile])
 AC_OUTPUT


--- orig/tests/cdemo-conf.test
+++ mod/tests/cdemo-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/cdemo-exec.test
+++ mod/tests/cdemo-exec.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "cdemo-make" "cdemo/cdemo$EXEEXT"
+func_require "cdemo-make" "tests/cdemo/cdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "cdemo/cdemo"
+func_exec "tests/cdemo/cdemo"
 
 exit $exec_status


--- orig/tests/cdemo-make.test
+++ mod/tests/cdemo-make.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "cdemo-conf" "cdemo/Makefile"
+func_require "cdemo-conf" "tests/cdemo/Makefile"
 
 func_rmprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make
 
 exit 0


--- orig/tests/cdemo-shared.test
+++ mod/tests/cdemo-shared.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"


--- orig/tests/cdemo-static.test
+++ mod/tests/cdemo-static.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"


--- orig/tests/cdemo-undef.test
+++ mod/tests/cdemo-undef.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure "--disable-static"
 


--- orig/tests/defs.m4sh
+++ mod/tests/defs.m4sh
@@ -5,7 +5,7 @@
 # Gord Matzigkeit <address@hidden>, 1996
 # Gary V. Vaughan <address@hidden>, 2003
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,7 +31,7 @@
 m4_include([general.m4sh])
 
 : ${AUTOCONF="autoconf"}
-: ${LIBTOOL="../libtool"}
+: ${LIBTOOL="./libtool"}
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="$SED -e s/^X//"
@@ -178,7 +178,7 @@
     $opt_debug
     my_args=${1+"$@"}
     my_dir=`pwd | $SED "$basename"`
-    my_testdir="$srcdir/$my_dir"
+    my_testdir="$srcdir/tests/$my_dir"
 
     test -n "$my_args" && my_args=" $my_args"
     my_args="--srcdir="\""$my_testdir"\"" --prefix="\""$prefix"\""$my_args"
@@ -322,7 +322,7 @@
 # Shared global variables for test scripts
 prefix="./_inst"
 srcdir=`cd $srcdir && pwd`
-scripts="$srcdir/../config/ltmain.sh ../libtoolize"
+scripts="$srcdir/config/ltmain.sh ./libtoolize"
 
 func_msg "Running $progname"
 


--- orig/tests/demo-conf.test
+++ mod/tests/demo-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/demo-deplibs.test
+++ mod/tests/demo-deplibs.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-conf" "demo/libhello.la"
+func_require "demo-conf" "tests/demo/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 echo "linking a shared library against a static library"
 func_make "deplibs-check"
 func_exec_init "uninstalled"


--- orig/tests/demo-exec.test
+++ mod/tests/demo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-exec.test - check that programs in the ../demo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,14 +21,14 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-make" "demo/hell$EXEEXT"
+func_require "demo-make" "tests/demo/hell$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "demo/hell_static" 'Welcome to GNU Hell'
-func_exec "demo/hell" 'Welcome to GNU Hell'
-func_exec "demo/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "tests/demo/hell_static" 'Welcome to GNU Hell'
+func_exec "tests/demo/hell" 'Welcome to GNU Hell'
+func_exec "tests/demo/helldl" '(Welcome to .*GNU Hell|unsupported)'
 
 exit $exec_status


--- orig/tests/demo-hardcode.test
+++ mod/tests/demo-hardcode.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_require "demo-inst" "$prefix/lib/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat ./libhello.la"


--- orig/tests/demo-inst.test
+++ mod/tests/demo-inst.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-make" "demo/hell$EXEEXT"
+func_require "demo-make" "tests/demo/hell$EXEEXT"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell'


--- orig/tests/demo-make.test
+++ mod/tests/demo-make.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-conf" "demo/Makefile"
+func_require "demo-conf" "tests/demo/Makefile"
 
 func_rmprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make
 
 exit 0


--- orig/tests/demo-nofast.test
+++ mod/tests/demo-nofast.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--enable-fast-install=no"
 


--- orig/tests/demo-noinst-link.test
+++ mod/tests/demo-noinst-link.test
@@ -22,7 +22,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_restore_files ()
 {
@@ -42,7 +42,7 @@
 func_require "demo-inst" "$prefix/lib/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_save_files
 
 func_msg "removing \`libhello.la' and \`hell' from demo"


--- orig/tests/demo-nopic.test
+++ mod/tests/demo-nopic.test
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 case "$host" in
 hppa*|x86_64*|s390*)
@@ -33,7 +33,7 @@
 esac
 
 func_rmprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--with-pic=no"
 


--- orig/tests/demo-pic.test
+++ mod/tests/demo-pic.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_rmprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--with-pic=yes"
 


--- orig/tests/demo-relink.test
+++ mod/tests/demo-relink.test
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_restore_files ()
 {
@@ -38,10 +38,10 @@
     trap "func_restore_files" 0 1 2 13 15
 }
 
-func_require "demo-inst" "$prefix/lib/libhello.la"  "demo/libhello.la"
+func_require "demo-inst" "$prefix/lib/libhello.la"  "tests/demo/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat libhello.la"


--- orig/tests/demo-shared.test
+++ mod/tests/demo-shared.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"


--- orig/tests/demo-static.test
+++ mod/tests/demo-static.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"


--- orig/tests/demo-unst.test
+++ mod/tests/demo-unst.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "demo/Makefile"
+func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "tests/demo/Makefile"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_uninstall
 
 exit 0


--- orig/tests/depdemo-conf.test
+++ mod/tests/depdemo-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/depdemo-exec.test
+++ mod/tests/depdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-exec.test - check that programs in the depdemo subdirectory are 
viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,13 +21,13 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
+func_require "depdemo-make" "tests/depdemo/depdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "depdemo/depdemo_static"
-func_exec "depdemo/depdemo"
+func_exec "tests/depdemo/depdemo_static"
+func_exec "tests/depdemo/depdemo"
 
 exit $exec_status


--- orig/tests/depdemo-inst.test
+++ mod/tests/depdemo-inst.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
+func_require "depdemo-make" "tests/depdemo/depdemo$EXEEXT"
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/depdemo_static"


--- orig/tests/depdemo-make.test
+++ mod/tests/depdemo-make.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-conf" "depdemo/Makefile"
+func_require "depdemo-conf" "tests/depdemo/Makefile"
 
 func_rmprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make
 
 exit 0


--- orig/tests/depdemo-nofast.test
+++ mod/tests/depdemo-nofast.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure "--enable-fast-install=no"
 


--- orig/tests/depdemo-relink.test
+++ mod/tests/depdemo-relink.test
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_restore_files ()
 {
@@ -48,10 +48,10 @@
     trap "func_restore_files" 0 1 2 13 15
 }
 
-func_require "depdemo-inst" "$prefix/lib/libl3.la"  "depdemo/l3/libl3.la"
+func_require "depdemo-inst" "$prefix/lib/libl3.la"  "tests/depdemo/l3/libl3.la"
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat l3/libl3.la"


--- orig/tests/depdemo-shared.test
+++ mod/tests/depdemo-shared.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"


--- orig/tests/depdemo-static.test
+++ mod/tests/depdemo-static.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"


--- orig/tests/depdemo-unst.test
+++ mod/tests/depdemo-unst.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" "depdemo/Makefile"
+func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" 
"tests/depdemo/Makefile"
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_uninstall
 
 exit 0


--- orig/tests/f77demo-conf.test
+++ mod/tests/f77demo-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/f77demo-exec.test
+++ mod/tests/f77demo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-exec.test - check that programs in the f77demo subdirectory are 
viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,13 +21,13 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "f77demo-make" "f77demo/fprogram$EXEEXT" "f77demo/cprogram$EXEEXT"
+func_require "f77demo-make" "f77demo/fprogram$EXEEXT" 
"tests/f77demo/cprogram$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "f77demo/fprogram"
-func_exec "f77demo/cprogram"
+func_exec "tests/f77demo/fprogram"
+func_exec "tests/f77demo/cprogram"
 
 exit $exec_status


--- orig/tests/f77demo-make.test
+++ mod/tests/f77demo-make.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "f77demo-conf" "f77demo/Makefile"
+func_require "f77demo-conf" "tests/f77demo/Makefile"
 
 func_rmprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 # May fail make on some platforms, simply "skip" in that case
 #func_make
 eval $MAKE || func_skip "The improved fortran tests catch a known failure mode"


--- orig/tests/f77demo-shared.test
+++ mod/tests/f77demo-shared.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"


--- orig/tests/f77demo-static.test
+++ mod/tests/f77demo-static.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"


--- orig/tests/link-2.test
+++ mod/tests/link-2.test
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 rm -f hell.lo
 cat > hell.lo <<EOF


--- orig/tests/link.test
+++ mod/tests/link.test
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Try a sample link command.
 linkresult=`$LIBTOOL -n --mode=link $CC -o gettext ../lib/libnlsut.a`


--- orig/tests/mdemo-conf.test
+++ mod/tests/mdemo-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/mdemo-dryrun.test
+++ mod/tests/mdemo-dryrun.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-conf" "mdemo/Makefile"
+func_require "mdemo-conf" "tests/mdemo/Makefile"
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make "clean"
 
 # create `before' and `after' in a directory deep within objdir,


--- orig/tests/mdemo-exec.test
+++ mod/tests/mdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-exec.test - check that programs in the mdemo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,13 +21,13 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
+func_require "mdemo-make" "tests/mdemo/mdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "mdemo/mdemo_static mdemo/foo1.la mdemo/libfoo2.la"
-func_exec "mdemo/mdemo mdemo/foo1.la mdemo/libfoo2.la"
+func_exec "tests/mdemo/mdemo_static tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
+func_exec "tests/mdemo/mdemo tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
 
 exit $exec_status


--- orig/tests/mdemo-inst.test
+++ mod/tests/mdemo-inst.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
+func_require "mdemo-make" "tests/mdemo/mdemo$EXEEXT"
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/mdemo_static $prefix/lib/foo1.la $prefix/lib/libfoo2.la"


--- orig/tests/mdemo-make.test
+++ mod/tests/mdemo-make.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-conf" "mdemo/Makefile"
+func_require "mdemo-conf" "tests/mdemo/Makefile"
 
 func_rmprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make
 
 exit 0


--- orig/tests/mdemo-shared.test
+++ mod/tests/mdemo-shared.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"


--- orig/tests/mdemo-static.test
+++ mod/tests/mdemo-static.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"


--- orig/tests/mdemo-unst.test
+++ mod/tests/mdemo-unst.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-inst" "$prefix/bin/mdemo$EXEEXT" "mdemo/Makefile"
+func_require "mdemo-inst" "$prefix/bin/mdemo$EXEEXT" "tests/mdemo/Makefile"
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_uninstall
 
 exit 0


--- orig/tests/mdemo2-conf.test
+++ mod/tests/mdemo2-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo2"
+func_cd "tests/mdemo2"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/mdemo2-exec.test
+++ mod/tests/mdemo2-exec.test
@@ -21,13 +21,13 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo2-make" "mdemo2/mdemo2$EXEEXT"
+func_require "mdemo2-make" "tests/mdemo2/mdemo2$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "mdemo2/mdemo2_static mdemo/foo1.la mdemo/libfoo2.la"
-func_exec "mdemo2/mdemo2 mdemo/foo1.la mdemo/libfoo2.la"
+func_exec "tests/mdemo2/mdemo2_static tests/mdemo/foo1.la 
tests/mdemo/libfoo2.la"
+func_exec "tests/mdemo2/mdemo2 tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
 
 exit $exec_status


--- orig/tests/mdemo2-make.test
+++ mod/tests/mdemo2-make.test
@@ -21,13 +21,13 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo2-conf" "mdemo2/Makefile"
-func_require "mdemo-make" "mdemo/libmlib.la"
+func_require "mdemo2-conf" "tests/mdemo2/Makefile"
+func_require "mdemo-make" "tests/mdemo/libmlib.la"
 
 func_rmprefixdir
-func_cd "mdemo2"
+func_cd "tests/mdemo2"
 func_make
 
 exit 0


--- orig/tests/nomode.test
+++ mod/tests/nomode.test
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 status=$EXIT_SUCCESS
 if $LIBTOOL --help 2>&1 | grep '^Usage:' >/dev/null; then :


--- orig/tests/objectlist.test
+++ mod/tests/objectlist.test
@@ -22,7 +22,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Try a sample link command.
 linkresult=`$LIBTOOL -n --mode=link $CC -objectlist nonexistant 2>&1`


--- orig/tests/pdemo-conf.test
+++ mod/tests/pdemo-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "pdemo"
+func_cd "tests/pdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/pdemo-exec.test
+++ mod/tests/pdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # pdemo-exec.test - check that programs in the pdemo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,14 +21,14 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "pdemo-make" "pdemo/hell$EXEEXT"
+func_require "pdemo-make" "tests/pdemo/hell$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "pdemo/hell_static" 'Welcome to GNU Hell'
-func_exec "pdemo/hell" 'Welcome to GNU Hell'
-func_exec "pdemo/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "tests/pdemo/hell_static" 'Welcome to GNU Hell'
+func_exec "tests/pdemo/hell" 'Welcome to GNU Hell'
+func_exec "tests/pdemo/helldl" '(Welcome to .*GNU Hell|unsupported)'
 
 exit $exec_status


--- orig/tests/pdemo-inst.test
+++ mod/tests/pdemo-inst.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "pdemo-make" "pdemo/hell$EXEEXT"
+func_require "pdemo-make" "tests/pdemo/hell$EXEEXT"
 
 func_mkprefixdir
-func_cd "pdemo"
+func_cd "tests/pdemo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell'


--- orig/tests/pdemo-make.test
+++ mod/tests/pdemo-make.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "pdemo-conf" "pdemo/Makefile"
+func_require "pdemo-conf" "tests/pdemo/Makefile"
 
 func_rmprefixdir
-func_cd "pdemo"
+func_cd "tests/pdemo"
 func_make
 
 exit 0


--- orig/tests/quote.test
+++ mod/tests/quote.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # quote.test - make sure that shell metacharacters do not blow up libtool
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Do the torture test.
 status=$EXIT_SUCCESS
@@ -30,13 +30,13 @@
   --no-reexec)
     ;;
   *)
-    func_get_config "SHELL" "../libtool --config"
+    func_get_config "SHELL" "$LIBTOOL --config"
     exec $SHELL "$0" --no-reexec ${1+"$@"}
     ;;
 esac
 
-func_get_config "ECHO" "../libtool --config"
-func_get_config "wl" "../libtool --config"
+func_get_config "ECHO" "$LIBTOOL --config"
+func_get_config "wl" "$LIBTOOL --config"
 
 for mode in compile link install; do
   $ECHO "== $mode mode"


--- orig/tests/sh.test
+++ mod/tests/sh.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # sh.test - check that we haven't forgotten a `test' command
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Check all the "portable" shell scripts.
 status=$EXIT_SUCCESS
@@ -105,7 +105,7 @@
   fi
 done
 
-for s in "$srcdir/../m4/libtool.m4"
+for s in "$srcdir/m4/libtool.m4"
 do
   if $SED -n '/case \$cc_basename in/,/esac/ {
              /^[       ]*[a-zA-Z][a-zA-Z0-9+]*[^*][    ]*)/p


--- orig/tests/suffix.test
+++ mod/tests/suffix.test
@@ -26,7 +26,7 @@
 extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 for m s"
 bad_names="foo."
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 status=$EXIT_SUCCESS
 for ext in $extensions; do


--- orig/tests/tagdemo-conf.test
+++ mod/tests/tagdemo-conf.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"


--- orig/tests/tagdemo-exec.test
+++ mod/tests/tagdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-exec.test - check that programs in the tagdemo subdirectory are 
viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "tagdemo-make" "tagdemo/tagdemo$EXEEXT"
+func_require "tagdemo-make" "tests/tagdemo/tagdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "tagdemo/tagdemo"
+func_exec "tests/tagdemo/tagdemo"
 
 exit $exec_status


--- orig/tests/tagdemo-make.test
+++ mod/tests/tagdemo-make.test
@@ -21,12 +21,12 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "tagdemo-conf" "tagdemo/Makefile"
+func_require "tagdemo-conf" "tests/tagdemo/Makefile"
 
 func_rmprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make
 
 exit 0


--- orig/tests/tagdemo-shared.test
+++ mod/tests/tagdemo-shared.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"


--- orig/tests/tagdemo-static.test
+++ mod/tests/tagdemo-static.test
@@ -21,10 +21,10 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"


--- orig/tests/tagdemo-undef.test
+++ mod/tests/tagdemo-undef.test
@@ -21,11 +21,11 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure "--disable-static"
 


--- orig/tests/tagtrace.test
+++ mod/tests/tagtrace.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagtrace.test - check the LT_SUPPORTED_TAGS interface
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,9 +21,9 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-: ${fnord=$srcdir/../fnord$$}
+: ${fnord=$srcdir/fnord$$}
 
 "$AUTOCONF" --version > /dev/null 2>&1 || func_skip "This test requires GNU 
Autoconf"
 if touch $fnord; then
@@ -36,7 +36,7 @@
 set -e
 
 # Retrieve the list of tags supported by our main libtool script.
-traced_tags=`cd "$srcdir/.." && "$AUTOCONF" --trace 'LT_SUPPORTED_TAG:$1'`
+traced_tags=`cd "$srcdir" && "$AUTOCONF" --trace 'LT_SUPPORTED_TAG:$1'`
 
 test -n "$traced_tags"
 




reply via email to

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