diff --git a/Makefile.in b/Makefile.in index 98097a9..769ad91 100644 --- a/Makefile.in +++ b/Makefile.in @@ -218,6 +218,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BCTOOLBOX_CFLAGS = @BCTOOLBOX_CFLAGS@ +BCTOOLBOX_LIBS = @BCTOOLBOX_LIBS@ BCTOOLBOXTESTER_CFLAGS = @BCTOOLBOXTESTER_CFLAGS@ BCTOOLBOXTESTER_LIBS = @BCTOOLBOXTESTER_LIBS@ BELCARD_CFLAGS = @BELCARD_CFLAGS@ diff --git a/configure.ac b/configure.ac index dbf08f1..3ea83d5 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 4829483..c43570e 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/console/Makefile.in b/console/Makefile.in index 46c1fa8..06a5229 100644 --- a/console/Makefile.in +++ b/console/Makefile.in @@ -226,6 +226,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BCTOOLBOX_CFLAGS = @BCTOOLBOX_CFLAGS@ +BCTOOLBOX_LIBS = @BCTOOLBOX_LIBS@ BCTOOLBOXTESTER_CFLAGS = @BCTOOLBOXTESTER_CFLAGS@ BCTOOLBOXTESTER_LIBS = @BCTOOLBOXTESTER_LIBS@ BELCARD_CFLAGS = @BELCARD_CFLAGS@ diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3837ee1..6672779 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/daemon/Makefile.in b/daemon/Makefile.in index fb8b4c0..f343b2c 100644 --- a/daemon/Makefile.in +++ b/daemon/Makefile.in @@ -236,6 +236,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BCTOOLBOX_CFLAGS = @BCTOOLBOX_CFLAGS@ +BCTOOLBOX_LIBS = @BCTOOLBOX_LIBS@ BCTOOLBOXTESTER_CFLAGS = @BCTOOLBOXTESTER_CFLAGS@ BCTOOLBOXTESTER_LIBS = @BCTOOLBOXTESTER_LIBS@ BELCARD_CFLAGS = @BELCARD_CFLAGS@ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 8cfa499..55f2ba4 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,7 +105,8 @@ 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/gtk/Makefile.in b/gtk/Makefile.in index 960b4eb..a020bce 100644 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -279,6 +279,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BCTOOLBOX_CFLAGS = @BCTOOLBOX_CFLAGS@ +BCTOOLBOX_LIBS = @BCTOOLBOX_LIBS@ BCTOOLBOXTESTER_CFLAGS = @BCTOOLBOXTESTER_CFLAGS@ BCTOOLBOXTESTER_LIBS = @BCTOOLBOXTESTER_LIBS@ BELCARD_CFLAGS = @BELCARD_CFLAGS@ @@ -546,7 +548,7 @@ EXTRA_DIST = \ @BUILD_GTK_UI_TRUE@ $(LIBGTK_LIBS) $(NOTIFY1_LIBS) \ @BUILD_GTK_UI_TRUE@ $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) \ @BUILD_GTK_UI_TRUE@ $(INTLLIBS) $(SQLITE3_LIBS) \ address@hidden@ $(BELLESIP_LIBS) $(am__append_3) address@hidden@ $(BELLESIP_LIBS) $(BCTOOL_LIBS) $(am__append_3) @BUILD_GTK_UI_TRUE@@address@hidden = \ @BUILD_GTK_UI_TRUE@@BUILD_WIN32_FALSE@ -export-dynamic \ @BUILD_GTK_UI_TRUE@@BUILD_WIN32_FALSE@ $(am__append_5) @@ -560,7 +562,8 @@ 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) CLEANFILES = version_date.h linphone.res all: $(BUILT_SOURCES) diff --git a/tools/Makefile.am b/tools/Makefile.am index f59617a..2e747c7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -46,7 +46,8 @@ lp_autoanswer_SOURCES=auto_answer.c lp_autoanswer_CFLAGS=$(COMMON_CFLAGS) lp_autoanswer_LDADD=\ $(top_builddir)/coreapi/liblinphone.la \ - $(MEDIASTREAMER_LIBS) + $(MEDIASTREAMER_LIBS) \ + $(BCTOOLBOX_LIBS) lp_test_ecc_SOURCES=test_ecc.c lp_test_ecc_CFLAGS=$(COMMON_CFLAGS) diff --git a/tools/Makefile.in b/tools/Makefile.in index a2d4195..ef35480 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -281,6 +281,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BCTOOLBOX_CFLAGS = @BCTOOLBOX_CFLAGS@ +BCTOOLBOX_LIBS = @BCTOOLBOX_LIBS@ BCTOOLBOXTESTER_CFLAGS = @BCTOOLBOXTESTER_CFLAGS@ BCTOOLBOXTESTER_LIBS = @BCTOOLBOXTESTER_LIBS@ BELCARD_CFLAGS = @BELCARD_CFLAGS@