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 4385cd02a4b24f6c16ea05f64aa799412095c18b..5922796fd454ecb78cfcf478e62985791f5b1fea 100644 (file)
--- 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 d7b93fac582a578c39c51011f0ba550ecdbbc979..090a8651d5216bc6ab929ab9407c9524f21086e3 100644 (file)
--- 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