From: Gordon Matzigkeit Date: Fri, 6 Feb 1998 08:38:29 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release-1-0~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af5498d64d5fba277b06de831d31d0cc0d382967;p=thirdparty%2Flibtool.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 5ed227813..2dddd2c4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Fri Feb 6 00:20:41 1998 Gordon Matzigkeit + * 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 7c62cecf1..7a08fbeb0 100644 --- 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 c826dbe1d..fc5db05a9 100644 --- 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 e3cbf611c..9a81a9690 100644 --- 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 , 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 65f7276ba..4277c3e7a 100755 --- 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 , 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 56431bf30..d82d37283 100644 --- 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 , 1996 # # This program is free software; you can redistribute it and/or modify