Mercurial > hg > bitcoin

changeset 567:92fcf1bfd4bc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #196 from amiryal/master Improve UPNP build instructions
author Jeff Garzik <jgarzik@exmulti.com>
date Fri, 06 May 2011 04:24:32 -0700
parents a418c8c17e37 (current diff) 0a41e3e7353f (diff)
children 296705b9432a
files
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/build-unix.txt
+++ b/build-unix.txt
@@ -37,9 +37,12 @@
 and build it yourself.  See the build instructions and configure parameters
 below.
 
-Requires miniupnpc for UPnP port mapping.  To compile with UPnP support,
-install miniupnpc and compile after setting USE_UPNP.  It can be downloaded
-from http://miniupnp.tuxfamily.org/files/.  
+Requires miniupnpc for UPnP port mapping.  It can be downloaded from
+http://miniupnp.tuxfamily.org/files/.  UPnP support is compiled in and
+turned off by default.  Set USE_UPNP to a different value to control this:
+USE_UPNP=   no UPnP support, miniupnp not required;
+USE_UPNP=0  (the default) UPnP support turned off by default at runtime;
+USE_UPNP=1  UPnP support turned on by default at runtime.
 
 Licenses of statically linked libraries:
 wxWidgets      LGPL 2.1 with very liberal exceptions