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

version more idiomatically.

diff --git a/ChangeLog b/ChangeLog
index f462485bbf3146af1741348099e39bee70dad5ba..26251429e73d652c688592aa1f0bd7803893d0ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-20  Gary V. Vaughan  <gary@gnu.org>
+
+       * m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Detect Intel C++ compiler
+       version more idiomatically.
+
 2004-04-19  Gary V. Vaughan  <gary@gnu.org>
 
        * m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Intel C++ compiler 8.0 and

diff --git a/libtool.m4 b/libtool.m4
index 8f889b9b8ce435a16f9190467841b62dfa6146dd..dd3b2b0441f041578b9d5308f2136f239e2eb205 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -3147,18 +3147,16 @@ case $host_os in
        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'