From: Ben Pfaff <blp@gnu.org>
Date: Tue, 13 Feb 2007 00:39:49 +0000 (+0000)
Subject: Note and enforce iconv requirement.
X-Git-Tag: v0.6.0~548
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f42446114868d90817dfb335b008097c6c2276;p=pspp-builds.git

Note and enforce iconv requirement.
---

diff --git a/ChangeLog b/ChangeLog
index b5000702..814e3b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 12 16:39:18 2007  Ben Pfaff  <blp@gnu.org>
+
+	* README: Note that iconv is required.
+
+	* configure.ac: Enforce iconv requirement.
+
 Thu Feb  8 14:56:18 2007  Ben Pfaff  <blp@gnu.org>
 
 	Reduce platform dependence.
diff --git a/README b/README
index a16158b8..50264bd1 100644
--- a/README
+++ b/README
@@ -20,6 +20,10 @@ PSPP, you will need to install certain prerequisites:
     * pkg-config (only if you need to regenerate configure after
       modifying configure.ac).
 
+    * iconv, which should be installed as part of a Unix-like system.
+      If you don't have a version already, you can install GNU
+      libiconv (http://www.gnu.org/software/libiconv/).
+
     * Optional: libncurses.  Without it, PSPP will assume it is
       running in an 80x25 terminal.
 
diff --git a/configure.ac b/configure.ac
index 9e9835e8..2fa7901d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,11 @@ if test x"$enable_debug" = x"yes"  ; then
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
 fi
 
+# iconv is required
+if test "$am_cv_func_iconv" != "yes"; then
+   PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
+fi
+
 PSPP_CHECK_PREREQS
 
 AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])