From: Ralf Menzel <menzel@ls6.cs.uni-dortmund.de>
Date: Thu, 3 Aug 2006 14:31:47 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP): Previous patch
X-Git-Tag: release-1-5-23b~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2b0bc2625af105e0579c7deaa56a70fead6d5fe;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP): Previous patch
applies to linux too, with Sun compiler.
---

diff --git a/ChangeLog b/ChangeLog
index 02a1b4490..6b5d185ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03  Ralf Menzel  <menzel@ls6.cs.uni-dortmund.de>
+
+	* libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP): Previous patch
+	applies to linux too, with Sun compiler.
+
 2006-08-01  Albert Chin <china@thewrittenword.com>
 
 	* libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP) [ solaris ]:
diff --git a/libtool.m4 b/libtool.m4
index 6d037febb..60f275d4f 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3913,7 +3913,19 @@ linux*)
   case `$CC -V 2>&1 | sed 5q` in
   *Sun\ C*)
     # Sun C++ 5.9
-    _LT_AC_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.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;