diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-02-23 23:24:07 +0100 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-02-23 23:24:07 +0100 |
commit | cf8a090cdeeb2630730203144001f1357b25ee01 (patch) | |
tree | ac52dcc5d043248cd719004d4eaffde64a65e3d3 /INSTALL.md | |
parent | 4888d916d037e371c88d39951f24f6ef4219c7cc (diff) | |
parent | f219fb4ac1bf60eea3117df4aa8615cd07738a69 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'INSTALL.md')
-rw-r--r-- | INSTALL.md | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -49,8 +49,6 @@ On FreeBSD 10+: | |||
49 | pkg install automake autoconf | 49 | pkg install automake autoconf |
50 | ``` | 50 | ``` |
51 | 51 | ||
52 | Note that `libconfig-dev` should be >= 1.4. | ||
53 | |||
54 | You should get and install [libsodium](https://github.com/jedisct1/libsodium): | 52 | You should get and install [libsodium](https://github.com/jedisct1/libsodium): |
55 | ```bash | 53 | ```bash |
56 | git clone git://github.com/jedisct1/libsodium.git | 54 | git clone git://github.com/jedisct1/libsodium.git |
@@ -112,7 +110,7 @@ brew install --HEAD libtoxcore | |||
112 | 110 | ||
113 | To do it manually: | 111 | To do it manually: |
114 | ``` | 112 | ``` |
115 | brew install libtool automake autoconf libconfig libsodium check | 113 | brew install libtool automake autoconf libsodium check |
116 | ``` | 114 | ``` |
117 | Then clone this repo and generate makefile: | 115 | Then clone this repo and generate makefile: |
118 | ```bash | 116 | ```bash |
@@ -234,7 +232,7 @@ While [Toxic](https://github.com/tox/toxic) is no longer in core, a list of Tox | |||
234 | - --disable-av disable A/V support (default: auto) see: [libtoxav](#libtoxav) | 232 | - --disable-av disable A/V support (default: auto) see: [libtoxav](#libtoxav) |
235 | - --enable-phone build phone (default: no) see: [Test phone](#phone) | 233 | - --enable-phone build phone (default: no) see: [Test phone](#phone) |
236 | - --enable-ntox build nTox client (default: no) see: [nTox](#ntox) | 234 | - --enable-ntox build nTox client (default: no) see: [nTox](#ntox) |
237 | - --enable-daemon build DHT bootstrap daemon (default: no) see: [Bootstrap daemon](#bootstrapd) | 235 | - --enable-daemon build DHT bootstrap daemon (default=no) see: [Bootstrap daemon](#bootstrapd) |
238 | - --enable-shared[=PKGS] build shared libraries [default=yes] | 236 | - --enable-shared[=PKGS] build shared libraries [default=yes] |
239 | - --enable-static[=PKGS] build static libraries [default=yes] | 237 | - --enable-static[=PKGS] build static libraries [default=yes] |
240 | 238 | ||
@@ -335,7 +333,7 @@ Daemon is disabled by default. You can enable it by adding --enable-daemon argum | |||
335 | ```bash | 333 | ```bash |
336 | ./configure --enable-daemon | 334 | ./configure --enable-daemon |
337 | ``` | 335 | ``` |
338 | There is one dependency required for bootstrap daemon: libconfig. | 336 | There is one dependency required for bootstrap daemon: `libconfig-dev` >= 1.4. |
339 | 337 | ||
340 | Install on fedora: | 338 | Install on fedora: |
341 | ```bash | 339 | ```bash |
@@ -354,6 +352,7 @@ brew install libconfig | |||
354 | OS X non-homebrew: | 352 | OS X non-homebrew: |
355 | Grab the following [package] (http://www.hyperrealm.com/libconfig/), uncompress and install | 353 | Grab the following [package] (http://www.hyperrealm.com/libconfig/), uncompress and install |
356 | 354 | ||
355 | See this [readme](other\bootstrap_daemon\README.md) on how to set up the bootstrap daemon. | ||
357 | 356 | ||
358 | 357 | ||
359 | <a name="ntox" /> | 358 | <a name="ntox" /> |