Merge pull request #763 from mannol1/master

Pkg-config config for av

Makefile.am

@@ -3,8 +3,9 @@ SUBDIRS = build
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/libtoxcore.pc
 
+
+pkgconfig_DATA = $(top_builddir)/libtoxcore.pc
 BUILT_SOURCES = $(top_builddir)/libtoxcore.pc
 CLEANFILES = $(top_builddir)/libtoxcore.pc
 
@@ -16,5 +17,14 @@ EXTRA_DIST = \
 	$(top_srcdir)/docs/updates/Symmetric-NAT-Transversal.md \
 	$(top_srcdir)/tools/README \
 	$(top_srcdir)/tools/astylerc \
-	$(top_srcdir)/tools/pre-commit
+	$(top_srcdir)/tools/pre-commit 
+	
+if BUILD_AV
 
+pkgconfig_DATA += $(top_builddir)/libtoxav.pc
+BUILT_SOURCES += $(top_builddir)/libtoxav.pc
+CLEANFILES += $(top_builddir)/libtoxav.pc
+
+EXTRA_DIST += libtoxav.pc.in
+
+endif

configure.ac

@@ -470,6 +470,16 @@ if test "x$BUILD_AV" = "xyes"; then
     )
 fi
 
+if test "x$BUILD_AV" = "xyes"; then
+    # toxcore lib needs an global?
+    # So far this works okay
+    AV_LIBS="$OPUS_LIBS $VPX_LIBS -ltoxcore"
+    AC_SUBST(AV_LIBS)
+    
+    AV_CFLAGS="$OPUS_CFLAGS $VPX_CFLAGS"
+    AC_SUBST(AV_CFLAGS)
+fi
+
 if test -n "$PKG_CONFIG"; then
     if test "x$BUILD_TESTS" = "xyes"; then
         PKG_CHECK_MODULES([CHECK], [check],
@@ -636,4 +646,10 @@ AC_CONFIG_FILES([Makefile
                  build/Makefile
                  libtoxcore.pc
                 ])
+                    
+AM_COND_IF(BUILD_AV,
+  [
+    AC_CONFIG_FILES([libtoxav.pc])
+  ],)
+
 AC_OUTPUT

libtoxav.pc.in

@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libtoxav
+Description: Tox A/V library
+Requires:
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -ltoxav @AV_LIBS@
+Cflags: -I${includedir}

libtoxcore.pc.in

@@ -8,5 +8,4 @@ Description: Tox protocol library
 Requires:
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ltoxcore @LIBS@
-Cflags: -I${includedir}
+Cflags: -I${includedir}
-

toxav/Makefile.inc

@@ -19,8 +19,7 @@ libtoxav_la_SOURCES = ../toxav/event.h \
 libtoxav_la_CFLAGS = -I../toxcore \
                      -I../toxav \
                      $(NACL_CFLAGS) \
-                     $(OPUS_CFLAGS) \
+                     $(AV_CFLAGS) \
-                     $(VPX_CFLAGS) \
                      $(PTHREAD_CFLAGS)
 
 libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
@@ -28,9 +27,8 @@ libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
                       $(EXTRA_LT_LDFLAGS)
                       
 libtoxav_la_LIBS =    $(NACL_LIBS) \
-                      $(OPUS_LIBS) \
+                      $(PTHREAD_LIBS) \
-                      $(VPX_LIBS) \
+                      $(AV_LIBS)
-                      $(PTHREAD_LIBS)
 
                         
 endif

toxav/event.c

@@ -29,9 +29,6 @@
 #include <stdlib.h>
 #include "event.h"
 
-#include "../toxcore/util.h"
-#include "../toxcore/network.h"
-
 #define _GNU_SOURCE
 
 #include <assert.h>

toxav/msi.c

@@ -30,9 +30,6 @@
 
 #include "msi.h"
 #include "event.h"
-#include "../toxcore/util.h"
-#include "../toxcore/network.h"
-#include "../toxcore/Messenger.h"
 
 #include <assert.h>
 #include <unistd.h>