diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-02-23 23:13:38 +0100 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-02-23 23:13:38 +0100 |
commit | 4888d916d037e371c88d39951f24f6ef4219c7cc (patch) | |
tree | 7d7b19e050ab0df0f09ba1d3f5ec54ebb97a1472 | |
parent | bc61d969e0f4c1d0652b1141b1cc8e51df970bd5 (diff) |
pkg-config and av
-rw-r--r-- | Makefile.am | 14 | ||||
-rw-r--r-- | build/Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 37 | ||||
-rw-r--r-- | docs/TCP_Network.txt | 4 | ||||
-rw-r--r-- | docs/TODO | 2 | ||||
-rw-r--r-- | docs/updates/DHT.md | 2 | ||||
-rw-r--r-- | libtoxav.pc.in | 11 | ||||
-rw-r--r-- | libtoxcore.pc.in | 3 | ||||
-rw-r--r-- | toxav/Makefile.inc | 8 | ||||
-rw-r--r-- | toxav/event.c | 3 | ||||
-rw-r--r-- | toxav/msi.c | 3 |
11 files changed, 65 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index 9c44ea96..b58e7bae 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -3,8 +3,9 @@ SUBDIRS = build | |||
3 | ACLOCAL_AMFLAGS = -I m4 | 3 | ACLOCAL_AMFLAGS = -I m4 |
4 | 4 | ||
5 | pkgconfigdir = $(libdir)/pkgconfig | 5 | pkgconfigdir = $(libdir)/pkgconfig |
6 | pkgconfig_DATA = $(top_builddir)/libtoxcore.pc | ||
7 | 6 | ||
7 | |||
8 | pkgconfig_DATA = $(top_builddir)/libtoxcore.pc | ||
8 | BUILT_SOURCES = $(top_builddir)/libtoxcore.pc | 9 | BUILT_SOURCES = $(top_builddir)/libtoxcore.pc |
9 | CLEANFILES = $(top_builddir)/libtoxcore.pc | 10 | CLEANFILES = $(top_builddir)/libtoxcore.pc |
10 | 11 | ||
@@ -16,5 +17,14 @@ EXTRA_DIST = \ | |||
16 | $(top_srcdir)/docs/updates/Symmetric-NAT-Transversal.md \ | 17 | $(top_srcdir)/docs/updates/Symmetric-NAT-Transversal.md \ |
17 | $(top_srcdir)/tools/README \ | 18 | $(top_srcdir)/tools/README \ |
18 | $(top_srcdir)/tools/astylerc \ | 19 | $(top_srcdir)/tools/astylerc \ |
19 | $(top_srcdir)/tools/pre-commit | 20 | $(top_srcdir)/tools/pre-commit |
21 | |||
22 | if BUILD_AV | ||
23 | |||
24 | pkgconfig_DATA += $(top_builddir)/libtoxav.pc | ||
25 | BUILT_SOURCES += $(top_builddir)/libtoxav.pc | ||
26 | CLEANFILES += $(top_builddir)/libtoxav.pc | ||
27 | |||
28 | EXTRA_DIST += libtoxav.pc.in | ||
20 | 29 | ||
30 | endif \ No newline at end of file | ||
diff --git a/build/Makefile.am b/build/Makefile.am index 5514a4d5..aa004388 100644 --- a/build/Makefile.am +++ b/build/Makefile.am | |||
@@ -8,5 +8,5 @@ include ../toxcore/Makefile.inc | |||
8 | include ../toxav/Makefile.inc | 8 | include ../toxav/Makefile.inc |
9 | include ../other/Makefile.inc | 9 | include ../other/Makefile.inc |
10 | include ../testing/Makefile.inc | 10 | include ../testing/Makefile.inc |
11 | include ../other/bootstrap_serverdaemon/Makefile.inc | 11 | include ../other/bootstrap_daemon/Makefile.inc |
12 | include ../auto_tests/Makefile.inc | 12 | include ../auto_tests/Makefile.inc |
diff --git a/configure.ac b/configure.ac index 066c919a..c2ffa3f3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -22,11 +22,6 @@ dnl revision: increment if source code has changed, set to zero if current is | |||
22 | dnl incremented | 22 | dnl incremented |
23 | dnl age: increment if interfaces have been added, set to zero if | 23 | dnl age: increment if interfaces have been added, set to zero if |
24 | dnl interfaces have been removed or changed | 24 | dnl interfaces have been removed or changed |
25 | TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" | ||
26 | TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION" | ||
27 | |||
28 | AC_SUBST(TOXCORE_LT_LDFLAGS) | ||
29 | AC_SUBST(TOXAV_LT_LDFLAGS) | ||
30 | 25 | ||
31 | if test "x${prefix}" = "xNONE"; then | 26 | if test "x${prefix}" = "xNONE"; then |
32 | prefix="${ac_default_prefix}" | 27 | prefix="${ac_default_prefix}" |
@@ -44,6 +39,22 @@ LIBCONFIG_FOUND="no" | |||
44 | LIBCHECK_FOUND="no" | 39 | LIBCHECK_FOUND="no" |
45 | WANT_NACL="no" | 40 | WANT_NACL="no" |
46 | 41 | ||
42 | TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" | ||
43 | TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION" | ||
44 | |||
45 | AC_ARG_ENABLE([soname-versions], | ||
46 | [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ], | ||
47 | [ | ||
48 | if test "x$enableval" = "xno"; then | ||
49 | TOXCORE_LT_LDFLAGS="-avoid-version" | ||
50 | TOXAV_LT_LDFLAGS="-avoid-version" | ||
51 | fi | ||
52 | ] | ||
53 | ) | ||
54 | |||
55 | AC_SUBST(TOXCORE_LT_LDFLAGS) | ||
56 | AC_SUBST(TOXAV_LT_LDFLAGS) | ||
57 | |||
47 | AC_ARG_ENABLE([nacl], | 58 | AC_ARG_ENABLE([nacl], |
48 | [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ], | 59 | [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ], |
49 | [ | 60 | [ |
@@ -459,6 +470,16 @@ if test "x$BUILD_AV" = "xyes"; then | |||
459 | ) | 470 | ) |
460 | fi | 471 | fi |
461 | 472 | ||
473 | if test "x$BUILD_AV" = "xyes"; then | ||
474 | # toxcore lib needs an global? | ||
475 | # So far this works okay | ||
476 | AV_LIBS="$OPUS_LIBS $VPX_LIBS -ltoxcore" | ||
477 | AC_SUBST(AV_LIBS) | ||
478 | |||
479 | AV_CFLAGS="$OPUS_CFLAGS $VPX_CFLAGS" | ||
480 | AC_SUBST(AV_CFLAGS) | ||
481 | fi | ||
482 | |||
462 | if test -n "$PKG_CONFIG"; then | 483 | if test -n "$PKG_CONFIG"; then |
463 | if test "x$BUILD_TESTS" = "xyes"; then | 484 | if test "x$BUILD_TESTS" = "xyes"; then |
464 | PKG_CHECK_MODULES([CHECK], [check], | 485 | PKG_CHECK_MODULES([CHECK], [check], |
@@ -625,4 +646,10 @@ AC_CONFIG_FILES([Makefile | |||
625 | build/Makefile | 646 | build/Makefile |
626 | libtoxcore.pc | 647 | libtoxcore.pc |
627 | ]) | 648 | ]) |
649 | |||
650 | AM_COND_IF(BUILD_AV, | ||
651 | [ | ||
652 | AC_CONFIG_FILES([libtoxav.pc]) | ||
653 | ],) | ||
654 | |||
628 | AC_OUTPUT | 655 | AC_OUTPUT |
diff --git a/docs/TCP_Network.txt b/docs/TCP_Network.txt index f44cca71..e8608791 100644 --- a/docs/TCP_Network.txt +++ b/docs/TCP_Network.txt | |||
@@ -12,9 +12,9 @@ can use Tox regardless of the quality of their internet connection. | |||
12 | 12 | ||
13 | How it's probably going to work: | 13 | How it's probably going to work: |
14 | 1. Alice, a Tox client on a TCP only network generates a temporary public key | 14 | 1. Alice, a Tox client on a TCP only network generates a temporary public key |
15 | and connects to a bootstrap server. | 15 | and connects to a bootstrap node. |
16 | 16 | ||
17 | 2. Using the bootstrap server she find and connects to a couple (exact number | 17 | 2. Using the bootstrap node she find and connects to a couple (exact number |
18 | to be determined later) number of random nodes that have TCP relay support. | 18 | to be determined later) number of random nodes that have TCP relay support. |
19 | 19 | ||
20 | 3. She uses the onion through the TCP relay connections to send friend requests | 20 | 3. She uses the onion through the TCP relay connections to send friend requests |
@@ -39,6 +39,8 @@ Friend_requests.c: | |||
39 | [NOT STARTED] Group chats (They work with IPv6 but some things need to be tested.) | 39 | [NOT STARTED] Group chats (They work with IPv6 but some things need to be tested.) |
40 | 40 | ||
41 | 41 | ||
42 | [NOT STARTED] Make the core save/datafile portable across client versions/different processor architectures. | ||
43 | |||
42 | [NOT STARTED] A way for people to connect to people on Tox if they are behind a bad NAT that | 44 | [NOT STARTED] A way for people to connect to people on Tox if they are behind a bad NAT that |
43 | blocks UDP (or is just unpunchable) (docs/TCP_Network.txt) | 45 | blocks UDP (or is just unpunchable) (docs/TCP_Network.txt) |
44 | 46 | ||
diff --git a/docs/updates/DHT.md b/docs/updates/DHT.md index 79ec8c4b..db825a3c 100644 --- a/docs/updates/DHT.md +++ b/docs/updates/DHT.md | |||
@@ -7,7 +7,7 @@ But: | |||
7 | Vastly simplified packet format and encryption. | 7 | Vastly simplified packet format and encryption. |
8 | 8 | ||
9 | Boostrapping: | 9 | Boostrapping: |
10 | The first time you install the client we bootstrap it with a node on our servers.(bandwidth should not be a problem as the client only needs to be sent one reply.) | 10 | The first time you install the client we bootstrap it with a node. (bandwidth should not be a problem as the client only needs to be sent one reply.) |
11 | 11 | ||
12 | 12 | ||
13 | Basics | 13 | Basics |
diff --git a/libtoxav.pc.in b/libtoxav.pc.in new file mode 100644 index 00000000..05493231 --- /dev/null +++ b/libtoxav.pc.in | |||
@@ -0,0 +1,11 @@ | |||
1 | prefix=@prefix@ | ||
2 | exec_prefix=@exec_prefix@ | ||
3 | libdir=@libdir@ | ||
4 | includedir=@includedir@ | ||
5 | |||
6 | Name: libtoxav | ||
7 | Description: Tox A/V library | ||
8 | Requires: | ||
9 | Version: @PACKAGE_VERSION@ | ||
10 | Libs: -L${libdir} -ltoxav @AV_LIBS@ | ||
11 | Cflags: -I${includedir} \ No newline at end of file | ||
diff --git a/libtoxcore.pc.in b/libtoxcore.pc.in index c76200c6..90402d4d 100644 --- a/libtoxcore.pc.in +++ b/libtoxcore.pc.in | |||
@@ -8,5 +8,4 @@ Description: Tox protocol library | |||
8 | Requires: | 8 | Requires: |
9 | Version: @PACKAGE_VERSION@ | 9 | Version: @PACKAGE_VERSION@ |
10 | Libs: -L${libdir} -ltoxcore @LIBS@ | 10 | Libs: -L${libdir} -ltoxcore @LIBS@ |
11 | Cflags: -I${includedir} | 11 | Cflags: -I${includedir} \ No newline at end of file |
12 | |||
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc index 30879f65..b5953f8f 100644 --- a/toxav/Makefile.inc +++ b/toxav/Makefile.inc | |||
@@ -19,8 +19,7 @@ libtoxav_la_SOURCES = ../toxav/event.h \ | |||
19 | libtoxav_la_CFLAGS = -I../toxcore \ | 19 | libtoxav_la_CFLAGS = -I../toxcore \ |
20 | -I../toxav \ | 20 | -I../toxav \ |
21 | $(NACL_CFLAGS) \ | 21 | $(NACL_CFLAGS) \ |
22 | $(OPUS_CFLAGS) \ | 22 | $(AV_CFLAGS) \ |
23 | $(VPX_CFLAGS) \ | ||
24 | $(PTHREAD_CFLAGS) | 23 | $(PTHREAD_CFLAGS) |
25 | 24 | ||
26 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ | 25 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ |
@@ -28,9 +27,8 @@ libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ | |||
28 | $(EXTRA_LT_LDFLAGS) | 27 | $(EXTRA_LT_LDFLAGS) |
29 | 28 | ||
30 | libtoxav_la_LIBS = $(NACL_LIBS) \ | 29 | libtoxav_la_LIBS = $(NACL_LIBS) \ |
31 | $(OPUS_LIBS) \ | 30 | $(PTHREAD_LIBS) \ |
32 | $(VPX_LIBS) \ | 31 | $(AV_LIBS) |
33 | $(PTHREAD_LIBS) | ||
34 | 32 | ||
35 | 33 | ||
36 | endif | 34 | endif |
diff --git a/toxav/event.c b/toxav/event.c index f79fd60e..ffda35ec 100644 --- a/toxav/event.c +++ b/toxav/event.c | |||
@@ -29,9 +29,6 @@ | |||
29 | #include <stdlib.h> | 29 | #include <stdlib.h> |
30 | #include "event.h" | 30 | #include "event.h" |
31 | 31 | ||
32 | #include "../toxcore/util.h" | ||
33 | #include "../toxcore/network.h" | ||
34 | |||
35 | #define _GNU_SOURCE | 32 | #define _GNU_SOURCE |
36 | 33 | ||
37 | #include <assert.h> | 34 | #include <assert.h> |
diff --git a/toxav/msi.c b/toxav/msi.c index fda0dd3e..e5e1e1c5 100644 --- a/toxav/msi.c +++ b/toxav/msi.c | |||
@@ -30,9 +30,6 @@ | |||
30 | 30 | ||
31 | #include "msi.h" | 31 | #include "msi.h" |
32 | #include "event.h" | 32 | #include "event.h" |
33 | #include "../toxcore/util.h" | ||
34 | #include "../toxcore/network.h" | ||
35 | #include "../toxcore/Messenger.h" | ||
36 | 33 | ||
37 | #include <assert.h> | 34 | #include <assert.h> |
38 | #include <unistd.h> | 35 | #include <unistd.h> |