Note and enforce iconv requirement.

diff --git a/ChangeLog b/ChangeLog
index b5000702ee792bcb58c1067cfe23fcb72f0e8543..814e3b446eabf1d38912bc08b6b7c103c00f4204 100644 (file)
--- 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 a16158b869afbf0475450bb2bd70979d3b480973..50264bd1bbce1f3a5a50b41c97ee077c527a172d 100644 (file)
--- 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 9e9835e83691de5cdf8a5ee2c8154ba4b678ab91..2fa7901d36a437fdec409d88a48480f8a6faf0a7 100644 (file)
--- 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])