*** empty log message ***

11 files changed, 179 insertions, 169 deletions

diff --git a/ChangeLog b/ChangeLog
index b76d63ca..7d4fd5d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,27 @@
+1998-03-08  Gordon Matzigkeit  <gord@profitpress.com>
+
+	* Release 1.1.
+
+	* ltmain.in: <sigh> I like `here documents' a lot, but apparently
+ 	they are so badly handled by old and buggy /bin/sh's, that
+ 	replacing `cat <<EOF ... EOF' by `$echo "..."' improves libtool's
+ 	speed by a factor of 5.  So, I've eliminated here docs from the
+ 	all-important ltmain.in.  From Tom Lane.
+
+1998-03-07  Gordon Matzigkeit  <gord@profitpress.com>
+
+	* ltconfig.in: Copy the contents of ltmain.sh into the generated
+	libtool.  This should more than halve the execution times on old
+	or buggy /bin/sh systems, such as HP-UX 9 and SunOS 4.1.4.  From
+	Tom Lane.
+
 1998-03-05  Gordon Matzigkeit  <gord@profitpress.com>
 
 	* libtool.m4 (AM_ENABLE_SHARED, AM_ENABLE_STATIC): Add support for
  	the `default' package, so that people can control unnamed
  	packages.
+	(LD): Only add an ABI flag under IRIX 6.x, since IRIX 5.x doesn't
+	support them.  From Alexandre Oliva.
 
 1998-03-01  Gordon Matzigkeit  <gord@profitpress.com>
 
diff --git a/Makefile.am b/Makefile.am
index c5d8cc69..4d25b978 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,11 +31,10 @@ aclocal_DATA = $(aclocal_macros)
 # The standalone libtool script, and the libtool distributor.
 bin_SCRIPTS = libtool libtoolize
 
-libtool: ltconfig
-	@echo 'WARNING: Warnings from ltconfig can be ignored. :-)'
+libtool: ltconfig ltmain.sh
 	CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
 	LD="$(LD)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-	$(srcdir)/ltconfig --srcdir=$(srcdir) $(pkgdatadir)/ltmain.sh
+	$(srcdir)/ltconfig --srcdir=$(srcdir) $(srcdir)/ltmain.sh
 
 libtoolize: libtoolize.in $(top_builddir)/config.status
 	CONFIG_FILES=libtoolize CONFIG_HEADERS= $(top_builddir)/config.status
diff --git a/NEWS b/NEWS
index 563afca0..59a8e6a4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,67 +1,51 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
-New in 1.0j - 1998-03-05, Gordon Matzigkeit:
+New in 1.1 - 1998-03-08, Gordon Matzigkeit:
+* Bug fixes.
 * http://www.profitpress.com/libtool/ is libtool's homepage.
-* Use the `AM_DISABLE_SHARED' or `AM_DISABLE_STATIC'
-  macros instead of the `enable_shared' or `enable_static' variables
-  if you wish to modify the default behaviour of `AM_PROG_LIBTOOL'.
-* libtool.m4 supports turning shared or static libraries off with
-  the `--enable-shared=PKGS' and `--enable-static=PKGS' configure
+* `AM_PROG_LIBTOOL' supports turning shared or static libraries off
+  with the `--enable-shared=PKGS' and `--enable-static=PKGS' configure
   flags.  See (libtool)AM_PROG_LIBTOOL.
+* Use the `AM_DISABLE_SHARED' or `AM_DISABLE_STATIC' macros if you
+  wish to modify the default behaviour of `AM_PROG_LIBTOOL' for your
+  package.
+* New rules for `AM_PROG_LD' to use gcc's `-print-prog-name' flag in
+  order to find ld, if possible.
+* Suppress duplicate compiler output during `compile' mode.
+* Deleted `dlname' mode.  Dlopen applications should only use the
+  runtime search method described in (libtool)Finding the dlname.
+* Experimental support for dynamically loaded modules, even on
+  static-only platforms, via new `-dlopen' and `-dlpreopen' link
+  flags.
 * `compile' mode honours the `-static' flag to prevent libtool
   from building PIC objects.
-* Support for *-*-sysv4.2uw2*.
-
-New in 1.0i - 1998-02-06, Gordon Matzigkeit:
-* Bug fixes.
+* New `execute' mode to support debugging uninstalled libtool
+  libraries and executables.
+* `-allow-undefined' is now the default.  You can use `-no-undefined'
+  to declare that a shared library is completely self-contained.
 * Inter-library dependencies are automatically handled when linking
