Merge: Work around some portability problems with symlinks.

diff --cc ChangeLog
index f7bef44ef551a20fed84822afb504031db4a5c6b,30262b6c5bc4bfcf42eae3945806bd09f9adcfb1..3bb49ce27f5c37cebb8c75955b95d90a6fe9582a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,16 @@@
++2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
++
++      Work around some portability problems with symlinks.
++
++      * Makefile.in (GNULIB_MODULES): Add lstat, readlink, symlink.
++      * configure.in (lstat, HAVE_LSTAT): Remove special hack.
++      * lib/dosname.h, lib/lstat.c, lib/readlink.c, lib/stat.c:
++      * lib/symlink.c, m4/lstat.m4, m4/readlink.m4, m4/stat.m4:
++      * m4/symlink.m4:
++      New files, automatically generated from gnulib.
++      * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
++      * m4/gl-comp.m4, src/config.in, config.sub: Regenerate.
++
  2011-02-26  Eli Zaretskii  <eliz@gnu.org>
  
        * .bzrignore: Ignore new lib/*.in-h files.

diff --cc config.sub
index 83da3565c17d7ef5f890256687d59fc249d8b25b,83da3565c17d7ef5f890256687d59fc249d8b25b..0ef29b072ed43a34b43daf0df2a25d5928fcd71b
--- 1/config.sub
--- 2/config.sub
+++ b/config.sub
@@@ -4,7 -4,7 +4,7 @@@
  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
  #   2011 Free Software Foundation, Inc.
  
--timestamp='2011-02-02'
++timestamp='2011-02-24'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@@ -76,7 -76,7 +76,7 @@@ version="
  GNU config.sub ($timestamp)
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
  Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO

diff --cc configure
index f3fae2fb85f413545fd14b918a68c61c6579765e,658fac9a35800eeadc3cc73923138f3de5845ecc..68447e985f012cbb5ad4857c05e72e3a4f044145
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1165,9 -1165,9 +1165,6 @@@ LDFLAG
  LIBS
  CPPFLAGS
  CPP
--CPPFLAGS
--CPP
--CPPFLAGS
  XMKMF'
  
  

diff --cc src/ChangeLog
index 0e5e295a622cdbc8b40a0a5c156ff49db5657417,388e8c251d1f21461d3c32a4dc2fc4405ffdb529..34e28866144592f61f6416d35880cfd214af4d8b
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,3 +1,16 @@@
++2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
++
++      Work around some portability problems with symlinks.
++
++      * fileio.c (Fmake_symbolic_link): Treat ENOSYS specially, and
++      generate a special message for it.  Suggested by Eli Zaretskii in
++      <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00995.html>.
++      (Frename_file, Fmake_symbolic_link, Ffile_symlink_p):
++      Simplify the code by assuming that the readlink and symlink calls
++      exist, even if they always fail on this host.
++      (Ffile_readable_p): Likewise, for fifos.
++      * config.in: Regenerate.
++
  2011-02-27  Chong Yidong  <cyd@stupidchicken.com>
  
        * frame.c (store_frame_param): Don't store value directly in