Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/Attic/libtool.m4,v
retrieving revision 1.125.2.76
diff -u -p -r1.125.2.76 libtool.m4
--- m4/libtool.m4	24 Aug 2005 15:05:20 -0000	1.125.2.76
+++ m4/libtool.m4	1 Aug 2006 04:28:53 -0000
@@ -5919,7 +5919,22 @@ m4_if([$1], [CXX],
 solaris*)
   case $cc_basename in
   CC*)
-    _LT_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    for cc_flag in $CXXFLAGS; do
+      case $cc_flag in
+      *-library=stlport4*)
+	solaris_use_stlport4=yes
+	break
+	;;
+      esac
+    done
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
 esac