Commit dce0f4d4 authored by Sandrine Avakian's avatar Sandrine Avakian

Adding missing dependency checks for autotools -S. Kondakov patch

parent 08c2419a
......@@ -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,
......
......@@ -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
......
......@@ -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)
......@@ -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`\"" > $@
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment