X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=INSTALL;h=6654e90bb52507a395ac9be49812e69529f3e41a;hb=131ca96f8e1b8675e80b37ad6cedca1b21b87e87;hp=177e383018263fd852ef72e4e5074d74b9f2db49;hpb=c4942b88d3090c38f0844af32c0c8d5be30809de;p=pspp

diff --git a/INSTALL b/INSTALL
index 177e383018..6654e90bb5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -33,16 +33,17 @@ The following packages are required to install PSPP:
       If you don't have a version already, you can install GNU
       libiconv (http://www.gnu.org/software/libiconv/).
 
-    * GNU make (http://www.gnu.org/software/make).  Version 3.81 is
-      known to work; other versions will likely work too.  Non-GNU
-      "make" programs will probably not work.
+    * libintl, from GNU gettext (http://ww.gnu.org/software/gettext).
+      GNU libc includes an integrated libintl, so there is no need to
+      separately install libintl on a GNU/Linux system.
 
-The following package is required to enable PSPP's graphing features.
-If you cannot arrange to install it, you must run `configure' with
---without-libplot.
+The following packages are required to enable PSPP's graphing
+features.  If you cannot arrange to install them, you must run
+`configure' with --without-cairo.
 
-    * libplot, from GNU plotutils
-      (http://www.gnu.org/software/plotutils/).
+    * Cairo (http://cairographics.org/), version 1.5 or later.
+
+    * Pango (http://www.pango.org/), version 1.22 or later.
 
 The following packages are required to enable PSPPIRE, the graphical
 user interface for PSPP.  If you cannot install them or do not wish to
@@ -54,10 +55,6 @@ use the GUI, you must run `configure' with --without-gui.
 
     * GTK+ (http://www.gtk.org/), version 2.12.0 or later.
 
-    * pkg-config (http://pkg-config.freedesktop.org/wiki/).  Versions
-      0.18 and 0.19 have a bug that will prevent library detection,
-      but other versions should be fine.
-
 To cross-compile PSPP, you will likely need to set the
 PKG_CONFIG_LIBDIR environment variable to point to an
 appropriate pkg-config for the cross-compilation environment.
@@ -69,6 +66,11 @@ Gnumeric files.
 
     * libxml2 (http://xmlsoft.org/).  
 
+Installing the following packages will allow your PSPP binary to write
+OpenDocument text (ODT) files:
+
+    * libxml2 (http://xmlsoft.org/).  
+
 The following packages are optional.
 
     * libncurses (http://www.gnu.org/software/ncurses/).  Without it,
@@ -144,9 +146,7 @@ release.
      `configure', additional features will be available in your PSPP
      installation.
 
-  2. Type `make' to compile the package.  (If GNU make is installed
-     under a different program name, e.g. "gmake", run that program
-     instead in this step and in the following steps as well.)
+  2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run the self-tests that come
      with the package.  If any of the self-tests fail, please mail
@@ -215,14 +215,17 @@ suffix on their names by giving `configure' the  option
 Optional Features
 =================
 
-`--without-libplot'
-    Don't compile in support for charts (using libplot).  This is
-    useful if your system doesn't have the libplot library.
+`--without-cairo'
+    Don't compile in support for charts (using Cairo and Pango).  This
+    is useful if your system lacks these libraries.
 
 `--without-gui'
     Don't build the PSPPIRE gui.  Use this option if you only want to
     build the command line version of PSPP.
 
+    Cairo and Pango required to build the GUI, so --without-cairo
+    implies --without-gui.
+
 `--with-gui-tools'
     Build the gui developer tools.  There is no reason to use this
     option unless you're involved with the development of PSPP
@@ -234,6 +237,10 @@ Optional Features
     In these cases you can use --without-lib{xx} to force configure
     to disregard it.
 
+`--without-perl-module'
+   Disable building the Perl module, in case it does not build properly
+   or you do not need it.
+
 `--enable-anachronistic-dependencies'
    If you use this option, some of the checks for dependent libraries
    will be relaxed, permitting configure to succeed when older versions