5 files changed, 15 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5102d7b1e80..58d05381244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume gnulib does largefile.
+        Gnulib does the largefile configuration anyway, so when configure.in
+        invokes AC_SYS_LARGEFILE, that bloats 'configure' unnecessarily.
+        * configure.in (AC_SYS_LARGEFILE): Remove.
+        * lib/gnulib.mk: Autoupdate.
+
 2012-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib.  (Bug#11527)
diff --git a/admin/ChangeLog b/admin/ChangeLog
index c9e9d4a1acc..f278206494b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume gnulib does largefile.
+        * merge-gnulib (GNULIB_MODULES): Add largefile.
+
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove src/m/*.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index fa082d94664..7f91b788f40 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -29,7 +29,7 @@ GNULIB_MODULES='
   alloca-opt
   careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dup2
-  filemode getloadavg getopt-gnu ignore-value intprops lstat
+  filemode getloadavg getopt-gnu ignore-value intprops largefile lstat
   manywarnings mktime pthread_sigmask readlink
   socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
   warnings
diff --git a/configure.in b/configure.in
index 3a7e42965e8..15cc35f6289 100644
--- a/configure.in
+++ b/configure.in
@@ -942,9 +942,6 @@ AC_DEFUN([AC_TYPE_SIZE_T])
 # Likewise for obsolescent test for uid_t, gid_t; Emacs assumes them.
 AC_DEFUN([AC_TYPE_UID_T])
 
-dnl Do this early because it can frob feature test macros for Unix-98 &c.
-AC_SYS_LARGEFILE
-
 
 LIB_MATH=-lm
 LIB_STANDARD=
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index 863ae5cef42..3572e5bc170 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat manywarnings mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat warnings
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops largefile lstat manywarnings mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat warnings
 
 
 MOSTLYCLEANFILES += core *.stackdump