From 8a87d81d64c5e3d4073be362e5b6ad5756ab541c Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Fri, 6 Jun 2014 12:59:02 -0400
Subject: [PATCH] build: check for and use pjproject externally
Change-Id: I8abcb4a158b563541491115563f7859d2c83a63a
Refs: #46617
---
daemon/configure.ac | 7 ++++---
daemon/globals.mak | 13 -------------
daemon/src/Makefile.am | 4 ++--
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 30d4abd004..f9421e4911 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -133,6 +133,10 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
])
AC_SUBST(CONTRIB_DIR)
+
+dnl Check for pjproject
+PKG_CHECK_MODULES(PJPROJECT, libpjproject,, AC_MSG_ERROR([Missing pjproject files]))
+
dnl Check for uuid development package - name: uuid-dev
UUID_MIN_VERSION=1.0
PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false);
@@ -500,6 +504,3 @@ AC_CONFIG_FILES([Makefile \
# Go!
AC_OUTPUT
-
-AC_CONFIG_SUBDIRS([libs/pjproject-2.2.1])
-AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-2.2.1) has already been compiled. Run `make' to build the software.]])
diff --git a/daemon/globals.mak b/daemon/globals.mak
index 10c0d7234c..5991a67368 100644
--- a/daemon/globals.mak
+++ b/daemon/globals.mak
@@ -7,18 +7,6 @@ sflplugindir=$(sfllibdir)/plugins
ASTYLERC="$(top_srcdir)/../astylerc"
indent="/usr/bin/astyle"
-PJPROJECT_DIR=pjproject-2.2.1
-
-# for pjsip
-include $(src)/libs/$(PJPROJECT_DIR)/build.mak
-PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS)
-
-SIP_CFLAGS=-I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
- -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
- -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
- -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
- -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
- -DPJ_AUTOCONF=1
if BUILD_SPEEX
SPEEXCODEC=-DHAVE_SPEEX_CODEC
@@ -36,7 +24,6 @@ endif
AM_CPPFLAGS = \
-I$(src)/libs \
-I$(src)/libs/iax2 \
- -I$(src)/libs/$(PJPROJECT_DIR) \
-I$(src)/src \
-I$(src)/src/config \
-I$(src)/test \
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index 3351e8d482..058287f2ad 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -54,7 +54,7 @@ libsflphone_la_LIBADD = \
libsflphone_la_LDFLAGS = \
@ZRTPCPP_LIBS@ \
- $(PJSIP_LIBS) \
+ @PJPROJECT_LIBS@ \
@CCRTP_LIBS@ \
@ALSA_LIBS@ \
@PULSEAUDIO_LIBS@ \
@@ -65,7 +65,7 @@ libsflphone_la_LDFLAGS = \
libsflphone_la_CFLAGS = \
@ZRTPCPP_CFLAGS@ \
- $(PJSIP_CFLAGS) \
+ @PJPROJECT_CFLAGS@ \
@CCRTP_CFLAGS@ \
@ALSA_CFLAGS@ \
@PULSEAUDIO_CFLAGS@ \
--
GitLab