integrate pjsip in the build system

configure.ac

@@ -133,6 +133,12 @@ SFLPHONE_LIBS="$SFLPHONE_LIBS $EXOSIP_LIBS"
 dnl Check for GNU ccRTP
 PKG_PROG_PKG_CONFIG
 
+#Trying to set PJSIP using pkg-config
+PKG_CHECK_MODULES(PJSIP, libpj, have_libpj=true, have_libpj=false)
+if test "x${have_libpj}" = "xfalse" ; then
+    AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
+fi
+
 LIBOSIP2_OSIPLISTNOPOINTER_MIN_VERSION=3.0.0
 PKG_CHECK_MODULES([libosip2], [libosip2 >= ${LIBOSIP2_OSIPLISTNOPOINTER_MIN_VERSION}],
 	[LIBOSIP2_CFLAGS=""], [LIBOSIP2_CFLAGS="-DLIBOSIP2_WITHPOINTER"])

src/Makefile.am

@@ -31,18 +31,30 @@ endif
 ALSAFLAG= -lasound
 PULSEAUDIO_LIBS=-lpulse
 
+PJSIP_LIBS = -L/usr/local/lib -lpjnath -lpjsua -lpjsip -lpjmedia -lpjsip-simple -lpjsip-ua -lpjmedia-codec -lpjlib-util -lpj 
+
 SUBDIRS = audio config dbus $(ZEROCONFDIR) #contact memmanager video mixer
 
-sflphoned_SOURCES = eventthread.cpp 	main.cpp 	voiplink.cpp \
-		managerimpl.cpp	observer.cpp  samplerateconverter.cpp \
-		account.cpp sipaccount.cpp accountcreator.cpp \
-                sipvoiplink.cpp call.cpp sipcall.cpp \
-		$(IAXSOURCES)
+sflphoned_SOURCES = \
+	eventthread.cpp \
+	main.cpp \
+	voiplink.cpp \
+	managerimpl.cpp	\
+	observer.cpp \
+	samplerateconverter.cpp \
+	account.cpp \
+	sipaccount.cpp \
+	accountcreator.cpp \
+	sipvoiplink.cpp \
+	call.cpp \
+	sipcall.cpp \
+	$(IAXSOURCES) \
+	sipmanager.cpp
 
 sflphoned_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(ZEROCONFFLAGS) $(IAX_FLAGS) $(SFLPHONE_CFLAGS) $(SIP_CFLAGS)
 
 #sflphoned_LDFLAGS = -static
-sflphoned_LDADD =  ./libsflphone.la $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) $(IAX_LIBS) $(EXOSIP_LIBS) $(ALSAFLAG) $(PULSEAUDIO_LIBS)
+sflphoned_LDADD =  ./libsflphone.la $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) $(IAX_LIBS) $(EXOSIP_LIBS) $(ALSAFLAG) $(PULSEAUDIO_LIBS) $(PJSIP_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(IAX_CFLAGS) $(USER_INCLUDES) $(libdbuscpp_CFLAGS) \
 	      -DCODECS_DIR=\""$(sflcodecdir)"\" 
 	      -DENABLE_TRACE
@@ -55,18 +67,27 @@ libsflphone_la_LIBADD = \
 	./audio/libaudio.la \
 	./dbus/libdbus.la \
 	./config/libconfig.la \
-	$(IAX_LIBS) 
+	$(IAX_LIBS)  \
+	$(PJSIP_LIBS)
 
 libsflphone_la_SOURCES =
 
-noinst_LTLIBRARIES = libsflphone.la
-noinst_HEADERS = managerimpl.h manager.h global.h observer.h eventthread.h user_cfg.h \
-                 voiplink.h  samplerateconverter.h \
-		 account.h sipaccount.h accountcreator.h \
-                 sipvoiplink.h  call.h  sipcall.h \
-		 $(IAXHEADERS)
+noinst_LTLIBRARIES = 	libsflphone.la
+noinst_HEADERS = \
+	managerimpl.h \
+	manager.h \
+	global.h \
+	observer.h \
+	eventthread.h \
+	user_cfg.h \
+        voiplink.h \ 
+	samplerateconverter.h \
+	account.h \
+	sipaccount.h \
+	accountcreator.h \
+        sipvoiplink.h \
+	call.h \
+	sipcall.h \
+ 	$(IAXHEADERS) \
+	sipmanager.h
 
-#./contact/libcontact.la \
-#	./memmanager/libmemmanager.la \
-#	./mixer/libmixer.la \
-#	./video/libvideo.la 

src/sipmanager.h

@@ -24,7 +24,8 @@
 #include <pjsip.h>
 #include <pjlib-util.h>
 #include <pjlib.h>
-#include <pjnath/stun_config.h>
+//#include <pjnath/stun_config.h>
+#include <pjnath.h>
 #include <pjsip_simple.h>
 #include <pjsip_ua.h>
 #include <pjmedia/sdp.h>