From: Ralf Menzel <menzel@ls6.cs.uni-dortmund.de>
Date: Thu, 3 Aug 2006 14:06:36 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Fix issues
X-Git-Tag: release-2-1b~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89a71b681222947d191e33c1747ba5677ce1913;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Fix issues
with previous patch. for ... do' line is superflous. Need
_LT_TAGVAR not _LT_AC_TAGVAR, should be for both linux and
solaris with Sun compiler.
---

diff --git a/ChangeLog b/ChangeLog
index a7f64a921..344319d20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-03  Ralf Menzel  <menzel@ls6.cs.uni-dortmund.de>
+
+	* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS): Fix issues
+	with previous patch. for ... do' line is superflous. Need
+	_LT_TAGVAR not _LT_AC_TAGVAR, should be for both linux and
+	solaris with Sun compiler.
+
 2006-08-01  Albert Chin <china@thewrittenword.com>
 
 	* libltdl/m4/libtool.m4 (_LT_SYS_HIDDEN_LIBDEPS) [ solaris ]:
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index db3bc7c41..c54aec174 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -6343,7 +6343,6 @@ linux*)
     # 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 " $CXX $CXXFLAGS " in
     *" -library=stlport4 "*)
       solaris_use_stlport4=yes
@@ -6351,7 +6350,7 @@ linux*)
     esac
 
     if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
     fi
     ;;
   esac
@@ -6360,10 +6359,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_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;