diff options
-rw-r--r-- | INSTALL.md | 18 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 4 |
3 files changed, 14 insertions, 12 deletions
@@ -25,7 +25,7 @@ Build dependencies: | |||
25 | 25 | ||
26 | Note: package fetching commands may vary by OS. | 26 | Note: package fetching commands may vary by OS. |
27 | 27 | ||
28 | On Ubuntu: | 28 | On Ubuntu: |
29 | 29 | ||
30 | ```bash | 30 | ```bash |
31 | sudo apt-get install build-essential libtool autotools-dev automake checkinstall check git yasm | 31 | sudo apt-get install build-essential libtool autotools-dev automake checkinstall check git yasm |
@@ -38,9 +38,9 @@ yum groupinstall "Development Tools" | |||
38 | yum install libtool autoconf automake check check-devel | 38 | yum install libtool autoconf automake check check-devel |
39 | ``` | 39 | ``` |
40 | 40 | ||
41 | On SunOS: | 41 | On SunOS: |
42 | 42 | ||
43 | ```pfexcec | 43 | ```pfexcec |
44 | pkg install autoconf automake gcc-47 | 44 | pkg install autoconf automake gcc-47 |
45 | ``` | 45 | ``` |
46 | On FreeBSD 10+: | 46 | On FreeBSD 10+: |
@@ -62,7 +62,7 @@ cd .. | |||
62 | ``` | 62 | ``` |
63 | 63 | ||
64 | 64 | ||
65 | Or if checkinstall is not easily available for your distribution (e.g. Fedora), | 65 | Or if checkinstall is not easily available for your distribution (e.g., Fedora), |
66 | this will install the libs to /usr/local/lib and the headers to /usr/local/include: | 66 | this will install the libs to /usr/local/lib and the headers to /usr/local/include: |
67 | 67 | ||
68 | ```bash | 68 | ```bash |
@@ -142,7 +142,7 @@ make install | |||
142 | 142 | ||
143 | Grab the following packages: | 143 | Grab the following packages: |
144 | * https://gnu.org/software/libtool/ | 144 | * https://gnu.org/software/libtool/ |
145 | * https://gnu.org/software/autoconf/ | 145 | * https://gnu.org/software/autoconf/ |
146 | * https://gnu.org/software/automake/ | 146 | * https://gnu.org/software/automake/ |
147 | * https://github.com/jedisct1/libsodium | 147 | * https://github.com/jedisct1/libsodium |
148 | * http://check.sourceforge.net/ | 148 | * http://check.sourceforge.net/ |
@@ -180,7 +180,8 @@ You should install: | |||
180 | - [MinGW](http://sourceforge.net/projects/mingw/) | 180 | - [MinGW](http://sourceforge.net/projects/mingw/) |
181 | 181 | ||
182 | When installing MinGW, make sure to select the MSYS option in the installer. | 182 | When installing MinGW, make sure to select the MSYS option in the installer. |
183 | MinGW will install an "MinGW shell" (you should get a shortcut for it), make sure to perform all operations (i.e. generating/running configure script, compiling, etc.) from the MinGW shell. | 183 | MinGW will install an "MinGW shell" (you should get a shortcut for it), make |
184 | sure to perform all operations (i.e., generating/running configure script, compiling, etc.) from the MinGW shell. | ||
184 | 185 | ||
185 | First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it. | 186 | First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it. |
186 | Assuming that you got the libsodium-0.4.2.tar.gz release: | 187 | Assuming that you got the libsodium-0.4.2.tar.gz release: |
@@ -193,7 +194,8 @@ make install | |||
193 | cd .. | 194 | cd .. |
194 | ``` | 195 | ``` |
195 | 196 | ||
196 | You can also use a precompiled win32 binary of libsodium, however you will have to place the files in places where they can be found, i.e. dll's go to /bin headers to /include and libraries to /lib directories in your MinGW shell. | 197 | You can also use a precompiled win32 binary of libsodium, however you will have |
198 | to place the files in places where they can be found, i.e., dll's go to /bin headers to /include and libraries to /lib directories in your MinGW shell. | ||
197 | 199 | ||
198 | Next, install ProjectTox-Core library, should either clone this repo by using git, or just download a [zip of current Master branch](https://github.com/irungentoo/ProjectTox-Core/archive/master.zip) and extract it somewhere. | 200 | Next, install ProjectTox-Core library, should either clone this repo by using git, or just download a [zip of current Master branch](https://github.com/irungentoo/ProjectTox-Core/archive/master.zip) and extract it somewhere. |
199 | 201 | ||
@@ -243,7 +245,7 @@ While [Toxic](https://github.com/tox/toxic) is no longer in core, a list of Tox | |||
243 | <a name="libtoxav" /> | 245 | <a name="libtoxav" /> |
244 | ####libtoxav: | 246 | ####libtoxav: |
245 | 247 | ||
246 | 'libtoxav' is needed for A/V support and it's enabled by default. You can disable it by adding --disable-av argument to ./configure script like so: | 248 | 'libtoxav' is needed for A/V support and it's enabled by default. You can disable it by adding --disable-av argument to ./configure script like so: |
247 | ```bash | 249 | ```bash |
248 | ./configure --disable-av | 250 | ./configure --disable-av |
249 | ``` | 251 | ``` |
diff --git a/Makefile.am b/Makefile.am index 9ef4afed..6b28280e 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -22,8 +22,8 @@ EXTRA_DIST = \ | |||
22 | $(top_srcdir)/docs/updates/Symmetric-NAT-Transversal.md \ | 22 | $(top_srcdir)/docs/updates/Symmetric-NAT-Transversal.md \ |
23 | $(top_srcdir)/tools/README \ | 23 | $(top_srcdir)/tools/README \ |
24 | $(top_srcdir)/tools/astylerc \ | 24 | $(top_srcdir)/tools/astylerc \ |
25 | $(top_srcdir)/tools/pre-commit | 25 | $(top_srcdir)/tools/pre-commit |
26 | 26 | ||
27 | if BUILD_AV | 27 | if BUILD_AV |
28 | 28 | ||
29 | pkgconfig_DATA += $(top_builddir)/libtoxav.pc | 29 | pkgconfig_DATA += $(top_builddir)/libtoxav.pc |
diff --git a/configure.ac b/configure.ac index 283a38d7..34038517 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -158,7 +158,7 @@ NACL_SEARCH_LIBS= | |||
158 | 158 | ||
159 | AC_ARG_WITH(dependency-search, | 159 | AC_ARG_WITH(dependency-search, |
160 | AC_HELP_STRING([--with-dependency-search=DIR], | 160 | AC_HELP_STRING([--with-dependency-search=DIR], |
161 | [search for dependencies in DIR, i.e. look for libraries in | 161 | [search for dependencies in DIR, i.e., look for libraries in |
162 | DIR/lib and for headers in DIR/include]), | 162 | DIR/lib and for headers in DIR/include]), |
163 | [ | 163 | [ |
164 | DEPSEARCH="$withval" | 164 | DEPSEARCH="$withval" |
@@ -675,7 +675,7 @@ AC_CONFIG_FILES([Makefile | |||
675 | build/Makefile | 675 | build/Makefile |
676 | libtoxcore.pc | 676 | libtoxcore.pc |
677 | ]) | 677 | ]) |
678 | 678 | ||
679 | AM_COND_IF(BUILD_AV, | 679 | AM_COND_IF(BUILD_AV, |
680 | [ | 680 | [ |
681 | AC_CONFIG_FILES([libtoxav.pc]) | 681 | AC_CONFIG_FILES([libtoxav.pc]) |