upstream

3 files changed, 10 insertions, 2 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index c03bf6156ab..94bb94357b9 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -156,7 +156,6 @@ HAVE_STRERROR
 HAVE_STRFTIME
 HAVE_STRING_H
 HAVE_STRUCT_UTIMBUF
-HAVE_SYSINFO
 HAVE_SYSV_SIGPAUSE
 HAVE_SYS_SELECT_H
 HAVE_SYS_SYSTEMINFO_H
diff --git a/admin/ChangeLog b/admin/ChangeLog
index c9e9d4a1acc..0c3bbf93873 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * CPP-DEFINES: Remove HAVE_SYSINFO.
+
+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