Merge branch 'master' of https://github.com/Tox/toxic

.travis.yml

@@ -9,27 +9,15 @@ before_script:
   - cd libsodium
   - git checkout tags/0.4.2
   - ./autogen.sh
-  - ./configure && make check -j3
-  - sudo make install
-  - cd ..
-# installing libconfig, needed for DHT_bootstrap_daemon
-  - wget http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz
-  - tar -xvzf libconfig-1.4.9.tar.gz
-  - cd libconfig-1.4.9
   - ./configure && make -j3
-  - sudo make install
+  - sudo make install 
   - cd ..
 # creating librarys' links and updating cache
   - sudo ldconfig
-# installing sphinx, needed for documentation
-  - sudo apt-get install python-sphinx
-# installing check, needed for unit tests
-  - sudo apt-get install check
-  
   - git clone https://github.com/irungentoo/ProjectTox-Core.git toxcore
   - cd toxcore
   - autoreconf -i
-  - ./configure
+  - ./configure --disable-tests --disable-ntox --disable-dht-bootstrap-daemon
   - make -j2
   - sudo make install
   - cd ..

README.md

@@ -7,3 +7,10 @@ To compile, first generate the configure script by running the ```autoreconf -i`
 Then execute the configure script (you'll probably have to pass it the location of your dependency libraries, i.e.):
 ```
 ./configure --prefix=/where/to/install --with-libtoxcore-headers=/path/to/ProjectTox-Core/core --with-libtoxcore-libs=/path/to/ProjectTox-Core/build/core --with-libsodium-headers=/path/to/libsodium/include/ --with-libsodium-libs=/path/to/sodiumtest/lib/
+
+```
+*Note:* If your default prefix is /usr/local and you happen to get an error that says "error while loading shared libraries: libtoxcore.so.0: cannot open shared object file: No such file or directory", then you can try running ```sudo ldconfig```. If that doesn't fix it, run:
+```
+sudo echo "/usr/local/lib/" >> /etc/ld.so.conf.d/locallib.conf
+sudo ldconfig
+```