From 4470663d1f9e48a42c30479cd15d83cdc7dbde16 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sun, 4 Dec 2016 21:07:43 +0100
Subject: [PATCH] add bctoolbox dependency everywhere needed in Makefiles and
 .pc file.

---
 coreapi/Makefile.am  | 6 ++++--
 share/linphone.pc.in | 2 +-
 tools/Makefile.am    | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index c960d84d1..3a7b6e835 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -136,7 +136,8 @@ liblinphone_la_LIBADD= \
 		$(LDAP_LIBS) \
 		$(SASL_LIBS) \
 		$(BELCARD_LIBS) \
-		$(ZLIB_LIBS)
+		$(ZLIB_LIBS) \
+		$(BCTOOLBOX_LIBS)
 
 
 AM_CPPFLAGS=\
@@ -159,7 +160,8 @@ COMMON_CFLAGS=\
 	$(LDAP_CFLAGS) \
 	$(SASL_CFLAGS) \
 	$(BELCARD_CFLAGS) \
-	$(ZLIB_CFLAGS)
+	$(ZLIB_CFLAGS) \
+	$(BCTOOLBOX_CFLAGS)
 
 if BUILD_WIZARD
 COMMON_CFLAGS+= -DBUILD_WIZARD
diff --git a/share/linphone.pc.in b/share/linphone.pc.in
index f44eb2322..87beb0b0b 100644
--- a/share/linphone.pc.in
+++ b/share/linphone.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Requires: mediastreamer ortp
+Requires: mediastreamer ortp bctoolbox
 Name: liblinphone
 Description: All in one linphone libs.
 Version: @VERSION@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1e2f13835..afcc52cdb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,8 +10,8 @@ COMMON_CFLAGS=\
 	$(MEDIASTREAMER_CFLAGS) \
 	$(STRICT_OPTIONS) \
 	$(STRICT_OPTIONS_CC) \
-	$(MEDIASTREAMER_LIBS) \
-	$(BCTOOLBOX_LIBS)
+	$(MEDIASTREAMER_CFLAGS) \
+	$(BCTOOLBOX_CFLAGS)
 
 #-fpermissive to workaround a g++ bug on macos 32bit SDK.
 AM_CXXFLAGS=$(LIBXML2_CFLAGS) -fpermissive $(STRICT_OPTIONS) $(STRICT_OPTIONS_CXX)