* ltconfig.in (LN_S): Accept, in order of decreasing preference:

the cached value; an environment setting; ``ln -s'' if it works;
``ln'' if ``ln -s'' doesn't appear to work.

diff --git a/ChangeLog b/ChangeLog
index 20e0b58d7e3636ee58bea42b43bb5b35c77889fe..fe84a9519f65d1228e4507dc8b3902dfe2b0527c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-06-08  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
+       * ltconfig.in (LN_S): Accept, in order of decreasing preference:
+       the cached value; an environment setting; ``ln -s'' if it works;
+       ``ln'' if ``ln -s'' doesn't appear to work.
+
        * ltconfig.in (objext): Accept, in order of decreasing preference:
        the cached value; the result of a test object compilation.
 

diff --git a/ltconfig.in b/ltconfig.in
index dcf5d52358a8095fbf7d1700c5eaa1e2e558361e..19435cf41606655085d0b792956196fcf8bd6eb2 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -983,22 +983,31 @@ fi
 LDFLAGS="$save_LDFLAGS"
 $rm conftest*
 
-if test -z "$LN_S"; then
-  # Check to see if we can use ln -s, or we need hard links.
-  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-  $rm conftest.dat
-  if ln -s X conftest.dat 2>/dev/null; then
-    $rm conftest.dat
-    LN_S="ln -s"
-  else
-    LN_S=ln
+# Check to see if we can use ln -s, or we need hard links.
+echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
+echo "$progname:@LINENO@: checking for ln -s" 1>&5
+result=yes
+if test "${ac_cv_prog_LN_S+set}" = "set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+  if test "X$ac_cv_prog_LN_S" != "Xln -s"; then
+    result=no
   fi
-  if test "$LN_S" = "ln -s"; then
-    echo "$ac_t"yes 1>&6
+else
+  if test -n "$LN_S"; then
+    ac_cv_prog_LN_S="$LN_S"
   else
-    echo "$ac_t"no 1>&6
+    $rm conftest.dat
+    if ln -s X conftest.dat 2>/dev/null; then
+      $rm conftest.dat
+      ac_cv_prog_LN_S="ln -s"
+    else
+      ac_cv_prog_LN_S=ln
+      result=no
+    fi
   fi
 fi
+LN_S="$ac_cv_prog_LN_S"
+echo "$ac_t""$result" 1>&6
 
 # Make sure LD is an absolute path.
 if test -z "$LD"; then