From b54a5702b6200871c8278a55d37a87e924f04eb1 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 20 Mar 2011 21:03:15 -0700
Subject: [PATCH] Fix up build following dropping ulc-width-linebreaks module.

Commit b5cebf00d5e "Smake: Remove  module"
unexpectedly broke the build, because ulc-width-linebreaks had several
indirect dependencies that PSPP actually used but were not in the
list of Gnulib modules in Smake.  This fixes the problem.

The oddest consequence fixed by this commit has to do with
build-aux/config.rpath.  AM_GNU_GETTEXT requires this file, which is
supplied by only a few Gnulib modules: havelib, gettext, and
threadlib.  ulc-width-linebreaks depended indirectly on havelib, but
PSPP did not otherwise depend on any of these modules.  It seemed that
the best fix was simply to use the Gnulib gettext module, which is
what this commit does.
---
 Smake        | 6 +++++-
 configure.ac | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Smake b/Smake
index a1a81651..a118607c 100644
--- a/Smake
+++ b/Smake
@@ -7,6 +7,7 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
 	assert \
 	byteswap \
+	c-strcase \
 	c-ctype \
 	c-strtod \
 	clean-temp \
@@ -29,7 +30,7 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	gettext-h \
+	gettext \
 	gettimeofday \
         getopt-gnu \
 	gitlog-to-changelog \
@@ -79,10 +80,13 @@ GNULIB_MODULES = \
 	unistd \
 	unistr/u8-check \
 	unistr/u8-cpy \
+	unistr/u8-mblen \
 	unistr/u8-mbtouc \
+	unistr/u8-mbtoucr \
 	unistr/u8-strlen \
 	unistr/u8-strmbtouc \
 	unistr/u8-strncat \
+	unistr/u8-uctomb \
 	uniwidth/u8-strwidth \
 	unitypes \
 	unlocked-io \
diff --git a/configure.ac b/configure.ac
index 7bdd87f0..bcad1e01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,10 +32,9 @@ AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 PSPP_CC_FOR_BUILD
 PSPP_PERL
 
-dnl Internationalization macros.
-AC_PROVIDE([AM_PO_SUBDIRS])	# PSPP provides its own po/ support.
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.17])
+dnl Disable automatic po/ support, because PSPP provides its own po/ support.
+AC_PROVIDE([AM_PO_SUBDIRS])
+AM_GNU_GETTEXT_NEED([need-ngettext])
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
@@ -322,6 +321,7 @@ if test x"$enable_debug" = x"yes"  ; then
 fi
 
 # iconv is required
+AM_ICONV
 if test "$am_cv_func_iconv" != "yes"; then
    PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
 fi
-- 
2.30.2