* libtool.m4 [linux] (AC_LIBTOOL_PROG_COMPILER_PIC): match

$cc_basename, not $CC against icc.  Also, for symmetry match
icpc* and ecpc* (ia64 version of icpc).

diff --git a/ChangeLog b/ChangeLog
index eacd43f80bc43e3d9267b0c84e0cbc02d49b68ce..891e9c6875045210899fb49f8b7ac2dd64bb89bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2004-12-18  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
-       * libltdl/ltdl.c [cygwin, mingw] (opendir): Fix write of constant
+       * libtool.m4 [linux] (AC_LIBTOOL_PROG_COMPILER_PIC): match
+       $cc_basename, not $CC against icc.  Also, for symmetry match
+       icpc* and ecpc* (ia64 version of icpc).
+
+       * libltdl/ltdl.c [mingw] (opendir): Fix write of constant
        strings past end of buffer.
        (opendir, readdir): Fix read past end of buffer.
 

diff --git a/libtool.m4 b/libtool.m4
index 4a35e42b0bb6cf65437d447f14839d2bbf772f84..6870a870bf9feb7a315606b8c6fefa8a2497204b 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -4718,7 +4718,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
            ;;
-         icpc)
+         icpc* | ecpc*)
            # Intel C++
            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4963,7 +4963,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'