X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flink-follow.m4;h=ceec0675c590fdac455b8a0aa4b3d86816387394;hb=8eaac7a51d093dbcecc0c2b42a5762a882b4517b;hp=a3b07eb75922ee85d9d177e79e26b4dc68c08bcf;hpb=5d87923144f697e55a900abeb33e47cc215155e4;p=gnulib.git

diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index a3b07eb75..ceec0675c 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,27 +1,26 @@
-#serial 2
-dnl Run a program to determine whether whether link(2) follows symlinks.
+#serial 9
+dnl Run a program to determine whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
-AC_DEFUN(jm_AC_FUNC_LINK_FOLLOWS_SYMLINK,
+# Copyright (C) 1999, 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK],
 [dnl
   AC_CACHE_CHECK(
     [whether link(2) dereferences a symlink specified with a trailing slash],
-		 jm_ac_cv_func_link_follows_symlink,
+		 gl_ac_cv_func_link_follows_symlink,
   [
-    dnl poor-man's AC_REQUIRE: FIXME: repair this once autoconf-3 provides
-    dnl the appropriate framework.
-    test -z "$ac_cv_header_unistd_h" \
-      && AC_CHECK_HEADERS(unistd.h)
-
     # Create a regular file.
     echo > conftest.file
     AC_TRY_RUN(
       [
 #       include <sys/types.h>
 #       include <sys/stat.h>
-#       ifdef HAVE_UNISTD_H
-#        include <unistd.h>
-#       endif
+#       include <unistd.h>
+#       include <stdlib.h>
 
 #       define SAME_INODE(Stat_buf_1, Stat_buf_2) \
 	  ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
@@ -53,12 +52,12 @@ AC_DEFUN(jm_AC_FUNC_LINK_FOLLOWS_SYMLINK,
 	  return SAME_INODE (sb_hard, sb_file) ? 0 : 1;
 	}
       ],
-      jm_ac_cv_func_link_follows_symlink=yes,
-      jm_ac_cv_func_link_follows_symlink=no,
-      jm_ac_cv_func_link_follows_symlink=yes dnl We're cross compiling.
+      gl_ac_cv_func_link_follows_symlink=yes,
+      gl_ac_cv_func_link_follows_symlink=no,
+      gl_ac_cv_func_link_follows_symlink=yes dnl We're cross compiling.
     )
   ])
-  if test $jm_ac_cv_func_link_follows_symlink = yes; then
+  if test $gl_ac_cv_func_link_follows_symlink = yes; then
     AC_DEFINE(LINK_FOLLOWS_SYMLINKS, 1,
       [Define if `link(2)' dereferences symbolic links.])
   fi