From: Albert Chin <china@thewrittenword.com>
Date: Wed, 2 Aug 2006 13:35:37 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP) [ solaris ]:
X-Git-Tag: release-1-5-23b~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b17f3394804fe055c14277c76077449e66a8fa40;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP) [ solaris ]:
Don't set $postdeps to "-lCstd -lCrun" if
"-library=stlport4" set in CXXFLAGS as stlport4 C++
library incompatible with Cstd C++ library. Use
'-library=Cstd -library=Crun' instead of '-lCstd -lCrun'.
---

diff --git a/ChangeLog b/ChangeLog
index a0b660cac..02a1b4490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-01  Albert Chin <china@thewrittenword.com>
+
+	* libtool.m4 (AC_LIBTOOL_POSTDEP_PREDEP) [ solaris ]:
+	Don't set $postdeps to "-lCstd -lCrun" if
+	"-library=stlport4" set in CXXFLAGS as stlport4 C++
+	library incompatible with Cstd C++ library. Use
+	'-library=Cstd -library=Crun' instead of '-lCstd -lCrun'.
+
 2006-07-28  Eric Blake  <ebb9@byu.net>
 
 	* libtool.m4 (AC_DEPLIBS_CHECK_METHOD): s/recognise/recognize/.
diff --git a/libtool.m4 b/libtool.m4
index e3aa54e58..6d037febb 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3921,10 +3921,22 @@ linux*)
 solaris*)
   case $cc_basename in
   CC*)
+    # 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
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;