X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flink-follow.m4;h=d2824424ccbe70ac25764f95db7279043504574a;hb=ade4fb6ef4588f370c1bdbdb90665501140a608d;hp=6064ce74b4727ac17271cc1126f06a8ddb6c7f1c;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 6064ce74b..d2824424c 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,27 +1,25 @@
-#serial 3
-dnl Run a program to determine whether whether link(2) follows symlinks.
+# serial 11
+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-2001, 2004-2006, 2009 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,
+  AC_CACHE_CHECK([whether link(2) dereferences a 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,13 +51,13 @@ 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
-    AC_DEFINE(LINK_FOLLOWS_SYMLINKS, 1,
+  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
 ])