From 7f3e1aec521466fd2d3d635bcf7b91474b9e3e49 Mon Sep 17 00:00:00 2001
From: AZ Huang <aitjcize@gmail.com>
Date: Wed, 5 Mar 2014 18:51:22 +0800
Subject: [PATCH] Fix libtoxav link error.

---
 .travis.yml        |  2 +-
 configure.ac       |  4 ++--
 toxav/Makefile.inc | 29 +++++++++++++++--------------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 49be669f..b9dc8e87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ before_script:
   #installing vpx
   - git clone http://git.chromium.org/webm/libvpx.git > /dev/null
   - cd libvpx
-  - ./configure > /dev/null
+  - ./configure --enable-shared > /dev/null
   - make -j3 >/dev/null
   - sudo make install > /dev/null
   - cd ..
diff --git a/configure.ac b/configure.ac
index 3e733e03..6d856828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -487,9 +487,9 @@ 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"
+    AV_LIBS="$OPUS_LIBS $VPX_LIBS"
     AC_SUBST(AV_LIBS)
-    
+
     AV_CFLAGS="$OPUS_CFLAGS $VPX_CFLAGS"
     AC_SUBST(AV_CFLAGS)
 fi
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index b5953f8f..0cad1840 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -25,25 +25,26 @@ libtoxav_la_CFLAGS = -I../toxcore \
 libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
                       $(NACL_LDFLAGS) \
                       $(EXTRA_LT_LDFLAGS)
-                      
-libtoxav_la_LIBS =    $(NACL_LIBS) \
+
+libtoxav_la_LIBADD =  libtoxcore.la \
+                      $(NACL_LIBS) \
                       $(PTHREAD_LIBS) \
                       $(AV_LIBS)
 
-                        
+
 endif
-                        
-                        
-                        
-                        
-                        
-                        
+
+
+
+
+
+
 if BUILD_PHONE
 
-                          
+
 noinst_PROGRAMS += phone
 
-phone_SOURCES = ../toxav/phone.c 
+phone_SOURCES = ../toxav/phone.c
 
 phone_CFLAGS = -I../toxcore \
                -I../toxav \
@@ -68,6 +69,6 @@ phone_LDADD =   libtoxav.la \
                 $(VPX_LIBS)\
                 $(PTHREAD_LIBS)\
                 $(NACL_LIBS)
-                
-                
-endif
\ No newline at end of file
+
+
+endif