[bug-patch] [PATCH 1/2] build: include .version in tarball to avoid distcheck failure

[Jim Meyering]

Here are two patches:

The first prevents make distcheck failure,
and the second helps Mac OS 10.5 users who use patch
to operate on very large files.

>From f935ba6ad3b2e2962a7ca7d7204d168a6c008d53 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 1 Aug 2011 10:09:25 +0200
Subject: [PATCH 1/2] build: include .version in tarball to avoid distcheck
 failure

* Makefile.am (EXTRA_DIST): Append .version, to avoid "make distcheck"
failure when run from an unpacked tarball.
Reported by Iain Nicol.
---
 Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 87854a9..311b4b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@ else
   GNU_SERVER = ftp.gnu.org
 endif

+EXTRA_DIST += $(top_srcdir)/.version
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
        echo $(VERSION) > address@hidden && mv address@hidden $@
--
1.7.6.433.g1421f


>From 79348dbd2be9ceb50e77e58db55438da65ada148 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 10 Aug 2011 15:52:02 +0200
Subject: [PATCH 2/2] build: use largefile module and update to latest gnulib

* configure.ac: Remove AC_SYS_LARGEFILE, subsumed by ...
* bootstrap.conf (gnulib_modules): ...this.  Use largefile module.
* gnulib: Update to latest.
This is useful to Mac OS X 10.5 users if/when configure
is generated using autoconf prior to v2.68-80-gdb2f2e0.
---
 bootstrap.conf |    1 +
 configure.ac   |    1 -
 gnulib         |    2 +-
 m4/.gitignore  |    3 +++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index a460c57..62f03b7 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -35,6 +35,7 @@ gitlog-to-changelog
 git-version-gen
 hash
 ignore-value
+largefile
 lchmod
 lstat
 maintainer-makefile
diff --git a/configure.ac b/configure.ac
index aa07fac..08aa9ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,6 @@ AC_PROG_CC
 AC_PROG_CC_STDC
 gl_EARLY
 gl_USE_SYSTEM_EXTENSIONS
-AC_SYS_LARGEFILE
 AC_HEADER_STDC
 gl_INIT

diff --git a/gnulib b/gnulib
index ef05ce6..5b9e0c3 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit ef05ce61b0e5354256e0096c7dc022bf09bbf1d3
+Subproject commit 5b9e0c3ce734b9d9b0c0001e31b65a8a4713700d
diff --git a/m4/.gitignore b/m4/.gitignore
index 29db97d..a9814e0 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -37,6 +37,7 @@
 /inline.m4
 /intmax_t.m4
 /inttypes_h.m4
+/largefile.m4
 /lchmod.m4
 /localcharset.m4
 /locale-fr.m4
@@ -56,6 +57,7 @@
 /mktime.m4
 /mmap-anon.m4
 /multiarch.m4
+/nocrash.m4
 /parse-datetime.m4
 /pathmax.m4
 /printf.m4
@@ -85,6 +87,7 @@
 /strndup.m4
 /strnlen.m4
 /symlink.m4
+/sys_socket_h.m4
 /sys_stat_h.m4
 /sys_time_h.m4
 /tempname.m4
--
1.7.6.433.g1421f