From: Bruno Haible <bruno@clisp.org>
Date: Wed, 24 Aug 2005 15:57:32 +0000 (+0000)
Subject: * libltdl/config/ltmain.sh (func_mode_install): Try "ln -s -f"
X-Git-Tag: release-2-1b~556
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3165a5d2b7e3b9ef8512c4b9f9687fe28372abf6;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.sh (func_mode_install): Try "ln -s -f"
and "rm -f && ln -s" to make a symlink for a shared library: the
former is needed for libraries `ln' depends on, the latter for
Solaris /bin/ln.
Reported by Nelson H. F. Beebe <beebe@math.utah.edu>.
---

diff --git a/ChangeLog b/ChangeLog
index d0289b6c3..3b9df6c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-08-24  Bruno Haible  <bruno@clisp.org>
+
+	* libltdl/config/ltmain.sh (func_mode_install): Try "ln -s -f"
+	and "rm -f && ln -s" to make a symlink for a shared library: the
+	former is needed for libraries `ln' depends on, the latter for
+	Solaris /bin/ln.
+	Reported by Nelson H. F. Beebe <beebe@math.utah.edu>.
+
+	* libltdl/config/ltmain.sh (cwrappersource): return 127 if exec
+	failed.
+
 2005-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/m4/libtool.m4 (_LT_COMPILER_C_O): Send chmod warning to log.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 3a2858f74..17fe229f8 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1911,10 +1911,13 @@ func_mode_install ()
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
 	    for linkname
 	    do
 	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)"
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
 	    done
 	  fi