[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
libiconv is now required
From: |
Ben Pfaff |
Subject: |
libiconv is now required |
Date: |
Fri, 09 Feb 2007 14:04:16 -0800 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) |
The PSPP tree now has a hard dependency on iconv, because i18n.c
uses it without testing whether it is available. We can either
drop the dependency or announce it to our users. Here's a patch
for the latter, which also fixes some uses of "test a == b" in the
configure script (== is not in SUSv3).
John, which option do you prefer?
Index: README
===================================================================
RCS file: /cvsroot/pspp/pspp/README,v
retrieving revision 1.13
diff -u -p -r1.13 README
--- README 26 Nov 2006 02:59:11 -0000 1.13
+++ README 9 Feb 2007 22:01:54 -0000
@@ -20,6 +20,10 @@ PSPP, you will need to install certain p
* 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.
Index: configure.ac
===================================================================
RCS file: /cvsroot/pspp/pspp/configure.ac,v
retrieving revision 1.51
diff -u -p -r1.51 configure.ac
--- configure.ac 9 Feb 2007 15:06:28 -0000 1.51
+++ configure.ac 9 Feb 2007 22:01:54 -0000
@@ -42,10 +42,10 @@ fi
AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
AC_ARG_WITH(gui_tools, [ --with-gui-tools build the gui developer
tools])
-if test x"$with_gui_tools" == x"yes" ; then
+if test x"$with_gui_tools" = x"yes" ; then
PKG_CHECK_MODULES(GLADE_UI, libgladeui-1.0)
fi
-AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" == x"yes")
+AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
PSPP_OFF_T
@@ -96,6 +96,11 @@ if test x"$enable_debug" = x"yes" ; the
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])
--
"A computer is a state machine.
Threads are for people who cant [sic] program state machines."
--Alan Cox
- libiconv is now required,
Ben Pfaff <=