From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 23 Apr 2001 20:11:35 +0000 (+0000)
Subject: From Albert Chin-A-Young <china@thewrittenword.com>
X-Git-Tag: multi-language-merge-point~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e05bcd7ea4fda60a2b898b6ce03fc0c9f9f8e14;p=thirdparty%2Flibtool.git

From Albert Chin-A-Young <china@thewrittenword.com>
* ltmain.in:  `test -L' is not portable, and infact breaks uninstall
mode on Solaris.  Fallback to `test -h' and finally `test -f',
but be careful not to let the failure status cause libtool to
stop.
---

diff --git a/ChangeLog b/ChangeLog
index 4385cd02a..5922796fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-04-23  Gary V. Vaughan  <gvv@techie.com>
 
+	From Albert Chin-A-Young <china@thewrittenword.com>
+	* ltmain.in:  `test -L' is not portable, and infact breaks uninstall
+	mode on Solaris.  Fallback to `test -h' and finally `test -f',
+	but be careful not to let the failure status cause libtool to
+	stop.
+
 	From Simon Spero <ses@ibiblio.org>
 	* ltdl.m4 (AC_LTDL_DLSYM_USCORE):  Add $LIBADD_DL while
 	checking for dlsym _.
diff --git a/ltmain.in b/ltmain.in
index d7b93fac5..090a8651d 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -5141,7 +5141,9 @@ relink_command=\"$relink_command\""
       fi
       
       # Don't error if the file doesn't exist and rm -f was used.
-      if test -L "$file" >/dev/null 2>&1 || test -f "$file"; then
+      if (test -L "$file") >/dev/null 2>&1 \
+        || (test -h "$file") >/dev/null 2>&1 \
+	|| test -f "$file"; then
         :
       elif test -d "$file"; then
         exit_status=1