*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 5ed227813b27fca0d5a1797976476e2c5982b40d..2dddd2c4b5ff6ebbe4600f53e8111dd19a7240ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Fri Feb  6 00:20:41 1998  Gordon Matzigkeit  <gord@profitpress.com>
 
+       * libtool.m4 (LD): Use file(1) to discover which ABI we're using
+       on IRIX, and propagate the correct linker flag.  From Jim Wilson.
+
        * ltconfig.in, ltmain.in (Xsed): `arg=-n; echo "$arg" | sed ...'
        gives problems, because the `-n' is interpreted as an option to
        echo(1).  So, use `echo "X$arg" | sed -e 's/^X//' ...' everywhere,

diff --git a/NEWS b/NEWS
index 7c62cecf1f43449ef319fb7b4a8d1f92e7a968bf..7a08fbeb02546749506e5e06fb270d0ff3e91f59 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
-New:
+New in 1.0i - 1998-02-06, Gordon Matzigkeit:
 * Bug fixes.
 * Inter-library dependencies are automatically handled when linking
   against a `.la' file.  This, along with `-no-undefined', should

diff --git a/doc/libtool.texi b/doc/libtool.texi
index c826dbe1d6a0066d47c094fceea48a2c155f9b7d..fc5db05a9be626eab5027588717f9da327ab2cc2 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -23,7 +23,7 @@
 @ifinfo
 This file documents GNU Libtool @value{VERSION}
 
-Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+Copyright (C) 1996--1998 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -55,7 +55,7 @@ approved by the Foundation.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1996, 1997 Free Software Foundation, Inc.
+Copyright @copyright{} 1996--1998 Free Software Foundation, Inc.
 @sp 2
 This is the first edition of the GNU Libtool documentation,@*
 and is consistent with GNU Libtool @value{VERSION}.@*

diff --git a/libtool.m4 b/libtool.m4
index e3cbf611c92dd86813e38cca44093596fc4e885a..9a81a96901435e31e1958df2bb6b6123bc837781 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1,5 +1,5 @@
 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+## 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
@@ -21,7 +21,7 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 18 AM_PROG_LIBTOOL
+# serial 19 AM_PROG_LIBTOOL
 AC_DEFUN(AM_PROG_LIBTOOL,
 [AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([AC_PROG_RANLIB])
@@ -65,40 +65,31 @@ 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
-*-*-irix6*)
-  ac_save_CFLAGS="$CFLAGS"
-  flag_passed=no
-  for f in -32 -64 -n32 ABI -cckr -mips1 -mips2 -mips3 -mips4; do
-    case "$f" in
-    ABI)
-      test -n "$SGI_ABI" && flag_passed=yes
-      if test "$flag_passed" = no && test "$ac_cv_prog_gcc" = yes; then
-       # Choose the ABI flag according to GCC's specs.
-       if $CC -dumpspecs 2>&1 | sed '/^\*link:$/,/^$/!d' | egrep -e '[         ]-32' >/dev/null; then
-         LD="${LD-ld} -32"
-       else
-         LD="${LD-ld} -n32"
-       fi
-      fi
+case "$host" in
+*-*-irix*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      LD="${LD-ld} -32"
       ;;
-
-    *)
-      if echo " $CC $CFLAGS " | egrep -e "[    ]$f[     ]" > /dev/null; then
-       flag_passed=yes
-       LD="${LD-ld} $f"
-      fi
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
       ;;
     esac
-  done
-  CFLAGS="$ac_save_CFLAGS"
+  fi
+  rm -rf conftest*
   ;;
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   CFLAGS="$CFLAGS -belf"
   ;;
-esac]
+esac
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \

diff --git a/ltconfig.in b/ltconfig.in
index 65f7276baf9d77f81ba102681a51b6ee7acc1e51..4277c3e7a1620891d0446bc2041ee30144ba6d76 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -2,7 +2,7 @@
 
 # ltconfig - Create a system-specific libtool.
 # @configure_input@
-# Copyright (C) 1996, 1997, Free Software Foundation, Inc.
+# Copyright (C) 1996-1998 Free Software Foundation, Inc.
 # Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -1119,7 +1119,7 @@ amigaos*)
 freebsd2* | freebsd3*)
   version_type=sunos
   library_names_spec='$libname.so.$versuffix $libname.so'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -1158,7 +1158,7 @@ linux-gnu*)
   version_type=linux
   library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
   soname_spec='${libname}${release}.so.$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
 
   if test -f /lib/ld.so.1; then
@@ -1175,7 +1175,7 @@ linux-gnu*)
 netbsd* | openbsd*)
   version_type=sunos
   library_names_spec='$libname.so.$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -1210,7 +1210,7 @@ solaris2*)
 sunos4*)
   version_type=sunos
   library_names_spec='$libname.so.$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 

diff --git a/ltmain.in b/ltmain.in
index 56431bf302860292c293c17b15558e642f15cb29..d82d37283e41f3c347d5973f25ed176c3205863c 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1,6 +1,6 @@
 # ltmain.sh - Provide generalized library-building support services.
 # @configure_input@
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# 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