From 2f4cdd3a3a330daa7a9221cf6e766c2f79016a70 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Fri, 6 Jun 2014 13:07:08 -0400
Subject: [PATCH] build: check for and use iax2 externally
Update the headers include path accordingly.
Change-Id: I018aefc237a00f468fa3ec642f251a84826054ac
Refs: #46617
---
daemon/Makefile.am | 2 +-
daemon/configure.ac | 2 --
daemon/globals.mak | 2 --
daemon/src/Makefile.am | 5 ++---
daemon/src/iax/iaxcall.cpp | 4 ++--
daemon/src/iax/iaxvoiplink.h | 2 +-
daemon/src/im/instant_messaging.h | 2 +-
7 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a0b9ec0967..6584a5c0f2 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -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 \
diff --git a/daemon/configure.ac b/daemon/configure.ac
index f9421e4911..b8c234242e 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -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 \
diff --git a/daemon/globals.mak b/daemon/globals.mak
index 5991a67368..f9eaaf7c57 100644
--- a/daemon/globals.mak
+++ b/daemon/globals.mak
@@ -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 \
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index 058287f2ad..0522bbb09c 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -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 \
diff --git a/daemon/src/iax/iaxcall.cpp b/daemon/src/iax/iaxcall.cpp
index 0502d98f48..6bf6a8534c 100644
--- a/daemon/src/iax/iaxcall.cpp
+++ b/daemon/src/iax/iaxcall.cpp
@@ -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"
diff --git a/daemon/src/iax/iaxvoiplink.h b/daemon/src/iax/iaxvoiplink.h
index 90ae42758b..5f946ae2be 100644
--- a/daemon/src/iax/iaxvoiplink.h
+++ b/daemon/src/iax/iaxvoiplink.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>
diff --git a/daemon/src/im/instant_messaging.h b/daemon/src/im/instant_messaging.h
index 073e494e1b..35000b85b8 100644
--- a/daemon/src/im/instant_messaging.h
+++ b/daemon/src/im/instant_messaging.h
@@ -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*)"")
--
GitLab