* libtool.m4 [linux] (_LT_COMPILER_PIC, _LT_LANG_CXX_CONFIG):

Match icpc* and ecpc* (ia64 version of icpc) instead of only icpc.

diff --git a/ChangeLog b/ChangeLog
index 1a51a11da2d82329816b2a63349d66ad41478775..e4c55c61528bca15499648ae0ad8922a2a83c38b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-18  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+       * libtool.m4 [linux] (_LT_COMPILER_PIC, _LT_LANG_CXX_CONFIG):
+       Match icpc* and ecpc* (ia64 version of icpc) instead of only icpc.
+
        * libltdl/lt__dirent.c [mingw] (opendir): Fix write of constant
        strings past end of buffer.
        (opendir, readdir): Fix read past end of buffer.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index c26c3dd6d20e1dc3a8a4c652aeec1b39250bb747..5f4eea6f58c7e968c0d86c8d8d9d141ea9a30587 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3083,7 +3083,7 @@ m4_if([$1], [CXX], [
            _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
            ;;
-         icpc)
+         icpc* | ecpc* )
            # Intel C++
            _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -5118,7 +5118,7 @@ if test "$_lt_caught_CXX_error" != yes; then
            # "CC -Bstatic", where "CC" is the KAI C++ compiler.
            _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
            ;;
-         icpc)
+         icpc* | ecpc* )
            # Intel C++
            with_gnu_ld=yes
            # version 8.0 and above of icpc choke on multiply defined symbols