aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorsje397 <sje397@gmail.com>2011-11-11 01:20:17 +1100
committersje397 <sje397@gmail.com>2011-12-20 22:11:24 +1100
commit22123c85f3722abad896aebb564a89d88da92e81 (patch)
tree212d80a39a64c31bc7746127306cdb4eb9ce1614 /doc
parent3528650560a2c417da2303869c743da019defc6d (diff)
Added QRCode generation functions via libqrencode. Switch on with USE_QRENCODE=1.
Amended build docs for Linux and OSX, and OSX makefile. Added package 'qrencode' to gitian.yml
Diffstat (limited to 'doc')
-rw-r--r--doc/build-osx.txt3
-rw-r--r--doc/build-unix.txt20
2 files changed, 16 insertions, 7 deletions
diff --git a/doc/build-osx.txt b/doc/build-osx.txt
index 800244153a..d47febe94b 100644
--- a/doc/build-osx.txt
+++ b/doc/build-osx.txt
@@ -43,6 +43,9 @@ pushd bitcoin/contrib/minipupnpc; sudo port install; popd
(this will be unnecessary soon, you will just port install miniupnpc
along with the rest of the dependencies).
+Optionally install qrencode (and set USE_QRCODE=1):
+sudo port install qrencode
+
4. Now you should be able to build bitcoind:
cd bitcoin/src
diff --git a/doc/build-unix.txt b/doc/build-unix.txt
index f4178caae5..538933984c 100644
--- a/doc/build-unix.txt
+++ b/doc/build-unix.txt
@@ -23,12 +23,13 @@ the graphical bitcoin.
Dependencies
------------
- Library Purpose Description
- ------- ------- -----------
- libssl SSL Support Secure communications
- libdb4.8 Berkeley DB Blockchain & wallet storage
- libboost Boost C++ Library
- miniupnpc UPnP Support Optional firewall-jumping support
+ Library Purpose Description
+ ------- ------- -----------
+ libssl SSL Support Secure communications
+ libdb4.8 Berkeley DB Blockchain & wallet storage
+ libboost Boost C++ Library
+ miniupnpc UPnP Support Optional firewall-jumping support
+ libqrencode QRCode generation Optional QRCode generation
miniupnpc may be used for UPnP port mapping. It can be downloaded from
http://miniupnp.tuxfamily.org/files/. UPnP support is compiled in and
@@ -37,6 +38,12 @@ turned off by default. Set USE_UPNP to a different value to control this:
USE_UPNP=0 (the default) UPnP support turned off by default at runtime
USE_UPNP=1 UPnP support turned on by default at runtime
+libqrencode may be used for QRCode image generation. It can be downloaded
+from http://fukuchi.org/works/qrencode/index.html.en, or installed via
+your package manager. Set USE_QRCODE to control this:
+ USE_QRCODE=0 (the default) No QRCode support - libarcode not required
+ USE_QRCODE=1 QRCode support enabled
+
Licenses of statically linked libraries:
Berkeley DB New BSD license with additional requirement that linked
software must be free open source
@@ -50,7 +57,6 @@ Versions used in this release:
Boost 1.37
miniupnpc 1.6
-
Dependency Build Instructions: Ubuntu & Debian
----------------------------------------------
sudo apt-get install build-essential