diff --git a/acinclude.m4 b/acinclude.m4
index 1c2d74164..682002ba6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -554,3 +554,29 @@ if test "$ac_cv_struct_sockaddr_sa_len" = yes; then
 fi
 AC_MSG_RESULT($ac_cv_struct_sockaddr_sa_len)
 ])
+
+dnl
+dnl Better test for ln -s, ln or cp
+dnl
+
+AC_DEFUN(AC_KRB_PROG_LN_S,
+[AC_MSG_CHECKING(for ln -s or something else)
+AC_CACHE_VAL(ac_cv_prog_LN_S,
+[rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"
+else
+  touch conftestdata1
+  if ln conftestdata1 conftestdata2; then
+    rm -f conftestdata*
+    ac_cv_prog_LN_S=ln
+  else
+    ac_cv_prog_LN_S=cp
+  fi
+fi])dnl
+LN_S="$ac_cv_prog_LN_S"
+AC_MSG_RESULT($ac_cv_prog_LN_S)
+AC_SUBST(LN_S)dnl
+])