From f05b9c77f07190e5e3dc703cb94d78fc78698d79 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 11 Apr 2006 17:34:03 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ THANKS | 1 + lib/m4sugar/m4sh.m4 | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 72abbacc..04292730 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2006-04-11 Ralf Wildenhues + * 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 6ffc0842..1c5dc837 100644 --- 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 6ab58f94..6506dc95 100644 --- 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' -- 2.11.4.GIT