Merge from dmanual branch

[disorder] / README

diff --git a/README b/README
index 323edfcbcc8257ca3edccae34037a2a59f502a90..4c567ba1ab16a765f57f0a2c60bcb8d088413809 100644 (file)
--- a/README
+++ b/README
@@ -24,22 +24,23 @@ It could probably be ported to some other UNIX variants without too much
 effort.
 
 Build dependencies:
-  Name             Tested              Notes
-  libdb            4.3.29              not 4.2/4.6; 4.[457] seem to be ok
+  Name             Tested      Notes
+  libdb            4.3.29      not 4.2/4.6; 4.[457] seem to be ok
   libgc            6.8
   libvorbisfile    1.1.2
-  libpcre          6.7                 need UTF-8 support
+  libpcre          6.7         need UTF-8 support
   libmad           0.15.1b
   libgcrypt        1.2.3
   libao            0.8.6
   libasound        1.0.13
   libFLAC          1.1.2
-  GNU C            4.1.2               }
-  GNU Make         3.81                } Non-GNU versions will NOT work
-  GNU Sed          4.1.5               }
-  Python           2.5.2               (optional; 2.4 won't work)
-  GTK+             2.8.20              (if you want the GTK+ client)
-  GLIB             2.12.4              (if you want the GTK+ client)
+  libsamplerate    0.1.4       currently optional
+  GNU C            4.1.2       }
+  GNU Make         3.81        } Non-GNU versions will NOT work
+  GNU Sed          4.1.5       }
+  Python           2.5.2       (optional; 2.4 won't work)
+  GTK+             2.12.12     (for the GTK+ client; 2.10 & older will NOT work)
+  GLIB             2.16.6      (for the GTK+ client)
 
 "Tested" means I've built against that version; earlier or later versions will
 often work too.
@@ -88,9 +89,6 @@ platform, please get in touch.
      --without-gtk          Don't build GTK+ client (Disobedience)
      --without-python       Don't build Python support
 
-   On a Mac you can use --with-bits=64 to request a 64-bit build.  The default
-   is 32 bits.  You will need suitable versions of all the libraries used.
-
    If configure cannot guess where your web server keeps its HTML documents and
    CGI programs, you may have to tell it, for instance: