segment: The body of DEFINE does not have to be on separate lines.

[pspp] / INSTALL

diff --git a/INSTALL b/INSTALL
index 96191b9782e7a0c8ae1a1a6bf73442d81914eaed..5fe74b442d57a38c901b2b63df5a2ed83ce5417b 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -68,27 +68,15 @@ 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/).
 
       If you don't have a version already, you can install GNU
       libiconv (http://www.gnu.org/software/libiconv/).
 

-    * libintl, from GNU gettext (http://www.gnu.org/software/gettext).
-      GNU libc includes an integrated libintl, so there is no need to
-      separately install libintl on a GNU/Linux system.
+    * Cairo (http://cairographics.org/), version 1.12 or later.
+
+    * Pango (http://www.pango.org/), version 1.22 or later.

 
     * zlib (http://www.zlib.net/).
 
     * libxml2 (http://xmlsoft.org/).
 
 
     * zlib (http://www.zlib.net/).
 
     * libxml2 (http://xmlsoft.org/).
 

-    * metainfo.its, provided by the appstream package. This is required
-      by xgettext version lower then 0.20 to extract the translation
-      strings from the org.fsf.pspp.metainfo.xml.in file. This is only
-      required for building. It is not a runtime requirement.
-
-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 (in which case you will get no graphing
-capability).
-
-    * Cairo (http://cairographics.org/), version 1.12 or later.
-
-    * Pango (http://www.pango.org/), version 1.22 or later.
+    * gettext version 0.20 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
 
 The following packages are required to enable PSPPIRE, the graphical
 user interface for PSPP.  If you cannot install them or do not wish to


@@ -271,17 +259,10 @@ suffix on their names by giving `configure' the  option
 Optional Features
 =================
 
 Optional Features
 =================
 

-`--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.
 
 `--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.
-

 `--without-lib{xx}'
     Optional libraries should normally be detected and the relevant
     functionality will be built they exist.  However, on some poorly
 `--without-lib{xx}'
     Optional libraries should normally be detected and the relevant
     functionality will be built they exist.  However, on some poorly