X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flink-follow.m4;h=d2824424ccbe70ac25764f95db7279043504574a;hb=a9577e5bdf9e9814ff774a2a68e9f83b5e842fe6;hp=735dad09f26d358ad639062adac70fe2e83d9c6f;hpb=7c3f8da8f075e3813ced160d5b53a28c6f7dfe78;p=gnulib.git

diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 735dad09f..d2824424c 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,17 +1,16 @@
-#serial 7
-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.
 
-# Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+# 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,
   [
     # Create a regular file.
     echo > conftest.file
@@ -20,6 +19,7 @@ AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK],
 #       include <sys/types.h>
 #       include <sys/stat.h>
 #       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 \
@@ -51,13 +51,13 @@ AC_DEFUN([gl_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
 ])