From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 16 Jun 2011 23:10:17 +0000 (-0700)
Subject: * m4/lstat.m4: Merge from gnulib (Bug#8878).
X-Git-Tag: emacs-pretest-24.0.90~104^2~536
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf4846e712443d883aab808918335a632dfaab2d;p=emacs.git

* m4/lstat.m4: Merge from gnulib (Bug#8878).
---

diff --git a/ChangeLog b/ChangeLog
index 97952924005..bede3f3155c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* m4/lstat.m4: Merge from gnulib (Bug#8878).
+
 2011-06-16  Miles Bader <miles@gnu.org>
 
 	* configure.in: Try to determine CRT_DIR automatically when
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 72c76c6cf3b..fe161d40101 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,4 @@
-# serial 22
+# serial 23
 
 # Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc.
 #
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_LSTAT],
   dnl "#define lstat stat", and lstat.c is a no-op.
   AC_CHECK_FUNCS_ONCE([lstat])
   if test $ac_cv_func_lstat = yes; then
-    AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+    AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
     if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then
       REPLACE_LSTAT=1
     fi