Merge branch 'master' into pierre-luc

INSTALL

@@ -4,7 +4,8 @@ INSTALLATION GUIDE
     # Go to the root of the application core directory
     cd sflphone-common
     # Compile pjsip
-    cd libs/pjproject-1.0.1
+    cd libs/pjproject-1.4
+	./autogen.sh
     ./configure
     make dep && make
     sudo make install

sflphone-common/libs/pjproject-1.4/build.mak.in

@@ -59,7 +59,7 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
 	-L$(PJDIR)/pjsip/lib\
 	-L$(PJDIR)/third_party/lib\
 	@LDFLAGS@
-export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\
+export APP_LDLIBS := -lpjsua-sfl-$(TARGET_NAME)\
 	-lpjsip-ua-sfl-$(TARGET_NAME)\
 	-lpjsip-simple-sfl-$(TARGET_NAME)\
 	-lpjsip-sfl-$(TARGET_NAME)\