FYI: libtool--devo--1.0--patch-55

[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)

iD8DBQFAg+qmFRMICSmD1gYRAiaXAJ4y1U5YhnXp/Gb7OYavowsWdKsxIwCfWqME
Dp0+Q+AUyFguEc6QwNbtKjE=
=fDth
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--devo--1.0--patch-54 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-54
M  ChangeLog
M  m4/libtool.m4

* modified files

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

        * m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Detect Intel C++ compiler
        version more idiomatically.

--- orig/m4/libtool.m4
+++ mod/m4/libtool.m4
@@ -4989,18 +4989,16 @@
        with_gnu_ld=yes
        # version 8.0 and above of icpc choke on multiply defined symbols
        # if we add $predep_objects and $postdep_objects, however 7.1 and
-       # earlier do not add the objects themselves.  Only 8.0 (and newer?)
-       # support the --version argument, so we use that to distinguish them:
-       lt_icpc_version=`icpc --version 2>/dev/null`
-       case $lt_icpc_version in
-       [[0-9.]]*)  # Version 8.0 or newer
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
-         ;;
-       *) # No output from 7.1 and older
+       # earlier do not add the objects themselves.
+       case `$CC -V 2>&1` in
+       *"Version 7."*)
          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname 
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
          ;;
+       *)  # Version 8.0 or newer
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
+         ;;
        esac
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'