Replace the type-checking COMPTR macro with my current idea of best

[sgt/putty] / README

diff --git a/README b/README
index a215aef..72fc68c 100644 (file)
--- a/README
+++ b/README
@@ -40,7 +40,7 @@ For building on Windows:
    Makefile.bor' while in the `windows' subdirectory to build all
    the PuTTY binaries.
 
- - windows/Makefile.cyg is for Cygwin / mingw32 installations. Type
+ - windows/Makefile.cyg is for Cygwin / MinGW installations. Type
    `make -f Makefile.cyg' while in the `windows' subdirectory to
    build all the PuTTY binaries.
 
@@ -65,8 +65,12 @@ For building on Unix:
 
  - unix/configure is for Unix and GTK. If you don't have GTK, you
    should still be able to build the command-line utilities (PSCP,
-   PSFTP, Plink, PuTTYgen) using this script. To use it, change
-   into the `unix' subdirectory, run `./configure' and then `make'.
+   PSFTP, Plink, PuTTYgen) using this script. To use it, change into
+   the `unix' subdirectory, run `./configure' and then `make'. Or you
+   can do the same in the top-level directory (we provide a little
+   wrapper that invokes configure one level down), which is more like
+   a normal Unix source archive but doesn't do so well at keeping the
+   per-platform stuff in each platform's subdirectory; it's up to you.
 
    Note that Unix PuTTY has mostly only been tested on Linux so far;
    portability problems such as BSD-style ptys or different header file
@@ -80,9 +84,13 @@ For building on Unix:
    utilities and has no Gtk dependence.
 
  - For the graphical utilities, Gtk+-1.2 and Gtk+-2.0 should both be
-   supported. In the absence of either, the configure script will
+   supported. If you have both installed, you can manually specify
+   which one you want by giving the option '--with-gtk=1' or
+   '--with-gtk=2' to the configure script. (2 is the default, of
+   course.) In the absence of either, the configure script will
    automatically construct a Makefile which builds only the
-   command-line utilities.
+   command-line utilities; you can manually create this condition by
+   giving configure the option '--without-gtk'.
 
  - pterm would like to be setuid or setgid, as appropriate, to permit
    it to write records of user logins to /var/run/utmp and
@@ -98,6 +106,10 @@ For building on Unix:
    Subversion then you will need to have built these using Halibut
    first - see below.
 
+ - It's also possible to build the Windows version of PuTTY to run
+   on Unix by using Winelib.  To do this, change to the `windows'
+   directory and run `make -f Makefile.cyg CC=winegcc RC=wrc'.
+
 All of the Makefiles are generated automatically from the file
 `Recipe' by the Perl script `mkfiles.pl' (except for the Unix one,
 which is generated by the `configure' script; mkfiles.pl only