*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 67017e47dfaebe880a3d1f9a336cf2233e21c262..100f2fdc8432e25428bb5588a1318cc84ffc3c65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Apr 12 13:09:24 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
+
+       * ltconfig.in (linker): Some GNU ld's don't accept `--version',
+       but do accept `-v'.  From Stephan Kulow.
+
+Mon Apr  7 09:39:02 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
+
+       * ltconfig.in (hardcode_action): Fix silly logic error.  From
+       Bruno Haible.
+
 Sat Apr  5 11:26:06 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * ltmain.sh.in (install): Relink if hardcode_action is `relink',
@@ -23,7 +33,7 @@ Wed Apr  2 10:36:31 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
 Tue Apr  1 10:01:20 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
-       * Makefile.am (EXTRA_DIST): Distribute libtool.pkg.
+       * Makefile.am (EXTRA_DIST): Distribute libtool.prj.
 
        * Shameless plug: Changed source code management system from CVS
        to PRCS.

diff --git a/Makefile.am b/Makefile.am
index 6ae37c899dc36e3955ec9d7e174f941372f0c555..ec784315cf310e77b7b446e889eec15ba7cf6bd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ aclocal_macros = libtool.m4
 
 # Distribute ltconfig and ltmain.sh so that the demo directory works.
 EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig ltconfig.in \
-       ltmain.sh ltmain.sh.in README-automake libtool.pkg
+       ltmain.sh ltmain.sh.in README-automake libtool.prj
 CLEANFILES = libtool libtoolize
 MAINTAINERCLEANFILES = ltconfig ltmain.sh
 

diff --git a/NEWS b/NEWS
index 8f5a2dd2bf61bedb7d10e96df8ebb8f26eee2282..b32031e18a73b224681b020064201986bf760d55 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 NEWS - list of user-visible changes between releases of GNU libtool.
 
-New in 0.9d:
+New in 0.9e:
 * Bug fixes.
 * Automake support for Libtool now uses the LTLIBRARIES primary.  See
   the Automake documentation for more information.

diff --git a/PACKAGES b/PACKAGES
index 23998ac26e3d61f68ceb532e0df858819602ee8c..62b6ef4806a39017f4ac6240fff534899f90f988 100644 (file)
--- a/PACKAGES
+++ b/PACKAGES
@@ -5,7 +5,8 @@ Free:
 http://www.ens.fr/~laburthe/claire.html
 ftp://ftp.x.org/contrib/widgets/motif/spinbox/
 The GNU Guile project.
-GTK+ and GIMP (Generic Image Manipulation Program). http://www.
+GTK+ and GIMP (Generic Image Manipulation Program).
+   http://www.xcf.berkeley.edu/~gimp/gimp.html
 SANE (Scanner Access Now Easy):  http://www.azstarnet.com/~davidm/
 
 Nonfree:

diff --git a/README b/README
index 2d20bc7712807d296ddd5eab11550c379ec67e66..e8b946b307a937130400e558a9151508203c0fc0 100644 (file)
--- a/README
+++ b/README
@@ -33,4 +33,5 @@ for a list of platforms that libtool shared library support was tested on.
 
 If you have any suggestions or bug reports, or you wish to port libtool
 to a new platform, please send electronic mail to Gord Matzigkeit
-<gord@gnu.ai.mit.edu>.
+<gord@gnu.ai.mit.edu>.  Don't forget to mention the version of libtool
+that you are currently using (by typing `ltconfig --version').

diff --git a/README-automake b/README-automake
index 1640da7f7ed9b4b3fd3d2bd5abe4ab6a0acc99bf..46025b521424857f3408f4918891c59534425c51 100644 (file)
--- a/README-automake
+++ b/README-automake
@@ -3,8 +3,8 @@ libtool, that may not work with your own copy of Automake.  Only
 releases of Automake after automake-1.1m work with libtool as
 documented in the manual.
 
-You can find the latest Automake prerelease (warning: it may have
-bugs) at:
+You can find the latest Automake prerelease (warning: it is not
+guaranteed to be completely stable) at:
 
 <URL:ftp://ftp.cygnus.com/pub/tromey/>
 

diff --git a/doc/libtool.texi b/doc/libtool.texi
index 5c5017ec4276a4e02c6d54b97634ec141823697f..8bc2758129cd70e5d54b122cda930ca6b39cd109 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1897,7 +1897,8 @@ Finally, send a bug report to @value{BUGADDR} with any appropriate
 @emph{facts}, such as test suite output (@pxref{When Tests Fail}), all
 the details needed to reproduce the bug, and a brief description of why
 you think the behaviour is a bug.  Be sure to include the word
-``libtool'' in the subject line.
+``libtool'' in the subject line, as well as the version number you are
+using (which can be found by typing @kbd{ltconfig --version}).
 
 @node Maintaining
 @chapter Maintainance Notes for Libtool

diff --git a/ltconfig.in b/ltconfig.in
index f4af93a4abb029937b27d0310d50d8153f44595e..e146e788bf812d20c646d9e1c4b389c5597fa4df 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -483,7 +483,7 @@ with_gnu_ld=no
 set dummy $LD
 linker="$2"
 echo $ac_n "checking if $LD is GNU ld... $ac_c" 1>&6
-if $LD --version 2>&1 | egrep '(GNU ld|with BFD)' > /dev/null; then
+if $LD -v 2>&1 | egrep '(GNU ld|with BFD)' > /dev/null; then
   with_gnu_ld=yes
   linker="GNU ld"
 fi
@@ -622,8 +622,8 @@ if test -n "$hardcode_libdir_flag_spec"; then
     # We can link without hardcoding, and we can hardcode nonexisting dirs.
     hardcode_action=immediate
   fi
-elif test "$hardcode_direct" != yes ||
-     test "$hardcode_minus_L" != yes ||
+elif test "$hardcode_direct" != yes &&
+     test "$hardcode_minus_L" != yes &&
      test "$hardcode_shlibpath_var" != yes; then
   # We can't hardcode anything.
   hardcode_action=unsupported