[bug-diffutils] just pushed 19 small changes

[Jim Meyering]

I've just pushed a bunch of small, mostly-maint/build changes.
Now diffutils "make check" runs a few small, generic tests,
and "make syntax-check" passes, with the following two additional fixes:


>From 4fe5ec326f4a09060ec30097cef9ba8b547f69d5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 20 Nov 2009 10:26:48 +0100
Subject: [PATCH 1/2] maint: lib/xfreopen.c contains translatable strings

* po/POTFILES.in: Add lib/xfreopen.c.
---
 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 27ceb0a..77aa278 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,6 +22,7 @@ lib/getopt.c
 lib/quotearg.c
 lib/regcomp.c
 lib/xalloc-die.c
+lib/xfreopen.c
 lib/xstrtol-error.c
 lib/version-etc.c

--
1.6.5.3.433.g11067


>From 2fe6784a3507be4fc1ae9d78eb5b8c6d6f759ae6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 20 Nov 2009 10:36:54 +0100
Subject: [PATCH 2/2] build: link with now-required libraries

* src/Makefile.am (LDADD): Add gnulib-required libraries.
(cmp_LDADD): Add $(LIBICONV), for cmp's use of proper_name_utf8.
---
 src/Makefile.am |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 84f330d..7c9dc7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,8 +23,18 @@ localedir = $(datadir)/locale

 AM_CPPFLAGS = -I../lib -I$(top_srcdir)/lib

-LDADD = ../lib/libdiffutils.a $(LIBINTL) $(LIBSIGSEGV)
-diff_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+LDADD = \
+  ../lib/libdiffutils.a \
+  $(LIBCSTACK) \
+  $(LIBINTL) \
+  $(LIBSIGSEGV) \
+  $(LIB_CLOCK_GETTIME) \
+  $(LIB_NANOSLEEP)
+
+diff_LDADD = $(LDADD)
+cmp_LDADD = $(LDADD) $(LIBICONV)
+sdiff_LDADD = $(LDADD)
+diff3_LDADD = $(LDADD)

 cmp_SOURCES = cmp.c
 diff3_SOURCES = diff3.c
--
1.6.5.3.433.g11067