--- sflphone-1.4.1/daemon/globals.mak.orig 2014-09-26 14:58:54.142067552 -0400 +++ sflphone-1.4.1/daemon/globals.mak 2014-09-26 15:01:02.994656481 -0400 @@ -7,18 +7,11 @@ 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 +PJSIP_LIBS=$(shell pkg-config --libs libpjproject) + +SIP_CFLAGS=$(shell pkg-config --cflags libpjproject) + if BUILD_SPEEX SPEEXCODEC=-DHAVE_SPEEX_CODEC @@ -36,7 +29,6 @@ AM_CPPFLAGS = \ -I$(src)/libs \ -I$(src)/libs/iax2 \ - -I$(src)/libs/$(PJPROJECT_DIR) \ -I$(src)/src \ -I$(src)/src/config \ -I$(src)/test \