Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into udp_connections

INSTALL.md

@@ -68,9 +68,14 @@ Advance configure options:
   - --prefix=/where/to/install
   - --with-libsodium-headers=/path/to/libsodium/include/
   - --with-libsodium-libs=/path/to/sodiumtest/lib/
-  - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
-  - --BUILD_NTOX="yes"
-  - --BUILD_TESTS="yes"
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
+
 <a name="osx" />
 ###OS X:
 
@@ -99,6 +104,13 @@ Advance configure options:
   - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
   - --BUILD_NTOX="yes"
   - --BUILD_TESTS="yes"
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
 
 <a name="non-homebrew" />
 ####Non-homebrew:
@@ -137,7 +149,13 @@ Advance configure options:
   - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
   - --BUILD_NTOX="yes"
   - --BUILD_TESTS="yes"
-
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
 
 Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory
 (or the wrong version gets installed) and make your life more annoying.
@@ -175,3 +193,14 @@ Advance configure options:
   - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
   - --BUILD_NTOX="yes"
   - --BUILD_TESTS="yes"
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
+
+<a name="Clients" />
+####Clients:
+While [Toxic](https://github.com/tox/toxic) is no longer in core, a list of Tox clients are located in our [wiki](http://wiki.tox.im/client)

Makefile.am

@@ -1,6 +1,7 @@
 SUBDIRS = build
 
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(top_builddir)/libtoxcore.pc

configure.ac

@@ -10,6 +10,17 @@ AM_INIT_AUTOMAKE([1.10 -Wall])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
 
+LIBTOXCORE_LT_VERSION=0:0:0
+dnl
+dnl            current:revision:age
+dnl
+dnl current:  increment if interfaces have been added, removed or changed
+dnl revision: increment if source code has changed, set to zero if current is
+dnl           incremented
+dnl age:      increment if interfaces have been added, set to zero if
+dnl           interfaces have been removed or changed
+EXTRA_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
+
 if test "x${prefix}" = "xNONE"; then
     prefix="${ac_default_prefix}"
 fi
@@ -96,6 +107,7 @@ AC_ARG_WITH(libsodium-libs,
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
 WIN32=no
@@ -105,13 +117,21 @@ case $host_os in
         WIN32="yes"
         AC_MSG_WARN([nTox is not supported on $host_os yet, disabling])
         BUILD_NTOX="no"
+        EXTRA_LT_LDFLAGS="$EXTRA_LT_LDFLAGS -no-undefined"
     ;;
     *solaris*)
         LIBS="$LIBS -lssp -lsocket -lnsl"
     ;;
+    *freebsd*)
+        LDFLAGS="$LDFLAGS -L/usr/local/lib"
+        CFLAGS="$CFLAGS -I/usr/local/include"
+        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+    ;;
 esac
 AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes")
 
+AC_SUBST(EXTRA_LT_LDFLAGS)
+
 # Checks for libraries.
 LIBSODIUM_LIBS=
 LIBSODIUM_LDFLAGS=
@@ -131,7 +151,7 @@ else
     AC_CHECK_LIB(sodium, randombytes_random,
         [],
         [
-            AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/]) 
+            AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/])
         ]
     )
 fi

toxcore/Makefile.inc

@@ -1,5 +1,3 @@
-LIBTOXCORE_VERSION = 0:0:0
-
 lib_LTLIBRARIES = libtoxcore.la
 
 libtoxcore_la_include_HEADERS = \
@@ -33,8 +31,8 @@ libtoxcore_la_CFLAGS =  -I$(top_srcdir) \
                         -I$(top_srcdir)/toxcore \
                         $(LIBSODIUM_CFLAGS)
 
-libtoxcore_la_LDFLAGS = -version-info $(LIBTOXCORE_VERSION) \
-                        $(LIBSODIUM_LDFLAGS)
-
-libtoxcore_la_LIBS =    $(LIBSODIUM_LIBS) \
+libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \
+                        $(LIBSODIUM_LDFLAGS) \
                         $(WINSOCK2_LIBS)
+
+libtoxcore_la_LIBS =    $(LIBSODIUM_LIBS)