From dce0f4d495d4ab239d39eb42b5bd2b3ef609815e Mon Sep 17 00:00:00 2001
From: Sandrine Avakian <sandrine.avakian@belledonne-communications.com>
Date: Thu, 1 Sep 2016 17:23:07 +0200
Subject: [PATCH] Adding missing dependency checks for autotools  -S. Kondakov
 patch

---
 configure.ac        | 5 +++++
 console/Makefile.am | 6 ++++--
 daemon/Makefile.am  | 8 +++++---
 gtk/Makefile.am     | 7 ++++---
 tools/Makefile.am   | 3 ++-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 099cab73b..de4b77327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,6 +158,11 @@ AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext package name])
 dnl AC_CHECK_LIB(intl,libintl_gettext)
 
+PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox, [found_bctoolbox=yes],[found_bctoolbox=no])
+if test "x$found_bctoolbox" != "xyes" ; then
+	AC_MSG_ERROR(["Could not find bctoolbox (required dependency)"])
+fi
+
 AC_CHECK_FUNCS([get_current_dir_name strndup stpcpy] )
 
 AC_ARG_ENABLE(x11,
diff --git a/console/Makefile.am b/console/Makefile.am
index 482948329..c43570e6f 100644
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -15,7 +15,8 @@ COMMON_CFLAGS=\
 	$(VIDEO_CFLAGS) \
 	$(READLINE_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
-	$(LIBXML2_CFLAGS)
+	$(LIBXML2_CFLAGS) \
+	$(BCTOOLBOX_CFLAGS)
 
 if BUILD_CONSOLE
 
@@ -32,7 +33,8 @@ linphonec_LDADD=$(top_builddir)/coreapi/liblinphone.la \
 		$(SQLITE3_LIBS) \
 		$(X11_LIBS) \
 		$(BELLESIP_LIBS) \
-		$(LIBXML2_LIBS)
+		$(LIBXML2_LIBS) \
+		$(BCTOOLBOX_LIBS)
 
 if BUILD_WIN32
 #special build of linphonec to detach from the windows console
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 3837ee119..6672779ed 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -90,7 +90,8 @@ linphone_daemon_LDADD=$(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
 		$(MEDIASTREAMER_LIBS) \
 		$(ORTP_LIBS) \
 		$(SPEEX_LIBS) \
-		$(LIBXML2_LIBS)
+		$(LIBXML2_LIBS) \
+		$(BCTOOLBOX_LIBS)
 
 AM_CFLAGS=$(READLINE_CFLAGS) -DIN_LINPHONE $(STRICT_OPTIONS)
 AM_CXXFLAGS=$(READLINE_CXXFLAGS) -DIN_LINPHONE $(STRICT_OPTIONS)
@@ -101,6 +102,7 @@ INCLUDES = \
 	-I$(top_srcdir)/include \
 	$(ORTP_CFLAGS) \
 	$(MEDIASTREAMER_CFLAGS) \
-	$(BELLESIP_CFLAGS)\
-	$(LIBXML2_CFLAGS)
+	$(BELLESIP_CFLAGS) \
+	$(LIBXML2_CFLAGS) \
+	$(BCTOOLBOX_CFLAGS)
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8cfa49957..cbc6ede87 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -76,7 +76,7 @@ endif
 
 
 linphone_LDADD=	$(top_builddir)/coreapi/liblinphone.la \
-		$(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) $(SQLITE3_LIBS) $(BELLESIP_LIBS)
+		$(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) $(SQLITE3_LIBS) $(BELLESIP_LIBS) $(BCTOOLBOX_LIBS)
 
 
 if BUILD_WIN32
@@ -105,8 +105,9 @@ AM_CPPFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ -I$(top_builddir)/coreapi/ \
 		$(ORTP_CFLAGS) $(BELLESIP_CFLAGS) \
 		$(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
 		$(TUNNEL_CFLAGS) \
-		$(SQLITE3_CFLAGS)
-
+		$(SQLITE3_CFLAGS) \
+		$(BCTOOLBOX_CFLAGS)
+		
 version_date.h: $(top_srcdir)/configure.ac
 	echo "#define LINPHONE_VERSION_DATE \"$(VERSION)-`date +%y%m%d`\"" > $@
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f59617a43..9b9226483 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,7 +10,8 @@ COMMON_CFLAGS=\
 	$(MEDIASTREAMER_CFLAGS) \
 	$(STRICT_OPTIONS) \
 	$(STRICT_OPTIONS_CC) \
-	$(LIBXML2_CFLAGS)
+	$(MEDIASTREAMER_LIBS) \
+	$(BCTOOLBOX_LIBS)
 
 #-fpermissive to workaround a g++ bug on macos 32bit SDK.
 AM_CXXFLAGS=$(LIBXML2_CFLAGS) -fpermissive $(STRICT_OPTIONS) $(STRICT_OPTIONS_CXX)