-  against a `.la' file.  This, along with `-no-undefined', should
-  prevent many accidental libtool misuses.
+  against an uninstalled `.la' file.
+* New `-all-static' flag to prevent any dynamic linking.  The regular
+  `-static' flag now just prevents dynamic linking of libtool libraries.
 * New `-release' flag to encode release numbers into libtool
   libraries.  This breaks binary compatibility, but is useful for
   libraries whose interfaces change very frequently.  See
   (libtool)Versioning.
-
-New in 1.0h - 1997-12-01, Gordon Matzigkeit:
-* A fix for an insidious bug in the quoting code, which broke
-  everything on almost all platforms.
-
-New in 1.0g - 1997-11-29, Gordon Matzigkeit:
-* Bug fixes.
-* `-allow-undefined' is now the default.  You can use `-no-undefined'
-  to declare that a shared library is completely self-contained.
-* Support for *-*-amigaos*.
-
-New in 1.0f - 1997-11-08, Gordon Matzigkeit:
-* Bug fixes.
-* New `-all-static' flag to prevent any dynamic linking.  The regular
-  `-static' flag now just prevents dynamic linking of libtool libraries.
 * The `-rpath' flag can be used to hardcode absolute directories when
   linking executables using libtool.
-* Suppress duplicate compiler output during `compile' mode.
-* New `execute' mode to support debugging uninstalled libtool
-  libraries and executables.
-* New quoting code to robustly handle any metacharacters passed in
+* New robust quoting code to handle any metacharacters passed in
   arguments to libtool commands.
-* Deleted `dlname' mode.  Dlopen applications should only use the
-  runtime search method described in (libtool)Finding the dlname.
-* Experimental support for dynamically loaded modules, even on
-  static-only platforms, via new `-dlopen' and `-dlpreopen' link
-  flags.
-* New rules for AM_PROG_LD to use gcc's -print-prog-name flag in order
-  to find ld, if possible.
-* Allow configure.in to change the defaults for AM_PROG_LIBTOOL's
-  `--enable-shared' and `--enable-static' flags by setting
-  the `enable_shared' or `enable_static' shell variables to `no'.
-* Refuse to create libtool libraries that don't begin with `lib'.
-  This allows us to correctly handle OSes that don't have the `lib'
-  prefix by default, such as OS/2.
 * Full support for broken collect2 on AIX 3.  Shared libraries
   can now be built with all working versions of GCC on AIX.
-* Portability fixes for Windows NT.
+* Shell script speed optimizations for old and buggy /bin/sh systems,
+  such as HP-UX 9 and SunOS 4.1.4.
 * Maybe use `_libs' as a temporary libtool directory instead of `.libs'
   in order to cope with MS-DOS filenames.
-* Support for *-*-uts4* and *-*-os2*.
+* Portability fixes for Windows NT.
+* Refuse to create libtool libraries that don't begin with `lib'.
+  This allows us to correctly handle OSes that don't have the `lib'
+  prefix by default, such as OS/2.
+* Support for *-*-amigaos*, *-*-os2*, *-*-sysv4.2uw2*, and *-*-uts4*.
 
 New in 1.0 - 1997-07-08, Gordon Matzigkeit:
 * Bug fixes.
diff --git a/TODO b/TODO
index 670984d8..5b8ceefe 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,10 @@
 For next public release:
 ************************
 
+* Inter-library dependencies should be fully tracked by libtool.
+Reminded by Alexandre Oliva.  This requires looking up installed
+libtool libraries for transparent support.
+
 * Get rid of the sections that try to change behaviour for GNU ld.  We
 really should make our shared library support just depend on the
 compiler type.
