FYI: libtool--devo--1.0--patch-200

[Gary V. Vaughan]

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

Applied to HEAD.
- -- 
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.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFBUsrnFRMICSmD1gYRAjFlAJ9uPDA6pyNr78smL+SIJNGiHl1mFQCgrNWO
HosC/RqvGvkg6L3E5PuID1A=
=F1Lt
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--devo--1.0--patch-199 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-199
M  ChangeLog
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  m4/libtool.m4
M  tests/Makefile.am
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.in
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

* modified files

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

        Since defs can change (path to grep for example) when it is made
        for a different host, it can't be shipped.  That also means that
        defs will always be generated in the build tree, so each test case
        can have the srcdir discovery factored away into tests/defs.in:

        * Makefile.am (EXTRA_DIST): s/defs/defs.in/g
        * tests/Makefile.am (defs): New rule to remake defs from the
        parent directory's Makefile.
        * tests/cdemo-conf.test, tests/cdemo-exec.test,
        tests/cdemo-make.test, tests/cdemo-shared.test,
        tests/cdemo-static.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/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/tagtrace.test: Removed srcdir discovery boilerplate...
        * tests/defs.in: ...and put it here.

2004-09-23  Gary V. Vaughan  <address@hidden>
--- orig/Makefile.am
+++ mod/Makefile.am
@@ -144,11 +144,13 @@
        chmod a-w libtoolize.tmp
        mv -f libtoolize.tmp libtoolize
 
+# 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: tests/defs.in Makefile
-       cd $(top_srcdir); \
+tests/defs: tests/defs.in Makefile.am
        rm -f tests/defs.m4sh tests/defs.tmp tests/defs; \
-       $(M4SH) -B ./config tests/defs.in > tests/defs.m4sh; \
+       $(M4SH) -B $(top_srcdir)/config \
+               $(top_srcdir)/tests/defs.in > tests/defs.m4sh; \
        input="defs.in"; \
        $(edit) tests/defs.m4sh > tests/defs.tmp; \
        rm -f tests/defs.m4sh; \


--- orig/m4/libtool.m4
+++ mod/m4/libtool.m4
@@ -2726,6 +2726,12 @@
   symcode='[[ABCDGIRSTW]]' ;;
 esac
 
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symols differently,
 # so use this general approach.


--- orig/tests/Makefile.am
+++ mod/tests/Makefile.am
@@ -1,4 +1,23 @@
 ## Process this file with automake to produce Makefile.in
+##
+## Copyright (C) 2003, 2004 Free Software Foundation
+##
+## 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 of the License, 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; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+
+DISTCLEANFILES =
 
 CXX_TESTS = \
        tagdemo-static.test tagdemo-make.test tagdemo-exec.test \
