build: check for and use pjproject externally

Change-Id: I8abcb4a158b563541491115563f7859d2c83a63a
Refs: #46617

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.]])

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 \

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@ \