Imported Upstream version 1.0~rc1upstream/1.0_rc1

1 files changed, 40 insertions, 14 deletions

diff --git a/README b/README
index 1d04c6b..69163ac 100644
--- a/README
+++ b/README
@@ -1,3 +1,16 @@
+Dependencies
+============
+Knot DNS has several dependencies:
+* libtool
+* autoconf > 2.65
+* flex >= 2.5.31
+* bison >= 2.3
+* libssl >= 0.9.8
+* liburcu >= 0.5.4 (available as packages or as a sources from http://lttng.org/urcu)
+
+Optional packages:
+* libcap-ng >= 0.6.4 for POSIX 1003.1e capabilites(7)
+
 Installation
 ============
 
@@ -10,25 +23,23 @@ Ubuntu Server  (AMD64, I386) 10.04 LTS
 Ubuntu Desktop (AMD64, I386) 10.04 LTS
 ----------------------------------------------
 
-$ # make the system up-to-date
-$
+# Make the system up-to-date
 $ sudo apt-get update
 $ sudo apt-get upgrade
-$
-$ # ensure all prerequisites are installed
-$
-$ sudo apt-get install git-core autoconf libtool flex bison libssl-dev
-$
-$ # the required version of liburcu is not available in the default package 
-$ # sources.
-$
+
+# Ensure all prerequisites are installed
+$ sudo apt-get install git-core autoconf libtool flex bison libssl-dev liburcu-dev
+
+# Install optional packages (POSIX 1003.1e capabilities)
+$ sudo apt-get install libcap-ng-dev
+
+# If the liburcu-dev package is not present, install directly
 $ wget http://bd.archive.ubuntu.com/ubuntu/pool/universe/libu/liburcu/liburcu0_0.5.4-1_amd64.deb
 $ wget http://bd.archive.ubuntu.com/ubuntu/pool/universe/libu/liburcu/liburcu-dev_0.5.4-1_amd64.deb
 $ sudo dpkg -i liburcu0_0.5.4-1_amd64.deb
 $ sudo dpkg -i liburcu-dev_0.5.4-1_amd64.deb
-$
-$ # go for the real thing
-$
+
+# Go for the real thing
 $ git clone git://git.nic.cz/knot
 $ cd knot
 $ autoreconf -if
@@ -38,7 +49,6 @@ $ sudo make install
 $ sudo ldconfig
 
 Alternative packages for I386:
-
 $ # the required version of liburcu is not available in the default package 
 $ # sources.
 $
@@ -65,6 +75,22 @@ $ autoreconf -if
 $ ./configure
 $ make && sudo make install
 
+Installation on OpenBSD/NetBSD
+==============================
+Also works for OS X, if you don't want to install gcc from ports.
+Prerequisites:
+- liburcu needs patch for absent compiler TLS capability
+  - patch is located in "scripts/urcu-tls-compat.patch"
+- patch compatible with liburcu-0.6.7
+
+$ mkdir liburcu && cd liburcu
+$ wget "http://lttng.org/files/urcu/userspace-rcu-0.6.7.tar.bz2"
+$ patch -p1 < ../scripts/urcu-tls-compat.patch 
+$ autoconf && ./configure && make && sudo make install
+$ # or follow installation instructions in INSTALL
+
+Knot DNS installation is the same as in previous section (Installation on BSD).
+
 Installation on OS X
 ====================