aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-06-16 16:10:17 -0700
committerPaul Eggert2011-06-16 16:10:17 -0700
commitbf4846e712443d883aab808918335a632dfaab2d (patch)
tree0f66e212f550c1cfa463531893bd054b38cb0e5a
parentdd3482fe595a93359c0c65bb7d48100a5d9a90d9 (diff)
downloademacs-bf4846e712443d883aab808918335a632dfaab2d.tar.gz
emacs-bf4846e712443d883aab808918335a632dfaab2d.zip
* m4/lstat.m4: Merge from gnulib (Bug#8878).
-rw-r--r--ChangeLog4
-rw-r--r--m4/lstat.m44
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 97952924005..bede3f3155c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-06-16 Paul Eggert <eggert@cs.ucla.edu>
2
3 * m4/lstat.m4: Merge from gnulib (Bug#8878).
4
12011-06-16 Miles Bader <miles@gnu.org> 52011-06-16 Miles Bader <miles@gnu.org>
2 6
3 * configure.in: Try to determine CRT_DIR automatically when 7 * 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 @@
1# serial 22 1# serial 23
2 2
3# Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc. 3# Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc.
4# 4#
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_LSTAT],
15 dnl "#define lstat stat", and lstat.c is a no-op. 15 dnl "#define lstat stat", and lstat.c is a no-op.
16 AC_CHECK_FUNCS_ONCE([lstat]) 16 AC_CHECK_FUNCS_ONCE([lstat])
17 if test $ac_cv_func_lstat = yes; then 17 if test $ac_cv_func_lstat = yes; then
18 AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) 18 AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
19 if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then 19 if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then
20 REPLACE_LSTAT=1 20 REPLACE_LSTAT=1
21 fi 21 fi