@@ -71,7 +90,7 @@
        OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" F77="$(F77)" \
        FFLAGS="$(FFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CPP="$(CPP)"
 
-EXTRA_DIST = defs $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
+EXTRA_DIST = defs.in $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
 DIST_SUBDIRS = $(CONF_SUBDIRS)
 
 # FIXME: Automake-1.7b (at least) only honours DIST_SUBDIRS if SUBDIRS is
@@ -104,6 +123,11 @@
 ## Test suite.  ##
 ## ------------ ##
 
+$(TESTS): defs
+defs: defs.in ../Makefile.am
+       cd .. && $(MAKE) $(AM_MAKEFLAGS) tests/defs
+DISTCLEANFILES += defs
+
 TESTSUITE_AT = \
        testsuite.at \
        demo.at fortran.at tools.at


--- orig/tests/cdemo-conf.test
+++ mod/tests/cdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-conf.test - try configuring the cdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "cdemo"


--- orig/tests/cdemo-exec.test
+++ mod/tests/cdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-exec.test - check that programs in the cdemo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "cdemo-make" "cdemo/cdemo$EXEEXT"
 


--- orig/tests/cdemo-make.test
+++ mod/tests/cdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-make.test - try building in the cdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "cdemo-conf" "cdemo/Makefile"
 


--- orig/tests/cdemo-shared.test
+++ mod/tests/cdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-shared.test - try configuring the cdemo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "cdemo"


--- orig/tests/cdemo-static.test
+++ mod/tests/cdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-static.test - try configuring the cdemo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "cdemo"


--- orig/tests/defs.in
+++ mod/tests/defs.in
@@ -49,6 +49,10 @@
   ;;
 esac
 
+if test -z "$srcdir"; then
+  srcdir=`$ECHO "$0" | $SED "$dirname"`
+  test "$srcdir" = "$0" && srcdir=.
+fi
 
 # func_msg arg...
 # Echo message with prefix.


--- orig/tests/demo-conf.test
+++ mod/tests/demo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-conf.test - try configuring the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"


--- orig/tests/demo-deplibs.test
+++ mod/tests/demo-deplibs.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-deplibs.test - check whether the shared library check method is OK
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-conf" "demo/libhello.la"
 


--- 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 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-make" "demo/hell$EXEEXT"
 


--- orig/tests/demo-hardcode.test
+++ mod/tests/demo-hardcode.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-hardcode.test - check to see what the system linker hardcodes
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-inst" "$prefix/lib/libhello.la"
 


--- orig/tests/demo-inst.test
+++ mod/tests/demo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-inst.test - try installing from the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-make" "demo/hell$EXEEXT"
 


--- orig/tests/demo-make.test
+++ mod/tests/demo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-make.test - try building in the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-conf" "demo/Makefile"
 


--- orig/tests/demo-nofast.test
+++ mod/tests/demo-nofast.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-nofast.test - try configuring the ../demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"


--- orig/tests/demo-noinst-link.test
+++ mod/tests/demo-noinst-link.test
@@ -2,7 +2,7 @@
 # demo-noinst-link.test - make sure we do not link with an installed
 # library when an uninstalled one is to be used
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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.
 
@@ -22,11 +22,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_restore_files ()
 {


--- orig/tests/demo-nopic.test
+++ mod/tests/demo-nopic.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-nopic.test - try configuring the ../demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 case "$host" in
 hppa*|x86_64*|s390*)


--- orig/tests/demo-pic.test
+++ mod/tests/demo-pic.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-pic.test - try configuring the ../demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_rmprefixdir
 func_cd "demo"


--- orig/tests/demo-relink.test
+++ mod/tests/demo-relink.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-relink.test - check to see whether shlibpath overrides runpath
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_restore_files ()
 {


--- orig/tests/demo-shared.test
+++ mod/tests/demo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-shared.test - try configuring the demo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"


--- orig/tests/demo-static.test
+++ mod/tests/demo-static.test
@@ -21,12 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-# Test script header.
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"


--- orig/tests/demo-unst.test
+++ mod/tests/demo-unst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-unst.test - try uninstalling in the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "demo/Makefile"
 


--- orig/tests/depdemo-conf.test
+++ mod/tests/depdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-conf.test - try configuring the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"


--- 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 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
 


--- orig/tests/depdemo-inst.test
+++ mod/tests/depdemo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-inst.test - try installing from the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
 


--- orig/tests/depdemo-make.test
+++ mod/tests/depdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-make.test - try building in the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-conf" "depdemo/Makefile"
 


--- orig/tests/depdemo-nofast.test
+++ mod/tests/depdemo-nofast.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-nofast.test - try configuring the ./depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"


--- orig/tests/depdemo-relink.test
+++ mod/tests/depdemo-relink.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_restore_files ()
 {


--- orig/tests/depdemo-shared.test
+++ mod/tests/depdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-shared.test - try configuring the depdemo subdirectory for shared 
libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"


--- orig/tests/depdemo-static.test
+++ mod/tests/depdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-static.test - try configuring the depdemo subdirectory for static 
libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"


--- orig/tests/depdemo-unst.test
+++ mod/tests/depdemo-unst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-unst.test - try uninstalling in the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" "depdemo/Makefile"
 


--- orig/tests/f77demo-conf.test
+++ mod/tests/f77demo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-conf.test - try configuring the f77demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "f77demo"


--- 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 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "f77demo-make" "f77demo/fprogram$EXEEXT" "f77demo/cprogram$EXEEXT"
 


--- orig/tests/f77demo-make.test
+++ mod/tests/f77demo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-make.test - try building in the f77demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "f77demo-conf" "f77demo/Makefile"
 


--- orig/tests/f77demo-shared.test
+++ mod/tests/f77demo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-shared.test - try configuring the f77demo subdirectory for shared 
libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "f77demo"


--- orig/tests/f77demo-static.test
+++ mod/tests/f77demo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-static.test - try configuring the f77demo subdirectory for static 
libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "f77demo"


--- orig/tests/link-2.test
+++ mod/tests/link-2.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 rm -f hell.lo
 cat > hell.lo <<EOF


--- orig/tests/link.test
+++ mod/tests/link.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. 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
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-conf.test - try configuring the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo"


--- orig/tests/mdemo-dryrun.test
+++ mod/tests/mdemo-dryrun.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-conf" "mdemo/Makefile"
 


--- 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 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
 


--- orig/tests/mdemo-inst.test
+++ mod/tests/mdemo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-inst.test - try installing from the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
 


--- orig/tests/mdemo-make.test
+++ mod/tests/mdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-make.test - try building in the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-conf" "mdemo/Makefile"
 


--- orig/tests/mdemo-shared.test
+++ mod/tests/mdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-shared.test - try configuring the mdemo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo"


--- orig/tests/mdemo-static.test
+++ mod/tests/mdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-static.test - try configuring the mdemo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo"


--- orig/tests/mdemo-unst.test
+++ mod/tests/mdemo-unst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-unst.test - try uninstalling in the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-inst" "$prefix/bin/mdemo$EXEEXT" "mdemo/Makefile"
 


--- orig/tests/mdemo2-conf.test
+++ mod/tests/mdemo2-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo2-conf.test - try configuring the mdemo2 subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo2"


--- orig/tests/mdemo2-exec.test
+++ mod/tests/mdemo2-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo2-exec.test - check that programs in the mdemo2 subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo2-make" "mdemo2/mdemo2$EXEEXT"
 


--- orig/tests/mdemo2-make.test
+++ mod/tests/mdemo2-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo2-make.test - try building in the mdemo2 subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo2-conf" "mdemo2/Makefile"
 func_require "mdemo-make" "mdemo/libmlib.la"


--- orig/tests/nomode.test
+++ mod/tests/nomode.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 status=$EXIT_SUCCESS
 if $LIBTOOL --help 2>&1 | grep '^Usage:' >/dev/null; then :


--- orig/tests/pdemo-conf.test
+++ mod/tests/pdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # pdemo-conf.test - try configuring the pdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "pdemo"


--- 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 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "pdemo-make" "pdemo/hell$EXEEXT"
 


--- orig/tests/pdemo-inst.test
+++ mod/tests/pdemo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-inst.test - try installing from the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-make" "demo/hell$EXEEXT"
 


--- orig/tests/pdemo-make.test
+++ mod/tests/pdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # pdemo-make.test - try building in the pdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "pdemo-conf" "pdemo/Makefile"
 


--- orig/tests/quote.test
+++ mod/tests/quote.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 # Do the torture test.
 status=$EXIT_SUCCESS


--- orig/tests/sh.test
+++ mod/tests/sh.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 # Check all the "portable" shell scripts.
 status=$EXIT_SUCCESS


--- orig/tests/suffix.test
+++ mod/tests/suffix.test
@@ -26,11 +26,7 @@
 extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 for m s"
 bad_names="foo."
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 status=$EXIT_SUCCESS
 for ext in $extensions; do


--- orig/tests/tagdemo-conf.test
+++ mod/tests/tagdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-conf.test - try configuring the tagdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "tagdemo"


--- 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 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "tagdemo-make" "tagdemo/tagdemo$EXEEXT"
 


--- orig/tests/tagdemo-make.test
+++ mod/tests/tagdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-make.test - try building in the tagdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "tagdemo-conf" "tagdemo/Makefile"
 


--- orig/tests/tagdemo-shared.test
+++ mod/tests/tagdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-shared.test - try configuring the tagdemo subdirectory for shared 
libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "tagdemo"


--- orig/tests/tagdemo-static.test
+++ mod/tests/tagdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-static.test - try configuring tagdemo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 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,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "tagdemo"


--- orig/tests/tagtrace.test
+++ mod/tests/tagtrace.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 : ${fnord=$srcdir/../fnord$$}