Merge branch 'patch-1' of https://github.com/dypa/ProjectTox-Core into dypa-patch-1

Conflicts:
	INSTALL.md
This commit is contained in:
irungentoo 2013-07-30 12:29:52 -04:00
commit b94d9d6765

View File

@ -5,7 +5,7 @@
Build dependencies: Build dependencies:
```bash ```bash
apt-get install build-essential libtool autotools-dev automake libconfig-dev ncurses-dev cmake apt-get install build-essential libtool autotools-dev automake libconfig-dev ncurses-dev cmake checkinstall
``` ```
You should get and install [libsodium](https://github.com/jedisct1/libsodium): You should get and install [libsodium](https://github.com/jedisct1/libsodium):
@ -15,7 +15,7 @@ cd libsodium
git checkout tags/0.4.2 git checkout tags/0.4.2
./autogen.sh ./autogen.sh
./configure && make check ./configure && make check
sudo make install sudo checkinstall --install --pkgname libsodium --pkgversion 0.4.2 --nodoc
sudo ldconfig sudo ldconfig
``` ```