Merge branch 'master' into f21

sflphone_unbundle.patch

@@ -1,16 +1,7 @@
 diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configure.ac
 --- sflphone-1.4.1/daemon/configure.ac	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/configure.ac	2014-12-13 23:38:33.295585251 +0100
-@@ -431,8 +431,6 @@ AS_IF([test "x$enable_debug" = "xyes"],
- dnl What Makefiles to generate
- 
- AC_CONFIG_FILES([Makefile \
--                 libs/Makefile \
--                 libs/iax2/Makefile \
-                  src/Makefile \
-                  src/sip/Makefile \
-                  src/im/Makefile \
-@@ -460,5 +458,4 @@ AC_CONFIG_FILES([Makefile \
++++ sflphone-1.4.1-new/daemon/configure.ac	2015-01-26 11:42:21.536182403 +0100
+@@ -460,5 +460,4 @@ AC_CONFIG_FILES([Makefile \
  # Go!
  AC_OUTPUT
  
@@ -19,7 +10,7 @@ diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configur
 +AC_MSG_NOTICE([[Configuration done! Run `make' to build the software.]])
 diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.mak
 --- sflphone-1.4.1/daemon/globals.mak	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/globals.mak	2014-12-13 23:38:33.296585270 +0100
++++ sflphone-1.4.1-new/daemon/globals.mak	2015-01-26 11:42:37.646420935 +0100
 @@ -7,18 +7,9 @@ sflplugindir=$(sfllibdir)/plugins
  
  ASTYLERC="$(top_srcdir)/../astylerc"
@@ -40,13 +31,7 @@ diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.m
  
  if BUILD_SPEEX
  SPEEXCODEC=-DHAVE_SPEEX_CODEC
-@@ -34,13 +25,9 @@ endif
- 
- # Preprocessor flags
- AM_CPPFLAGS = \
--	-I$(src)/libs \
--	-I$(src)/libs/iax2 \
--	-I$(src)/libs/$(PJPROJECT_DIR) \
+@@ -40,7 +31,6 @@ AM_CPPFLAGS = \
  	-I$(src)/src \
  	-I$(src)/src/config \
  	-I$(src)/test \
@@ -54,65 +39,3 @@ diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.m
  	@DBUSCPP_CFLAGS@ \
  	-DPREFIX=\"$(prefix)\" \
  	-DPROGSHAREDIR=\"${datadir}/sflphone\" \
-diff -rupN sflphone-1.4.1/daemon/Makefile.am sflphone-1.4.1-new/daemon/Makefile.am
---- sflphone-1.4.1/daemon/Makefile.am	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/Makefile.am	2014-12-13 23:38:33.296585270 +0100
-@@ -19,7 +19,7 @@ unittest:
- endif
- 
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = libs src ringtones man $(TESTS_DIR) doc
-+SUBDIRS = src ringtones man $(TESTS_DIR) doc
- 
- EXTRA_DIST = m4/libtool.m4 \
- 			 m4/lt~obsolete.m4 \
-diff -rupN sflphone-1.4.1/daemon/src/iax/iaxcall.cpp sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp
---- sflphone-1.4.1/daemon/src/iax/iaxcall.cpp	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp	2014-12-13 23:38:33.297585288 +0100
-@@ -31,8 +31,8 @@
- 
- #include <cstring>
- #include <sys/socket.h>
--#include <iax-client.h>
--#include <frame.h>
-+#include <iax/iax-client.h>
-+#include <iax/frame.h>
- 
- #include "iaxcall.h"
- #include "logger.h"
-diff -rupN sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h
---- sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h	2014-12-13 23:38:33.297585288 +0100
-@@ -45,7 +45,7 @@
- #include "noncopyable.h"
- #include "audio/resampler.h"
- 
--#include <iax-client.h>
-+#include <iax/iax-client.h>
- 
- #include <memory>
- 
-diff -rupN sflphone-1.4.1/daemon/src/im/instant_messaging.h sflphone-1.4.1-new/daemon/src/im/instant_messaging.h
---- sflphone-1.4.1/daemon/src/im/instant_messaging.h	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/src/im/instant_messaging.h	2014-12-13 23:38:33.298585307 +0100
-@@ -48,7 +48,7 @@
- #include "config.h"
- 
- #if HAVE_IAX
--#include <iax-client.h>
-+#include <iax/iax-client.h>
- #endif
- 
- #define EMPTY_MESSAGE   pj_str((char*)"")
-diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am
---- sflphone-1.4.1/daemon/src/Makefile.am	2014-09-19 18:09:33.000000000 +0200
-+++ sflphone-1.4.1-new/daemon/src/Makefile.am	2014-12-13 23:38:33.298585307 +0100
-@@ -18,7 +18,7 @@ endif
- if USE_IAX
- IAX_SUBDIR=iax
- IAX_CXXFLAG=-DUSE_IAX
--IAX_LIB=./iax/libiaxlink.la $(top_builddir)/libs/iax2/libiax2.la
-+IAX_LIB=./iax/libiaxlink.la -liax
- endif
- 
- if USE_NETWORKMANAGER