diff --git a/ChangeLog b/ChangeLog
index 6230f553..a98781f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-25  Bob McElrath  <bob+libtool@mcelrath.org>
+
+	* libtool.m4 (AC_LIBTOOL_PROG_COMPILER_PIC): Add support for
+	the Compaq C compiler for Alpha Linux.
+
 2003-02-25  Benjamin Reed  <ranger@befunk.com>
 
 	* libtool.m4 (darwin): Disable hardcoding library paths to
diff --git a/libtool.m4 b/libtool.m4
index 345b8c03..ac4a52c8 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -4749,11 +4749,18 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       ;;
 
     linux*)
-      if test "$CC" = "icc"; then
+      case $cc_basename in
+      icc)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-      fi
+        ;;
+      ccc)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      esac
       ;;
 
     osf3* | osf4* | osf5*)