@@ -8,16 +12,18 @@ compiler type.
 * Alexandre Oliva suggests that we hardcode paths into libraries, as
 well as binaries:  `... -Wl,-soname -Wl,/tmp/libtest.so.0 ...'.
 
-* Tom Lane adds that HP-UX's linker, at least, distinguishes between
-global function and global variable references.  This means that we
-cannot declare every symbol as `extern char'.  Find a workaround.
+* Tom Lane adds that HP-UX's linker, at least (I've also found this on
+AIX 4), distinguishes between global function and global variable
+references.  This means that we cannot declare every symbol as `extern
+char'.  Find a workaround.
+
+* Maybe show other maintainers my nasty ~/bin/libtool trick.
 
 In the future:
 **************
 
-* Inter-library dependencies should be fully tracked by libtool.
-Reminded by Alexandre Oliva.  This requires looking up installed
-libtool libraries for transparent support.
+* If not cross-compiling, have the static flag test run the resulting
+binary to make sure everything works.
 
 * Implement full multi-language support.  Currently, this is only for
 C++, but there are beginnings of this in the manual (Other Languages).
diff --git a/libtool.m4 b/libtool.m4
index 6bfbad65..07c2046e 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -47,7 +47,7 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case "$host" in
-*-*-irix*)
+*-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
diff --git a/libtool.spec b/libtool.spec
index c7a70012..09ad69db 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -2,7 +2,7 @@ Summary: GNU Libtool - shared library support for source packages
 # $Format: "Name: $Project$"$
 Name: libtool
 # $Format: "Version: $ProjectMajorVersion$"$
-Version: 1.2b
+Version: 1.2c
 Release: 1
 Copyright: GPL
 Group: Development/Build
diff --git a/ltconfig.in b/ltconfig.in
index 5f285b07..acdef726 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -187,7 +187,9 @@ fi
 
 if test -f "$ltmain"; then :
 else
-  echo "$progname: warning: \`$ltmain' does not exist" 1>&2
+  echo "$progname: \`$ltmain' does not exist" 1>&2
+  echo "$help" 1>&2
+  exit 1
 fi
 
 # Quote any args containing shell metacharacters.
@@ -1312,8 +1314,31 @@ cat <<EOF > $ofile
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-#
 # Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION
+# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
+#
+# Copyright (C) 1996-1998 Free Software Foundation, Inc.
+# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# 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; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 # This program was configured as follows,
 # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
@@ -1474,25 +1499,8 @@ EOF
   ;;
 esac
 
-# Detect if we are using a relative or absolute path to ltmain.sh.
-case "$ltmain" in
-/* | [A-Za-z]:\\*) cat <<EOF >> $ofile
-# Execute the libtool backend.
-. $ltmain
-EOF
-  ;;
-*) cat <<EOF >> $ofile
-# Find the path to this script.
-thisdir=\`\$echo "X\$0" | \$Xsed -e 's%/[^/]*\$%%'\`
-test "X\$0" = "X\$thisdir" && thisdir=.
-
-# Execute the libtool backend.
-. \$thisdir/$ltmain
-EOF
-  ;;
-esac
-
-echo 'exit 1' >> $ofile
+# Append the ltmain.sh script.
+cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1)
 
 chmod +x $ofile
 exit 0
diff --git a/ltmain.in b/ltmain.in
index 39963e24..9224d1c5 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -1,4 +1,6 @@
 # ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun ltconfig.
+#
 # Copyright (C) 1996-1998 Free Software Foundation, Inc.
 # Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -1252,20 +1254,20 @@ if test -z "$show_help"; then
 	  case "$dlsyms" in
 	  "") ;;
 	  *.c)
-	    cat <<EOF > "$objdir/$dlsyms"
-/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */
+	    $echo > "$objdir/$dlsyms" \
+"/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */
 /* Generated by $PROGRAM - GNU $PACKAGE $VERSION */
 
 #ifdef __cplusplus
-extern "C" {
+extern \"C\" {
 #endif
 
 /* Prevent the only kind of declaration conflicts we can make. */
 #define dld_preloaded_symbol_count some_other_symbol
 #define dld_preloaded_symbols some_other_symbol
 
-/* External symbol declarations for the compiler. */
-EOF
+/* External symbol declarations for the compiler. */"
+
 	    if test -f "$nlist"; then
 	      sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms"
 	    else
@@ -1273,8 +1275,8 @@ EOF
 EOF
 	    fi
 
-	    cat <<EOF >> "$objdir/$dlsyms"
-
+	    $echo >> "$objdir/$dlsyms" \
+"
 #undef dld_preloaded_symbol_count
 #undef dld_preloaded_symbols
 
@@ -1293,21 +1295,19 @@ struct {
   __ptr_t address;
 }
 dld_preloaded_symbols[] =
-{
-EOF
+{"
 
 	    if test -f "$nlist"; then
 	      sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms"
 	    fi
 
-	    cat <<\EOF >> "$objdir/$dlsyms"
-  {0, (__ptr_t) 0}
+	    $echo >> "$objdir/$dlsyms" \
+"  {0, (__ptr_t) 0}
 };
 
 #ifdef __cplusplus
 }
-#endif
-EOF
+#endif"
 	    ;;
 
 	  *)
@@ -1427,8 +1427,8 @@ EOF
         $rm $output
         trap "$rm $output; exit 1" 1 2 15
 
-        cat > $output <<EOF
-#! /bin/sh
+        $echo > $output \
+"#! /bin/sh
 
 # $output - temporary wrapper script for $objdir/$output
 # Generated by ltmain.sh - GNU $PACKAGE $VERSION
@@ -1446,95 +1446,92 @@ sed_quote_subst='$sed_quote_subst'
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
+if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
 
 # This environment variable determines our operation mode.
-if test "\$libtool_install_magic" = "$magic"; then
+if test \"\$libtool_install_magic\" = \"$magic\"; then
   # install mode needs the following variables:
   link_against_libtool_libs='$link_against_libtool_libs'
-  finalize_command="$finalize_command"
+  finalize_command=\"$finalize_command\"
 else
   # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test "\$libtool_execute_magic" = "$magic"; then :
+  if test \"\$libtool_execute_magic\" = \"$magic\"; then :
   else
-    echo="$qecho"
-    file="\$0"
+    echo=\"$qecho\"
+    file=\"\$0\"
   fi
 
   # Find the directory that this script lives in.
-  thisdir=\`\$echo "X\$file" | \$Xsed -e 's%/[^/]*$%%'\`
-  test "x\$thisdir" = "x\$file" && thisdir=.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld "\$file" | sed -n 's/.*-> //p'\`
-  while test -n "\$file"; do
-    destdir=\`\$echo "X\$file" | \$Xsed -e 's%/[^/]*\$%%'\`
+  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
-    if test "x\$destdir" != "x\$file"; then
-      case "\$destdir" in
-      /* | [A-Za-z]:\\*) thisdir="\$destdir" ;;
-      *) thisdir="\$thisdir/\$destdir" ;;
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
       esac
     fi
 
-    file=\`\$echo "X\$file" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld "\$thisdir/\$file" | sed -n 's/.*-> //p'\`
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
   done
 
   # Try to get the absolute directory name.
-  absdir=\`cd "\$thisdir" && pwd\`
-  test -n "\$absdir" && thisdir="\$absdir"
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
 
-  progdir="\$thisdir/$objdir"
+  progdir=\"\$thisdir/$objdir\"
   program='$output'
 
-  if test -f "\$progdir/\$program"; then
-EOF
+  if test -f \"\$progdir/\$program\"; then"
 
         # Export our shlibpath_var if we have one.
         if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-          cat >> $output <<EOF
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var="$temp_rpath\$$shlibpath_var"
+          $echo >> $output \
+"    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
-    $shlibpath_var=\`\$echo "X\$$shlibpath_var" | \$Xsed -e 's/:*\$//'\`
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\`
 
     export $shlibpath_var
-
-EOF
+"
         fi
 
-        cat >> $output <<EOF
-    if test "\$libtool_execute_magic" != "$magic"; then
+        echo >> $output \
+"    if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
       args=
       for arg
       do
         # Quote arguments (to preserve shell metacharacters).
-	arg=\`\$echo "X\$arg" | \$Xsed -e "\$sed_quote_subst"\`
-        args="\$args \\"\$arg\\""
+	arg=\`\$echo \"X\$arg\" | \$Xsed -e \"\$sed_quote_subst\"\`
+        args=\"\$args \\\"\$arg\\\"\"
       done
 
       # Export the path to the program.
-      PATH="\$progdir:\$PATH"
+      PATH=\"\$progdir:\$PATH\"
       export PATH
 
-      eval "exec \$program \$args"
+      eval \"exec \$program \$args\"
 
-      \$echo "\$0: cannot exec \$program \$args"
+      \$echo \"\$0: cannot exec \$program \$args\"
       exit 1
     fi
   else
     # The program doesn't exist.
-    \$echo "\$0: error: \$progdir/\$program does not exist" 1>&2
-    \$echo "This script is just a wrapper for \$program." 1>&2
-    echo "See the $PACKAGE documentation for more information." 1>&2
+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    echo \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
-fi
-EOF
+fi"
         chmod +x $output
       fi
       exit 0
@@ -1571,8 +1568,8 @@ EOF
 
       # Only create the output if not a dry run.
       if test -z "$run"; then
-        cat > $output <<EOF
-# $output - a libtool library file
+        echo > $output \
+"# $output - a libtool library file
 # Generated by ltmain.sh - GNU $PACKAGE $VERSION
 
 # The name that we can dlopen(3).
@@ -1593,8 +1590,7 @@ age=$age
 revision=$revision
 
 # Directory that this library needs to be installed in:
-libdir='$install_libdir'
-EOF
+libdir='$install_libdir'"
       fi
 
       # Do a symbolic link so that the libtool archive can be found in
@@ -2297,8 +2293,8 @@ fi # test -z "$show_help"
 
 # We need to display help for each of the modes.
 case "$mode" in
-"") cat <<EOF
-Usage: $modename [OPTION]... [MODE-ARG]...
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
 
 Provide generalized library-building support services.
 
@@ -2321,14 +2317,13 @@ MODE must be one of the following:
       uninstall       remove libraries from an installed directory
 
 MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-EOF
+a more detailed description of MODE."
   exit 0
   ;;
 
 compile)
-  cat <<EOF
-Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
 
 Compile a source file into a libtool library object.
 
@@ -2337,13 +2332,12 @@ from the given SOURCEFILE.
 
 The output file name is determined by removing the directory component from
 SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'.
-EOF
+library object suffix, \`.lo'."
   ;;
 
 execute)
-  cat <<EOF
-Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
 
 Automatically set library path, then run a program.
 
@@ -2358,26 +2352,24 @@ If any of the ARGS are libtool executable wrappers, then they are translated
 into their corresponding uninstalled binary, and any of their required library
 directories are added to the library path.
 
-Then, COMMAND is executed, with ARGS as arguments.
-EOF
+Then, COMMAND is executed, with ARGS as arguments."
   ;;
 
 finish)
-  cat <<EOF
-Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
 
 Complete the installation of libtool libraries.
 
 Each LIBDIR is a directory that contains libtool libraries.
 
 The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed.
-EOF
+the \`--dry-run' option if you just want to see what would be executed."
   ;;
 
 install)
-  cat <<EOF
-Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
 
 Install executables or libraries.
 
@@ -2385,13 +2377,12 @@ INSTALL-COMMAND is the installation command.  The first component should be
 either the \`install' or \`cp' program.
 
 The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized).
-EOF
+BSD-compatible install options are recognized)."
   ;;
 
 link)
-  cat <<EOF
-Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
 
 Link object files or libraries together to form another library, or to
 create an executable program.
@@ -2428,13 +2419,12 @@ If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar'
 and \`ranlib'.
 
 If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is
-created, otherwise an executable program is created.
-EOF
+created, otherwise an executable program is created."
   ;;
 
 uninstall)
-  cat <<EOF
-Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+  $echo
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 
 Remove libraries from an installation directory.
 
@@ -2443,8 +2433,7 @@ RM is the name of the program to use to delete files associated with each FILE
 to RM.
 
 If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM.
-EOF
+Otherwise, only FILE itself is deleted using RM."
   ;;
 
 *)
diff --git a/tests/ChangeLog b/tests/ChangeLog
index a86e6acc..e73adba9 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+1998-03-08  Gordon Matzigkeit  <gord@profitpress.com>
+
+	* tlibtool: Eliminate from distribution.
+
+	* defs (libtool): Don't use tlibtool anymore, since we can now use
+	the generated libtool directly.
+
 1998-02-18  Gordon Matzigkeit  <gord@profitpress.com>
 
 	* sh.test (scripts): Remove the lineno script, since it is no
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 768bff2d..ee32ab64 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,7 @@ TESTS =	demo-conf.test $(makesequence) link.test link-2.test nomode.test \
 TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
 	LD="$(LD)" NM="$(NM)" RANLIB="$(RANLIB)" LN_S="$(LN_S)"
 
-EXTRA_DIST = defs tlibtool $(TESTS)
+EXTRA_DIST = defs $(TESTS)
 
 # We need to remove any files that the above tests created.
 clean-local:
diff --git a/tests/defs b/tests/defs
index ddf92ced..214207de 100644
--- a/tests/defs
+++ b/tests/defs
@@ -10,9 +10,7 @@ esac
 
 progname=`echo "$0" | sed 's%^.*/%%'`
 
-# tlibtool needs to know what srcdir is.
-export srcdir
-libtool="$srcdir/tlibtool"
+libtool="../libtool"
 make="${MAKE-make}"
 
 prefix="./_inst"