* lib/m4sugar/m4sh.m4 (_AS_LN_S_PREPARE): If `ln -s file1 file2'

succeeded, but `ln -s file dir' failed, take care to remove the
leftover target before the next test, to prevent its spurious
failure; also make sure `ln file dir' works before selecting it.
Thanks to Keith Marshall for pointing this out.
* THANKS: Update.

diff --git a/ChangeLog b/ChangeLog
index 72abbaccffbc9de57d26bc5cac2bb2f35608adb7..04292730d8399bee24cdd02319edaa8c907c285a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-04-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * lib/m4sugar/m4sh.m4 (_AS_LN_S_PREPARE): If `ln -s file1 file2'
+       succeeded, but `ln -s file dir' failed, take care to remove the
+       leftover target before the next test, to prevent its spurious
+       failure; also make sure `ln file dir' works before selecting it.
+       Thanks to Keith Marshall for pointing this out.
+       * THANKS: Update.
+
        * lib/autotest/general.m4 (AT_INIT): Store quoted variable
        assignments in `at_debug_args', so that we put them correctly
        in the `run' script.

diff --git a/THANKS b/THANKS
index 6ffc084275541433a344add9acaec03d6fc39b67..1c5dc837cc0e1df2430911aea13f722efdefe986 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -113,6 +113,7 @@ Karl Heuer                  kwzh@gnu.org
 Kathryn Hargreaves          kathryn@deas.harvard.edu
 Kaveh R. Ghazi              ghazi@caip.rutgers.edu
 Kelly Anderson              tgcorp@attglobal.net
+Keith Marshall              keith.marshall@total.com
 Ken Pizzini                 ken@halcyon.com
 Ken Raeburn                 raeburn@cygnus.com
 Kevin Ryde                  user42@zip.com.au

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 6ab58f942cce5eaa0d883791f7a2192477077bc4..6506dc95d4ecb8206bcb1233f83b630ea2a73f4f 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -877,7 +877,9 @@ if ln -s conf$$.file conf$$ 2>/dev/null &&
   else
     as_ln_s='ln -s'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
+elif rm -f conf$$ conf$$.dir/conf$$.file &&
+     ln conf$$.file conf$$ 2>/dev/null &&
+     ln conf$$.file conf$$.dir 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'