Commit 2f4cdd3a authored by Vittorio Giovara's avatar Vittorio Giovara Committed by Tristan Matthews

build: check for and use iax2 externally

Update the headers include path accordingly.

Change-Id: I018aefc237a00f468fa3ec642f251a84826054ac
Refs: #46617
parent 8a87d81d
......@@ -19,7 +19,7 @@ unittest:
endif
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones man $(TESTS_DIR) doc
SUBDIRS = src ringtones man $(TESTS_DIR) doc
EXTRA_DIST = m4/libtool.m4 \
m4/lt~obsolete.m4 \
......
......@@ -476,8 +476,6 @@ AS_IF([test "x$enable_debug" = "xyes"],
dnl What Makefiles to generate
AC_CONFIG_FILES([Makefile \
libs/Makefile \
libs/iax2/Makefile \
src/Makefile \
src/sip/Makefile \
src/im/Makefile \
......
......@@ -22,8 +22,6 @@ endif
# Preprocessor flags
AM_CPPFLAGS = \
-I$(src)/libs \
-I$(src)/libs/iax2 \
-I$(src)/src \
-I$(src)/src/config \
-I$(src)/test \
......
......@@ -18,7 +18,7 @@ endif
if USE_IAX
IAX_SUBDIR=iax
IAX_CXXFLAG=-DUSE_IAX
IAX_LIB=./iax/libiaxlink.la $(top_builddir)/libs/iax2/libiax2.la
IAX_LIB=./iax/libiaxlink.la -liax
endif
if USE_NETWORKMANAGER
......@@ -40,11 +40,10 @@ sflphoned_CXXFLAGS = \
# libsflphone
sflphoned_LDADD = ./libsflphone.la $(YAML_LIBS)
sflphoned_LDADD = ./libsflphone.la $(YAML_LIBS) $(IAX_LIB)
noinst_LTLIBRARIES = libsflphone.la
libsflphone_la_LIBADD = \
$(IAX_LIB) \
./sip/libsiplink.la \
./audio/libaudio.la \
./client/libclient.la \
......
......@@ -32,8 +32,8 @@
#include <cstring>
#include <sys/socket.h>
#include <iax-client.h>
#include <frame.h>
#include <iax/iax-client.h>
#include <iax/frame.h>
#include "iaxcall.h"
#include "logger.h"
......
......@@ -42,7 +42,7 @@
#include "sfl_types.h"
#include "audio/resampler.h"
#include <iax-client.h>
#include <iax/iax-client.h>
#include <mutex>
#include <memory>
......
......@@ -48,7 +48,7 @@
#include "config.h"
#if HAVE_IAX
#include <iax-client.h>
#include <iax/iax-client.h>
#endif
#define EMPTY_MESSAGE pj_str((char*)"")
......
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