Pass -b option to diff to avoid spurious failure of

[pspp] / INSTALL

diff --git a/INSTALL b/INSTALL
index 2cff28821ad0f6ecd6d22c7f59cd37cbae5c0649..64675e035c1bed871470a47b5ec489b174d39c23 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -44,11 +44,13 @@ The following packages are required to enable PSPPIRE, the graphical
 user interface for PSPP.  If you cannot install them or do not wish to
 use the GUI, you must run `configure' with --without-gui.
 
 user interface for PSPP.  If you cannot install them or do not wish to
 use the GUI, you must run `configure' with --without-gui.
 

-    * GTK+ (http://www.gtk.org/), version 2.6.0 or later, although we
+    * pkg-config (http://pkg-config.freedesktop.org/wiki/). 
+
+    * GTK+ (http://www.gtk.org/), version 2.8.0 or later, although we

       recommend version 2.10.2 or later.
 
     * libglade (http://www.jamesh.id.au/software/libglade/), version
       recommend version 2.10.2 or later.
 
     * libglade (http://www.jamesh.id.au/software/libglade/), version

-      2.0 or later.
+      2.6 or later.

 
 The following packages are optional.
 
 
 The following packages are optional.
 


@@ -64,12 +66,11 @@ The following packages are optional.
       later.  Installing Texinfo will allow you to build PSPP
       documentation in PostScript or PDF format.
 
       later.  Installing Texinfo will allow you to build PSPP
       documentation in PostScript or PDF format.
 

-The following packages are optional.  They are useful primarily for
-PSPP developers.
+    * zlib (http://www.zlib.net/).  Installing zlib and libxml2 will
+      allow your PSPP binary to read Gnumeric files.

 
 

-    * pkg-config (http://pkg-config.freedesktop.org/wiki/).  This is
-      needed only to regenerate configure after modifying
-      configure.ac.
+    * libxml2 (http://xmlsoft.org/).  Installing zlib and libxml2 will
+      allow your PSPP binary to read Gnumeric files.

 
 Basic Installation
 ==================
 
 Basic Installation
 ==================


@@ -97,17 +98,20 @@ release.
      Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 
      Running `configure' takes awhile.  While running, it prints some
      messages telling which features it is checking for.
 

-     When `configure' completes, it may print a list of packages that
-     you must install before PSPP.  If it does, you need to install
-     those packages, then re-run this step.  Some prerequisites may be
+     If `configure' completes successfully, it prints the message
+     "PSPP configured successfully." at the end of its run.
+     Otherwise, it may stop with a list of packages that you must
+     install before PSPP.  If it does, you need to install those
+     packages, then re-run this step.  Some prerequisites may be

      omitted by passing a --without-<feature> flag to `configure' (see
      "Optional Features", below).  If you use one of these flags, then
      the feature that it disables will not be available in your PSPP
      installation.
 
      `configure' may also print a list of packages that you should
      omitted by passing a --without-<feature> flag to `configure' (see
      "Optional Features", below).  If you use one of these flags, then
      the feature that it disables will not be available in your PSPP
      installation.
 
      `configure' may also print a list of packages that you should

-     consider installing.  If you install them, additional features
-     will be available in your PSPP installation.
+     consider installing.  If you install them, then re-run
+     `configure', additional features will be available in your PSPP
+     installation.

 
   2. Type `make' to compile the package.
 
 
   2. Type `make' to compile the package.