diff --git a/jni/libccrtp/sources/CMakeLists.txt b/jni/libccrtp/sources/CMakeLists.txt
index 9545910..1c55da5 100644
--- a/jni/libccrtp/sources/CMakeLists.txt
+++ b/jni/libccrtp/sources/CMakeLists.txt
@@ -14,20 +14,20 @@
 cmake_minimum_required(VERSION 2.6)
 
 PROJECT(libccrtp)
+set (VERSION 2.0.7)
+set (SOVERSION ${VERSION})
+STRING(REGEX REPLACE "[.].*$" "" SOVERSION ${SOVERSION})
+set (REQUIRES 5.0.0)
+set (PACKAGE ccrtp)
 
 # for debug and trace during CMakeList development
 set(CMAKE_VERBOSE_MAKEFILE FALSE)
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 2)
 SET(CPACK_PACKAGE_VERSION_MINOR 0)
-SET(CPACK_PACKAGE_VERSION_PATCH 4)
+SET(CPACK_PACKAGE_VERSION_PATCH 7)
 
 # set some global variables, in particular version variables
-set (VERSION 2.0.4)
-set (SOVERSION ${VERSION})
-STRING(REGEX REPLACE "[.].*$" "" SOVERSION ${SOVERSION})
-set (REQUIRES 5.0.0)
-set (PACKAGE ccrtp)
 
 # Set library postfix in case of 64 bit architecture
 # this caused problems in debian where it has to always be lib....
diff --git a/jni/libccrtp/sources/ChangeLog b/jni/libccrtp/sources/ChangeLog
index a761dee..3f6e290 100644
--- a/jni/libccrtp/sources/ChangeLog
+++ b/jni/libccrtp/sources/ChangeLog
@@ -1,3 +1,23 @@
+2014-01-05  Tristen Matth
+
+	Clang fixes & code cleanup from static analysis
+
+2014-01-05  David Sugar
+
+	Cleanup of configure
+
+2013-06-30  David Sugar
+
+	Fixed texinfo errors
+
+2013-06-08  Jan Engelhardt
+
+	Modernized automake
+
+2013-06-03  Tristan Matthew
+
+	Uninitialized control message and rtcp messages.
+
 2010-12-04  Werner Dittmann
 
 	Added a new method to RTPPacket and modified the takeInData to fix 
diff --git a/jni/libccrtp/sources/Makefile b/jni/libccrtp/sources/Makefile
index ccd1928..c6db325 100644
--- a/jni/libccrtp/sources/Makefile
+++ b/jni/libccrtp/sources/Makefile
@@ -96,9 +96,9 @@
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/ccrtp-config.h.in $(srcdir)/ccrtp.spec.in \
 	$(srcdir)/libccrtp.spec.in $(srcdir)/ccrtp.list.in \
-	$(srcdir)/libccrtp.pc.in COPYING THANKS TODO \
-	autoconf/config.guess autoconf/config.sub autoconf/install-sh \
-	autoconf/missing autoconf/ltmain.sh \
+	$(srcdir)/libccrtp.pc.in $(srcdir)/directive.in COPYING THANKS \
+	TODO autoconf/config.guess autoconf/config.sub \
+	autoconf/install-sh autoconf/missing autoconf/ltmain.sh \
 	$(top_srcdir)/autoconf/config.guess \
 	$(top_srcdir)/autoconf/config.sub \
 	$(top_srcdir)/autoconf/install-sh \
@@ -117,7 +117,8 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = ccrtp-config.h
-CONFIG_CLEAN_FILES = ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc
+CONFIG_CLEAN_FILES = ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc \
+	directive
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_$(V))
 am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
@@ -131,8 +132,6 @@
 am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 am__v_at_1 = 
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -241,9 +240,9 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).shar.gz $(distdir).zip
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
 GZIP_ENV = --best
-DIST_TARGETS = dist-shar dist-gzip dist-zip
+DIST_TARGETS = dist-gzip dist-zip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -252,6 +251,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -270,7 +270,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -300,12 +300,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = 2:2:0
+LT_VERSION = 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -318,21 +318,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources
@@ -356,7 +356,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
@@ -391,11 +391,10 @@
 top_build_prefix = 
 top_builddir = .
 top_srcdir = .
-AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \
     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \
-    ccrtp-config.h
+    ccrtp-config.h directive.in
 
 SUBDIRS = src demo doc
 DIST_SUBDIRS = m4 src phone doc demo w32
@@ -462,6 +461,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libccrtp.pc: $(top_builddir)/config.status $(srcdir)/libccrtp.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+directive: $(top_builddir)/config.status $(srcdir)/directive.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -685,6 +686,7 @@
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
+
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -917,8 +919,8 @@
 	@rm -f ${PACKAGE}-[0-9]*.tar.bz2
 	@rm -f ${PACKAGE}-[0-9]*.shar.gz
 	@rm -f ${PACKAGE}-[0-9]*.zip
-	@rm -f ${PACKAGE}-*.rpm
-	@rm -f ${PACKAGE}[-_]*.deb
+	@rm -f *${PACKAGE}*.rpm
+	@rm -f *${PACKAGE}*.deb
 	@rm -f ${PACKAGE}_*.gz
 	@rm -f ${PACKAGE}_*.dsc
 	@rm -f *.changes
diff --git a/jni/libccrtp/sources/Makefile.am b/jni/libccrtp/sources/Makefile.am
index 81ab372..046d815 100644
--- a/jni/libccrtp/sources/Makefile.am
+++ b/jni/libccrtp/sources/Makefile.am
@@ -9,11 +9,10 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \
     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \
-    ccrtp-config.h
+    ccrtp-config.h directive.in
 
 SUBDIRS = src demo doc
 DIST_SUBDIRS = m4 src phone doc demo w32
@@ -28,8 +27,8 @@
 	@rm -f ${PACKAGE}-[0-9]*.tar.bz2
 	@rm -f ${PACKAGE}-[0-9]*.shar.gz
 	@rm -f ${PACKAGE}-[0-9]*.zip
-	@rm -f ${PACKAGE}-*.rpm
-	@rm -f ${PACKAGE}[-_]*.deb
+	@rm -f *${PACKAGE}*.rpm
+	@rm -f *${PACKAGE}*.deb
 	@rm -f ${PACKAGE}_*.gz
 	@rm -f ${PACKAGE}_*.dsc
 	@rm -f *.changes
diff --git a/jni/libccrtp/sources/Makefile.in b/jni/libccrtp/sources/Makefile.in
index b833615..aa904d4 100644
--- a/jni/libccrtp/sources/Makefile.in
+++ b/jni/libccrtp/sources/Makefile.in
@@ -96,9 +96,9 @@
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/ccrtp-config.h.in $(srcdir)/ccrtp.spec.in \
 	$(srcdir)/libccrtp.spec.in $(srcdir)/ccrtp.list.in \
-	$(srcdir)/libccrtp.pc.in COPYING THANKS TODO \
-	autoconf/config.guess autoconf/config.sub autoconf/install-sh \
-	autoconf/missing autoconf/ltmain.sh \
+	$(srcdir)/libccrtp.pc.in $(srcdir)/directive.in COPYING THANKS \
+	TODO autoconf/config.guess autoconf/config.sub \
+	autoconf/install-sh autoconf/missing autoconf/ltmain.sh \
 	$(top_srcdir)/autoconf/config.guess \
 	$(top_srcdir)/autoconf/config.sub \
 	$(top_srcdir)/autoconf/install-sh \
@@ -117,7 +117,8 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = ccrtp-config.h
-CONFIG_CLEAN_FILES = ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc
+CONFIG_CLEAN_FILES = ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc \
+	directive
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -131,8 +132,6 @@
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -241,9 +240,9 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).shar.gz $(distdir).zip
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
 GZIP_ENV = --best
-DIST_TARGETS = dist-shar dist-gzip dist-zip
+DIST_TARGETS = dist-gzip dist-zip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -252,6 +251,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -391,11 +391,10 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \
     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \
-    ccrtp-config.h
+    ccrtp-config.h directive.in
 
 SUBDIRS = src demo doc
 DIST_SUBDIRS = m4 src phone doc demo w32
@@ -462,6 +461,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libccrtp.pc: $(top_builddir)/config.status $(srcdir)/libccrtp.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+directive: $(top_builddir)/config.status $(srcdir)/directive.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -685,6 +686,7 @@
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
+
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -917,8 +919,8 @@
 	@rm -f ${PACKAGE}-[0-9]*.tar.bz2
 	@rm -f ${PACKAGE}-[0-9]*.shar.gz
 	@rm -f ${PACKAGE}-[0-9]*.zip
-	@rm -f ${PACKAGE}-*.rpm
-	@rm -f ${PACKAGE}[-_]*.deb
+	@rm -f *${PACKAGE}*.rpm
+	@rm -f *${PACKAGE}*.deb
 	@rm -f ${PACKAGE}_*.gz
 	@rm -f ${PACKAGE}_*.dsc
 	@rm -f *.changes
diff --git a/jni/libccrtp/sources/autom4te.cache/output.0 b/jni/libccrtp/sources/autom4te.cache/output.0
index 4e677a1..0c8b68c 100644
--- a/jni/libccrtp/sources/autom4te.cache/output.0
+++ b/jni/libccrtp/sources/autom4te.cache/output.0
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69.
+@%:@ Generated by GNU Autoconf 2.69 for ccrtp 2.0.7.
 @%:@ 
 @%:@ 
 @%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -585,12 +585,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='ccrtp'
+PACKAGE_TARNAME='ccrtp'
+PACKAGE_VERSION='2.0.7'
+PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="src/ccrtp/rtp.h"
 # Factoring default headers for most tests.
@@ -710,8 +710,6 @@
 STRIP
 ac_ct_AR
 AR
-DLLTOOL
-OBJDUMP
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -722,6 +720,9 @@
 GREP
 SED
 LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
 CXXCPP
 ac_ct_CXX
 CXXFLAGS
@@ -861,7 +862,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1361,7 +1362,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures ccrtp 2.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1410,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/PACKAGE@:>@
+  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/ccrtp@:>@
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1431,7 +1432,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of ccrtp 2.0.7:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1556,7 +1559,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+ccrtp configure 2.0.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2042,7 +2045,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by ccrtp $as_me 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2391,30 +2394,10 @@
 
 
 
-cfg_options=""
-if test -z "$*" ; then
-        if test -f ~/.configure ; then
-        cfg_options=`grep ^ccrtp: ~/.configure | sed -e s/^ccrtp://`
-        elif test -f /etc/configure.conf ; then
-        cfg_options=`grep ^ccrtp: /etc/configure.conf | sed -e s/^ccrtp://`
-        fi
-fi
 
-if test ! -z "$cfg_options" ; then
-        echo "using ~/.configure defaults...$cfg_options"
-        case "$SHELL" in
-        */bash*)
-                exec $SHELL $0 $cfg_options
-                exit -1
-                ;;
-        esac
-        exec $0 $cfg_options
-        exit -1
-fi
-
-VERSION="2.0.4"
+LT_VERSION="2:4:0"
 REQUIRES="5.0.0"
-LT_VERSION="2:2:0"
+
 ac_aux_dir=
 for ac_dir in autoconf "$srcdir"/autoconf; do
   if test -f "$ac_dir/install-sh"; then
@@ -4128,7 +4111,309 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# OST_PROG_CC_POSIX
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+    
+    
+    
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+    
+    
+    
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+    
+    
+    
+
+
+
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -5255,9 +5540,6 @@
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
 
-    
-    
-    
 
 
 
@@ -5601,9 +5883,6 @@
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 
-    
-    
-    
 
 
 
@@ -7565,9 +7844,7 @@
         enable_dlopen=no
   
 
-  enable_win32_dll=no
   
-
             @%:@ Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; p=${PACKAGE-default}
@@ -15264,9 +15541,8 @@
 
 
 # Define the identity of the package.
-
- PACKAGE=ccrtp
- VERSION=$VERSION
+ PACKAGE='ccrtp'
+ VERSION='2.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15699,30 +15975,6 @@
 esac
 
 
-if test -z "$PKG_CONFIG_PATH" ; then
-        PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-fi
-
-if test "$prefix" != "NONE" ; then
-        PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
-fi
-
-export PKG_CONFIG_PATH
-
-# use "-no-undefined" on Cygwin to force (trigger) libtool to create
-# the shared lib. If this is not set this library
-# is not created. Be sure that the LIBS variable above contains _all_
-# libraries necessary to build ours, Cygwin does not allow undefined
-# symbols.
-case $host in
-#  *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
-  *-*-cygwin*)
-    LDFLAGS="$LDFLAGS -no-undefined"
-    ;;
-  *)
-    ;;
-esac
-
 # SRTP support
 @%:@ Check whether --enable-srtp was given.
 if test "${enable_srtp+set}" = set; then :
@@ -16517,7 +16769,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile"
+ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile directive"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17068,7 +17320,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by ccrtp $as_me 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17134,7 +17386,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+ccrtp config.status 2.0.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17262,6 +17514,9 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
@@ -17295,12 +17550,10 @@
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
 file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
 want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
@@ -17460,7 +17713,10 @@
 }
 
 # Quote evaled strings.
-for var in SHELL \
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
 ECHO \
 PATH_SEPARATOR \
 SED \
@@ -17473,12 +17729,10 @@
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
-OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
 file_magic_glob \
 want_nocaseglob \
-DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
@@ -17654,6 +17908,7 @@
     "ccrtp.list") CONFIG_FILES="$CONFIG_FILES ccrtp.list" ;;
     "libccrtp.pc") CONFIG_FILES="$CONFIG_FILES libccrtp.pc" ;;
     "src/ccrtp/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/ccrtp/crypto/Makefile" ;;
+    "directive") CONFIG_FILES="$CONFIG_FILES directive" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -18303,6 +18558,15 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
 # Which release of libtool.m4 was used?
 macro_version=$macro_version
 macro_revision=$macro_revision
@@ -18383,9 +18647,6 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
@@ -18398,9 +18659,6 @@
 # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
 want_nocaseglob=$lt_want_nocaseglob
 
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
 # Command to associate shared and link libraries.
 sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 
diff --git a/jni/libccrtp/sources/autom4te.cache/output.1 b/jni/libccrtp/sources/autom4te.cache/output.1
index 4e677a1..0c8b68c 100644
--- a/jni/libccrtp/sources/autom4te.cache/output.1
+++ b/jni/libccrtp/sources/autom4te.cache/output.1
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69.
+@%:@ Generated by GNU Autoconf 2.69 for ccrtp 2.0.7.
 @%:@ 
 @%:@ 
 @%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -585,12 +585,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='ccrtp'
+PACKAGE_TARNAME='ccrtp'
+PACKAGE_VERSION='2.0.7'
+PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="src/ccrtp/rtp.h"
 # Factoring default headers for most tests.
@@ -710,8 +710,6 @@
 STRIP
 ac_ct_AR
 AR
-DLLTOOL
-OBJDUMP
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -722,6 +720,9 @@
 GREP
 SED
 LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
 CXXCPP
 ac_ct_CXX
 CXXFLAGS
@@ -861,7 +862,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1361,7 +1362,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures ccrtp 2.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1410,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/PACKAGE@:>@
+  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/ccrtp@:>@
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1431,7 +1432,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of ccrtp 2.0.7:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1556,7 +1559,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+ccrtp configure 2.0.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2042,7 +2045,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by ccrtp $as_me 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2391,30 +2394,10 @@
 
 
 
-cfg_options=""
-if test -z "$*" ; then
-        if test -f ~/.configure ; then
-        cfg_options=`grep ^ccrtp: ~/.configure | sed -e s/^ccrtp://`
-        elif test -f /etc/configure.conf ; then
-        cfg_options=`grep ^ccrtp: /etc/configure.conf | sed -e s/^ccrtp://`
-        fi
-fi
 
-if test ! -z "$cfg_options" ; then
-        echo "using ~/.configure defaults...$cfg_options"
-        case "$SHELL" in
-        */bash*)
-                exec $SHELL $0 $cfg_options
-                exit -1
-                ;;
-        esac
-        exec $0 $cfg_options
-        exit -1
-fi
-
-VERSION="2.0.4"
+LT_VERSION="2:4:0"
 REQUIRES="5.0.0"
-LT_VERSION="2:2:0"
+
 ac_aux_dir=
 for ac_dir in autoconf "$srcdir"/autoconf; do
   if test -f "$ac_dir/install-sh"; then
@@ -4128,7 +4111,309 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# OST_PROG_CC_POSIX
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+    
+    
+    
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+    
+    
+    
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+    
+    
+    
+
+
+
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -5255,9 +5540,6 @@
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
 
-    
-    
-    
 
 
 
@@ -5601,9 +5883,6 @@
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 
-    
-    
-    
 
 
 
@@ -7565,9 +7844,7 @@
         enable_dlopen=no
   
 
-  enable_win32_dll=no
   
-
             @%:@ Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; p=${PACKAGE-default}
@@ -15264,9 +15541,8 @@
 
 
 # Define the identity of the package.
-
- PACKAGE=ccrtp
- VERSION=$VERSION
+ PACKAGE='ccrtp'
+ VERSION='2.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15699,30 +15975,6 @@
 esac
 
 
-if test -z "$PKG_CONFIG_PATH" ; then
-        PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-fi
-
-if test "$prefix" != "NONE" ; then
-        PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
-fi
-
-export PKG_CONFIG_PATH
-
-# use "-no-undefined" on Cygwin to force (trigger) libtool to create
-# the shared lib. If this is not set this library
-# is not created. Be sure that the LIBS variable above contains _all_
-# libraries necessary to build ours, Cygwin does not allow undefined
-# symbols.
-case $host in
-#  *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
-  *-*-cygwin*)
-    LDFLAGS="$LDFLAGS -no-undefined"
-    ;;
-  *)
-    ;;
-esac
-
 # SRTP support
 @%:@ Check whether --enable-srtp was given.
 if test "${enable_srtp+set}" = set; then :
@@ -16517,7 +16769,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile"
+ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile directive"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17068,7 +17320,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by ccrtp $as_me 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17134,7 +17386,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+ccrtp config.status 2.0.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17262,6 +17514,9 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
@@ -17295,12 +17550,10 @@
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
 file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
 want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
@@ -17460,7 +17713,10 @@
 }
 
 # Quote evaled strings.
-for var in SHELL \
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
 ECHO \
 PATH_SEPARATOR \
 SED \
@@ -17473,12 +17729,10 @@
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
-OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
 file_magic_glob \
 want_nocaseglob \
-DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
@@ -17654,6 +17908,7 @@
     "ccrtp.list") CONFIG_FILES="$CONFIG_FILES ccrtp.list" ;;
     "libccrtp.pc") CONFIG_FILES="$CONFIG_FILES libccrtp.pc" ;;
     "src/ccrtp/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/ccrtp/crypto/Makefile" ;;
+    "directive") CONFIG_FILES="$CONFIG_FILES directive" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -18303,6 +18558,15 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
 # Which release of libtool.m4 was used?
 macro_version=$macro_version
 macro_revision=$macro_revision
@@ -18383,9 +18647,6 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
@@ -18398,9 +18659,6 @@
 # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
 want_nocaseglob=$lt_want_nocaseglob
 
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
 # Command to associate shared and link libraries.
 sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 
diff --git a/jni/libccrtp/sources/autom4te.cache/requests b/jni/libccrtp/sources/autom4te.cache/requests
index bf9e2d4..6987e91 100644
--- a/jni/libccrtp/sources/autom4te.cache/requests
+++ b/jni/libccrtp/sources/autom4te.cache/requests
@@ -47,205 +47,205 @@
                         'configure.ac'
                       ],
                       {
-                        'LT_AC_PROG_EGREP' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
                         'AC_LTDL_SHLIBEXT' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'LT_LIB_M' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'OST_PROG_CC_POSIX' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'OST_PROJ_LIBRARY' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_LTDL_SETUP' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AM_PATH_LIBGCRYPT_CCRTP' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AM_C_PROTOTYPES' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AC_DEFUN' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AC_SUBST_DIR' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
                         'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'LT_PROG_GO' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'LT_PROG_GCJ' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        '_LT_AC_LOCK' => 1,
                         'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'OST_PROJ_LIBRARY' => 1,
+                        'AM_PROG_NM' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'OST_PROG_LIBVER' => 1,
+                        'AM_CONFIG_HEADER' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        '_m4_warn' => 1,
+                        'LT_LANG' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'OST_PROG_LIBRARY' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'OST_PROG_COMMON' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'OST_DEBUG' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'AC_DEFUN' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LT_INIT' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'OST_MAINTAINER_MODE' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_SUBST_DIR' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'LT_PROG_RC' => 1,
+                        'include' => 1,
+                        'AM_PROG_CC_STDC' => 1,
+                        'AM_PROG_LD' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AM_PATH_LIBGCRYPT_CCRTP' => 1,
+                        'AM_C_PROTOTYPES' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'fp_C_PROTOTYPES' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
                         'LT_SYS_DLSEARCH_PATH' => 1,
                         'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'm4_pattern_allow' => 1,
-                        'PKG_CHECK_VAR' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'fp_C_PROTOTYPES' => 1,
-                        'LT_LANG' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'PKG_INSTALLDIR' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        'AU_DEFUN' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'LTDL_INIT' => 1,
-                        'OST_PROG_LIBRARY' => 1,
-                        'LT_INIT' => 1,
-                        'OST_AUTOMAKE_MODE' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'OST_PROG_COMMON' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'include' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AM_CONFIG_HEADER' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'OST_PROG_LIBVER' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
                         '_LT_PROG_CXX' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        '_LT_PROG_FC' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_PATH_NM' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'OST_MAINTAINER_MODE' => 1,
-                        'm4_include' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'AM_PROG_CC_STDC' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'OST_DEBUG' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_m4_warn' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AC_PROG_LD' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AM_PROG_LD' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'gl_FUNC_ARGZ' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'LT_AC_PROG_RC' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'LT_LIB_M' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'OST_PROG_CC_POSIX' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'OST_AUTOMAKE_MODE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'LTDL_INIT' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'm4_include' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -260,65 +260,65 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_INIT' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        '_AM_COND_IF' => 1,
+                        '_m4_warn' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'include' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_SUBST' => 1,
+                        'm4_include' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'm4_sinclude' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'LT_INIT' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_LIBSOURCE' => 1,
                         'AC_CONFIG_LINKS' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AC_INIT' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'm4_include' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_FC_SRCEXT' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'LT_INIT' => 1,
+                        'AM_PROG_FC_C_O' => 1,
                         'sinclude' => 1,
-                        'm4_pattern_allow' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'include' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AM_PROG_AR' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        '_m4_warn' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
                         'AM_NLS' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_FC_FREEFORM' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
                         'AM_PATH_GUILE' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_SUBST' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AH_OUTPUT' => 1,
-                        'm4_pattern_forbid' => 1
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_COND_ENDIF' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/jni/libccrtp/sources/autom4te.cache/traces.0 b/jni/libccrtp/sources/autom4te.cache/traces.0
index c3deabd..5489d68 100644
--- a/jni/libccrtp/sources/autom4te.cache/traces.0
+++ b/jni/libccrtp/sources/autom4te.cache/traces.0
@@ -2633,188 +2633,199 @@
 m4trace:configure.ac:12: -1- m4_pattern_allow([^build_alias$])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^host_alias$])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:39: -1- _m4_warn([obsolete], [The macro `AC_CANONICAL_SYSTEM' is obsolete.
+m4trace:configure.ac:19: -1- _m4_warn([obsolete], [The macro `AC_CANONICAL_SYSTEM' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:1857: AC_CANONICAL_SYSTEM is expanded from...
-configure.ac:39: the top level])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target_cpu$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target_vendor$])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target_os$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:44: -1- AM_PROG_LIBTOOL
-m4trace:configure.ac:44: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete.
+configure.ac:19: the top level])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target_cpu$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target_vendor$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target_os$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:23: -1- AC_LIBTOOL_WIN32_DLL
+m4trace:configure.ac:23: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_WIN32_DLL' is obsolete.
+You should run autoupdate.], [m4/ltoptions.m4:146: AC_LIBTOOL_WIN32_DLL is expanded from...
+configure.ac:23: the top level])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^AS$])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:23: -1- _m4_warn([obsolete], [AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.], [m4/ltoptions.m4:146: AC_LIBTOOL_WIN32_DLL is expanded from...
+configure.ac:23: the top level])
+m4trace:configure.ac:24: -1- AM_PROG_LIBTOOL
+m4trace:configure.ac:24: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete.
 You should run autoupdate.], [m4/libtool.m4:108: AM_PROG_LIBTOOL is expanded from...
-configure.ac:44: the top level])
-m4trace:configure.ac:44: -1- LT_INIT
-m4trace:configure.ac:44: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:44: -1- LTOPTIONS_VERSION
-m4trace:configure.ac:44: -1- LTSUGAR_VERSION
-m4trace:configure.ac:44: -1- LTVERSION_VERSION
-m4trace:configure.ac:44: -1- LTOBSOLETE_VERSION
-m4trace:configure.ac:44: -1- _LT_PROG_LTMAIN
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:44: -1- _LT_PREPARE_SED_QUOTE_VARS
-m4trace:configure.ac:44: -1- _LT_PROG_ECHO_BACKSLASH
-m4trace:configure.ac:44: -1- LT_PATH_LD
-m4trace:configure.ac:44: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:44: -1- AC_PROG_EGREP
-m4trace:configure.ac:44: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:44: -1- LT_PATH_NM
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:44: -1- LT_CMD_MAX_LEN
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^ac_ct_AR$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:44: -1- _LT_WITH_SYSROOT
-m4trace:configure.ac:44: -1- m4_pattern_allow([LT_OBJDIR])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:44: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:44: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:44: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:44: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:44: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:44: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:44: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
-m4trace:configure.ac:44: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
+configure.ac:24: the top level])
+m4trace:configure.ac:24: -1- LT_INIT
+m4trace:configure.ac:24: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
+m4trace:configure.ac:24: -1- LTOPTIONS_VERSION
+m4trace:configure.ac:24: -1- LTSUGAR_VERSION
+m4trace:configure.ac:24: -1- LTVERSION_VERSION
+m4trace:configure.ac:24: -1- LTOBSOLETE_VERSION
+m4trace:configure.ac:24: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LIBTOOL$])
+m4trace:configure.ac:24: -1- _LT_PREPARE_SED_QUOTE_VARS
+m4trace:configure.ac:24: -1- _LT_PROG_ECHO_BACKSLASH
+m4trace:configure.ac:24: -1- LT_PATH_LD
+m4trace:configure.ac:24: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:24: -1- AC_PROG_EGREP
+m4trace:configure.ac:24: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:24: -1- LT_PATH_NM
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^NM$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:24: -1- LT_CMD_MAX_LEN
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^ac_ct_AR$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:24: -1- _LT_WITH_SYSROOT
+m4trace:configure.ac:24: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LT_OBJDIR$])
+m4trace:configure.ac:24: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:24: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:24: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:24: -1- LT_SUPPORTED_TAG([CC])
+m4trace:configure.ac:24: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:24: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:24: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
+m4trace:configure.ac:24: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
      "" | " "*) ;;
      *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
      esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
      _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
-m4trace:configure.ac:44: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^MANIFEST_TOOL$])
-m4trace:configure.ac:44: -1- _LT_REQUIRED_DARWIN_CHECKS
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^NMEDIT$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LIPO$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OTOOL$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:44: -1- _LT_LINKER_OPTION([if $CC understands -b], [lt_cv_prog_compiler__b], [-b], [_LT_TAGVAR(archive_cmds, )='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, )='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])
-m4trace:configure.ac:44: -1- LT_SYS_DLOPEN_SELF
-m4trace:configure.ac:44: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:44: -1- LT_LANG([CXX])
-m4trace:configure.ac:44: -1- LT_SUPPORTED_TAG([CXX])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:44: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:44: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:44: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:44: -1- LT_PATH_LD
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:44: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
+m4trace:configure.ac:24: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^MANIFEST_TOOL$])
+m4trace:configure.ac:24: -1- _LT_REQUIRED_DARWIN_CHECKS
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OTOOL64$])
+m4trace:configure.ac:24: -1- _LT_LINKER_OPTION([if $CC understands -b], [lt_cv_prog_compiler__b], [-b], [_LT_TAGVAR(archive_cmds, )='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, )='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])
+m4trace:configure.ac:24: -1- LT_SYS_DLOPEN_SELF
+m4trace:configure.ac:24: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
+m4trace:configure.ac:24: -1- LT_LANG([CXX])
+m4trace:configure.ac:24: -1- LT_SUPPORTED_TAG([CXX])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:24: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:24: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:24: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:24: -1- LT_PATH_LD
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:24: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
      "" | " "*) ;;
      *) _LT_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
      esac], [_LT_TAGVAR(lt_prog_compiler_pic, CXX)=
      _LT_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
-m4trace:configure.ac:44: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
-m4trace:configure.ac:45: -1- AM_INIT_AUTOMAKE([ccrtp], [$VERSION])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:45: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:45: -1- AM_AUTOMAKE_VERSION([1.13.4])
-m4trace:configure.ac:45: -1- _AM_AUTOCONF_VERSION([2.69])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:45: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [/usr/share/aclocal-1.13/init.m4:23: AM_INIT_AUTOMAKE is expanded from...
-configure.ac:45: the top level])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:45: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+m4trace:configure.ac:24: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
+m4trace:configure.ac:25: -1- AM_INIT_AUTOMAKE([dist-zip])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:25: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+m4trace:configure.ac:25: -1- AM_AUTOMAKE_VERSION([1.13.4])
+m4trace:configure.ac:25: -1- _AM_AUTOCONF_VERSION([2.69])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:25: -1- _AM_SET_OPTIONS([dist-zip])
+m4trace:configure.ac:25: -1- _AM_SET_OPTION([dist-zip])
+m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([dist-zip])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:25: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
  AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])
-m4trace:configure.ac:45: -2- _AM_MANGLE_OPTION([no-define])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:45: -1- AM_SANITY_CHECK
-m4trace:configure.ac:45: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:45: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:45: -1- AM_AUX_DIR_EXPAND
-m4trace:configure.ac:45: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:45: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:45: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:45: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:45: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:45: -1- AM_PROG_INSTALL_SH
-m4trace:configure.ac:45: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:45: -1- AM_PROG_INSTALL_STRIP
-m4trace:configure.ac:45: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:45: -1- AM_SET_LEADING_DOT
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:45: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:25: -1- AM_SANITY_CHECK
+m4trace:configure.ac:25: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.ac:25: -1- AM_MISSING_HAS_RUN
+m4trace:configure.ac:25: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.ac:25: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:25: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:25: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:25: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:25: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:25: -1- AM_PROG_INSTALL_SH
+m4trace:configure.ac:25: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:25: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.ac:25: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:25: -1- AM_SET_LEADING_DOT
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:25: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
 			     [_AM_PROG_TAR([v7])])])
-m4trace:configure.ac:45: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:45: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
-m4trace:configure.ac:45: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:45: -1- _AM_PROG_TAR([v7])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:45: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.ac:25: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.ac:25: -1- _AM_PROG_TAR([v7])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:25: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
 		  [_AM_DEPENDENCIES([CC])],
 		  [m4_define([AC_PROG_CC],
 			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
@@ -2831,60 +2842,60 @@
 		  [m4_define([AC_PROG_OBJCXX],
 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-m4trace:configure.ac:45: -2- _AM_MANGLE_OPTION([no-dependencies])
-m4trace:configure.ac:45: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:45: -1- AM_SET_DEPDIR
-m4trace:configure.ac:45: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:45: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:45: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:45: -1- AM_DEP_TRACK
-m4trace:configure.ac:45: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__nodep$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__nodep])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:45: -1- AM_CONDITIONAL([am__fastdepCC], [
+m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.ac:25: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:25: -1- AM_SET_DEPDIR
+m4trace:configure.ac:25: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:25: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:25: -1- AM_MAKE_INCLUDE
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:25: -1- AM_DEP_TRACK
+m4trace:configure.ac:25: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__nodep$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__nodep])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:25: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:45: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:45: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:25: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:25: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:45: -1- AM_SILENT_RULES
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_V$])
-m4trace:configure.ac:45: -1- AM_SUBST_NOTMAKE([AM_V])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AM_V])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_DEFAULT_V$])
-m4trace:configure.ac:45: -1- AM_SUBST_NOTMAKE([AM_DEFAULT_V])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_BACKSLASH$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
-m4trace:configure.ac:46: -1- AM_CONFIG_HEADER([ccrtp-config.h])
-m4trace:configure.ac:46: -1- _m4_warn([obsolete], ['AM_CONFIG_HEADER': this macro is obsolete.
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:25: -1- AM_SILENT_RULES
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_V$])
+m4trace:configure.ac:25: -1- AM_SUBST_NOTMAKE([AM_V])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AM_V])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_DEFAULT_V$])
+m4trace:configure.ac:25: -1- AM_SUBST_NOTMAKE([AM_DEFAULT_V])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_BACKSLASH$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
+m4trace:configure.ac:26: -1- AM_CONFIG_HEADER([ccrtp-config.h])
+m4trace:configure.ac:26: -1- _m4_warn([obsolete], ['AM_CONFIG_HEADER': this macro is obsolete.
 You should use the 'AC_CONFIG_HEADERS' macro instead.], [/usr/share/aclocal-1.13/obsolete.m4:11: AM_CONFIG_HEADER is expanded from...
-configure.ac:46: the top level])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^restrict$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^restrict$])
-m4trace:configure.ac:49: -1- m4_pattern_allow([^volatile$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^SRTP_SUPPORT$])
-m4trace:configure.ac:90: -1- AM_PATH_LIBGCRYPT_CCRTP([1:1.2.3], [AC_CHECK_HEADERS([gcrypt.h],
+configure.ac:26: the top level])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^restrict$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^restrict$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^volatile$])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^SRTP_SUPPORT$])
+m4trace:configure.ac:46: -1- AM_PATH_LIBGCRYPT_CCRTP([1:1.2.3], [AC_CHECK_HEADERS([gcrypt.h],
                                     [], AC_MSG_ERROR([libgcrypt headers not found.]))
                    LIBS="$LIBGCRYPT_LIBS $LIBS"
                    gcrypt="true"
@@ -2899,82 +2910,82 @@
                      )
                   
                  ])
-m4trace:configure.ac:90: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.ac:46: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
 m4/libgcrypt_local.m4:23: AM_PATH_LIBGCRYPT_CCRTP is expanded from...
-configure.ac:90: the top level])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIBGCRYPT_CONFIG$])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^HAVE_GCRYPT_H$])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIBGCRYPT_CFLAGS$])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIBGCRYPT_LIBS$])
-m4trace:configure.ac:107: -1- AM_CONDITIONAL([SRTP_OPENSSL], [test "$openssl" = "true"])
-m4trace:configure.ac:107: -1- m4_pattern_allow([^SRTP_OPENSSL_TRUE$])
-m4trace:configure.ac:107: -1- m4_pattern_allow([^SRTP_OPENSSL_FALSE$])
-m4trace:configure.ac:107: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_TRUE])
-m4trace:configure.ac:107: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_FALSE])
-m4trace:configure.ac:108: -1- AM_CONDITIONAL([SRTP_GCRYPT], [test "$gcrypt" = "true"])
-m4trace:configure.ac:108: -1- m4_pattern_allow([^SRTP_GCRYPT_TRUE$])
-m4trace:configure.ac:108: -1- m4_pattern_allow([^SRTP_GCRYPT_FALSE$])
-m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_TRUE])
-m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_FALSE])
-m4trace:configure.ac:112: -1- OST_PROG_COMMON
-m4trace:configure.ac:113: -1- OST_PROG_LIBVER
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_RELEASE$])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_SUBVER$])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_MAJOR$])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_MINOR$])
-m4trace:configure.ac:114: -1- OST_PROG_LIBRARY([CCXX], [$LT_VERSION])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^LT_CCXX_VERSION$])
-m4trace:configure.ac:115: -1- OST_AUTOMAKE_MODE
-m4trace:configure.ac:116: -1- OST_MAINTAINER_MODE
-m4trace:configure.ac:116: -1- AM_MAINTAINER_MODE
-m4trace:configure.ac:116: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
-m4trace:configure.ac:116: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
-m4trace:configure.ac:116: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^MAINT$])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^FTPDIR$])
-m4trace:configure.ac:117: -1- PKG_CHECK_MODULES([COMMONCPP], [commoncpp >= $REQUIRES])
-m4trace:configure.ac:117: -1- PKG_PROG_PKG_CONFIG
-m4trace:configure.ac:117: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^COMMONCPP_CFLAGS$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^COMMONCPP_LIBS$])
-m4trace:configure.ac:117: -1- PKG_CHECK_EXISTS([commoncpp >= $REQUIRES], [pkg_cv_[]COMMONCPP_CFLAGS=`$PKG_CONFIG --[]cflags "commoncpp >= $REQUIRES" 2>/dev/null`
+configure.ac:46: the top level])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LIBGCRYPT_CONFIG$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^HAVE_GCRYPT_H$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LIBGCRYPT_CFLAGS$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LIBGCRYPT_LIBS$])
+m4trace:configure.ac:63: -1- AM_CONDITIONAL([SRTP_OPENSSL], [test "$openssl" = "true"])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^SRTP_OPENSSL_TRUE$])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^SRTP_OPENSSL_FALSE$])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_TRUE])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_FALSE])
+m4trace:configure.ac:64: -1- AM_CONDITIONAL([SRTP_GCRYPT], [test "$gcrypt" = "true"])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^SRTP_GCRYPT_TRUE$])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^SRTP_GCRYPT_FALSE$])
+m4trace:configure.ac:64: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_TRUE])
+m4trace:configure.ac:64: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_FALSE])
+m4trace:configure.ac:68: -1- OST_PROG_COMMON
+m4trace:configure.ac:69: -1- OST_PROG_LIBVER
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_RELEASE$])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_SUBVER$])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_MAJOR$])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_MINOR$])
+m4trace:configure.ac:70: -1- OST_PROG_LIBRARY([CCXX], [$LT_VERSION])
+m4trace:configure.ac:70: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:70: -1- m4_pattern_allow([^LT_CCXX_VERSION$])
+m4trace:configure.ac:71: -1- OST_AUTOMAKE_MODE
+m4trace:configure.ac:72: -1- OST_MAINTAINER_MODE
+m4trace:configure.ac:72: -1- AM_MAINTAINER_MODE
+m4trace:configure.ac:72: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^MAINT$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^FTPDIR$])
+m4trace:configure.ac:73: -1- PKG_CHECK_MODULES([COMMONCPP], [commoncpp >= $REQUIRES])
+m4trace:configure.ac:73: -1- PKG_PROG_PKG_CONFIG
+m4trace:configure.ac:73: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^COMMONCPP_CFLAGS$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^COMMONCPP_LIBS$])
+m4trace:configure.ac:73: -1- PKG_CHECK_EXISTS([commoncpp >= $REQUIRES], [pkg_cv_[]COMMONCPP_CFLAGS=`$PKG_CONFIG --[]cflags "commoncpp >= $REQUIRES" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:117: -1- PKG_CHECK_EXISTS([commoncpp >= $REQUIRES], [pkg_cv_[]COMMONCPP_LIBS=`$PKG_CONFIG --[]libs "commoncpp >= $REQUIRES" 2>/dev/null`
+m4trace:configure.ac:73: -1- PKG_CHECK_EXISTS([commoncpp >= $REQUIRES], [pkg_cv_[]COMMONCPP_LIBS=`$PKG_CONFIG --[]libs "commoncpp >= $REQUIRES" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:117: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:120: -1- m4_pattern_allow([^GNULIBS$])
-m4trace:configure.ac:128: -1- m4_pattern_allow([^WARN_FLAGS$])
-m4trace:configure.ac:130: -1- OST_DEBUG
-m4trace:configure.ac:133: -1- m4_pattern_allow([^HAVE_DL_H$])
-m4trace:configure.ac:133: -1- m4_pattern_allow([^HAVE_LIBNANA$])
-m4trace:configure.ac:142: -1- m4_pattern_allow([^KDOC_DIR$])
-m4trace:configure.ac:143: -1- m4_pattern_allow([^LT_VERSION$])
-m4trace:configure.ac:145: -1- m4_pattern_allow([^DOXYGEN$])
-m4trace:configure.ac:146: -1- m4_pattern_allow([^DOXYGEN$])
-m4trace:configure.ac:147: -1- AM_CONDITIONAL([DOXY], [test "$DOXYGEN" != "no"])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^DOXY_TRUE$])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^DOXY_FALSE$])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([DOXY_TRUE])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([DOXY_FALSE])
-m4trace:configure.ac:149: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:73: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:76: -1- m4_pattern_allow([^GNULIBS$])
+m4trace:configure.ac:84: -1- m4_pattern_allow([^WARN_FLAGS$])
+m4trace:configure.ac:86: -1- OST_DEBUG
+m4trace:configure.ac:89: -1- m4_pattern_allow([^HAVE_DL_H$])
+m4trace:configure.ac:89: -1- m4_pattern_allow([^HAVE_LIBNANA$])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^KDOC_DIR$])
+m4trace:configure.ac:99: -1- m4_pattern_allow([^LT_VERSION$])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^DOXYGEN$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^DOXYGEN$])
+m4trace:configure.ac:103: -1- AM_CONDITIONAL([DOXY], [test "$DOXYGEN" != "no"])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^DOXY_TRUE$])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^DOXY_FALSE$])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([DOXY_TRUE])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([DOXY_FALSE])
+m4trace:configure.ac:105: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:149: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:149: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:149: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:149: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:149: -1- _LT_PROG_LTMAIN
-m4trace:configure.ac:149: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:105: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:105: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:105: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:105: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:105: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff --git a/jni/libccrtp/sources/autom4te.cache/traces.1 b/jni/libccrtp/sources/autom4te.cache/traces.1
index eb5b645..3e2a35e 100644
--- a/jni/libccrtp/sources/autom4te.cache/traces.1
+++ b/jni/libccrtp/sources/autom4te.cache/traces.1
@@ -7,7 +7,7 @@
 m4trace:aclocal.m4:1326: -1- m4_include([m4/ost_debug.m4])
 m4trace:aclocal.m4:1327: -1- m4_include([m4/ost_maint.m4])
 m4trace:aclocal.m4:1328: -1- m4_include([m4/ost_prog.m4])
-m4trace:configure.ac:12: -1- AC_INIT([src/ccrtp/rtp.h])
+m4trace:configure.ac:12: -1- AC_INIT([ccrtp], [2.0.7])
 m4trace:configure.ac:12: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:12: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:12: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -155,440 +155,453 @@
 m4trace:configure.ac:12: -1- AC_SUBST([target_alias])
 m4trace:configure.ac:12: -1- AC_SUBST_TRACE([target_alias])
 m4trace:configure.ac:12: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:38: -1- AC_CONFIG_AUX_DIR([autoconf])
-m4trace:configure.ac:39: -1- AC_CANONICAL_SYSTEM
-m4trace:configure.ac:39: -1- _m4_warn([obsolete], [The macro `AC_CANONICAL_SYSTEM' is obsolete.
+m4trace:configure.ac:18: -1- AC_CONFIG_AUX_DIR([autoconf])
+m4trace:configure.ac:19: -1- AC_CANONICAL_SYSTEM
+m4trace:configure.ac:19: -1- _m4_warn([obsolete], [The macro `AC_CANONICAL_SYSTEM' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:1857: AC_CANONICAL_SYSTEM is expanded from...
-configure.ac:39: the top level])
-m4trace:configure.ac:39: -1- AC_CANONICAL_TARGET
-m4trace:configure.ac:39: -1- AC_CANONICAL_HOST
-m4trace:configure.ac:39: -1- AC_CANONICAL_BUILD
-m4trace:configure.ac:39: -1- AC_REQUIRE_AUX_FILE([config.sub])
-m4trace:configure.ac:39: -1- AC_REQUIRE_AUX_FILE([config.guess])
-m4trace:configure.ac:39: -1- AC_SUBST([build], [$ac_cv_build])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([build])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:39: -1- AC_SUBST([build_cpu], [$[1]])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([build_cpu])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:39: -1- AC_SUBST([build_vendor], [$[2]])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([build_vendor])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:39: -1- AC_SUBST([build_os])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([build_os])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:39: -1- AC_SUBST([host], [$ac_cv_host])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([host])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:39: -1- AC_SUBST([host_cpu], [$[1]])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([host_cpu])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:39: -1- AC_SUBST([host_vendor], [$[2]])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([host_vendor])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:39: -1- AC_SUBST([host_os])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([host_os])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:39: -1- AC_SUBST([target], [$ac_cv_target])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([target])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target$])
-m4trace:configure.ac:39: -1- AC_SUBST([target_cpu], [$[1]])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([target_cpu])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target_cpu$])
-m4trace:configure.ac:39: -1- AC_SUBST([target_vendor], [$[2]])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([target_vendor])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target_vendor$])
-m4trace:configure.ac:39: -1- AC_SUBST([target_os])
-m4trace:configure.ac:39: -1- AC_SUBST_TRACE([target_os])
-m4trace:configure.ac:39: -1- m4_pattern_allow([^target_os$])
-m4trace:configure.ac:40: -1- AC_SUBST([CC])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CFLAGS])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:40: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:40: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:40: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:40: -1- AC_SUBST([CC])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- AC_SUBST([CC])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- AC_SUBST([CC])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- AC_SUBST([CC])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:40: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([ac_ct_CC])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:40: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([EXEEXT])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:40: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([OBJEXT])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:40: -1- AC_SUBST([CPP])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:40: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:40: -1- AC_SUBST([CPP])
-m4trace:configure.ac:40: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:40: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:41: -1- AC_SUBST([CXX])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:41: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:41: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:41: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:41: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:41: -1- AC_SUBST([CXX])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:41: -1- AC_SUBST([ac_ct_CXX])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([ac_ct_CXX])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:41: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:41: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:41: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:42: -1- AC_SUBST([CXX])
-m4trace:configure.ac:42: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:42: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:42: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:42: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:42: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:42: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:42: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:42: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:42: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:42: -1- AC_SUBST([CXX])
-m4trace:configure.ac:42: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:42: -1- AC_SUBST([ac_ct_CXX])
-m4trace:configure.ac:42: -1- AC_SUBST_TRACE([ac_ct_CXX])
-m4trace:configure.ac:42: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:44: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete.
+configure.ac:19: the top level])
+m4trace:configure.ac:19: -1- AC_CANONICAL_TARGET
+m4trace:configure.ac:19: -1- AC_CANONICAL_HOST
+m4trace:configure.ac:19: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:19: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:19: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:19: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([build])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:19: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([build_cpu])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:19: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([build_vendor])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:19: -1- AC_SUBST([build_os])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([build_os])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:19: -1- AC_SUBST([host], [$ac_cv_host])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([host])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:19: -1- AC_SUBST([host_cpu], [$[1]])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([host_cpu])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:19: -1- AC_SUBST([host_vendor], [$[2]])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([host_vendor])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:19: -1- AC_SUBST([host_os])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([host_os])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:19: -1- AC_SUBST([target], [$ac_cv_target])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([target])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target$])
+m4trace:configure.ac:19: -1- AC_SUBST([target_cpu], [$[1]])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([target_cpu])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target_cpu$])
+m4trace:configure.ac:19: -1- AC_SUBST([target_vendor], [$[2]])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([target_vendor])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target_vendor$])
+m4trace:configure.ac:19: -1- AC_SUBST([target_os])
+m4trace:configure.ac:19: -1- AC_SUBST_TRACE([target_os])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^target_os$])
+m4trace:configure.ac:20: -1- AC_SUBST([CC])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:20: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:20: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:20: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:20: -1- AC_SUBST([CC])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- AC_SUBST([CC])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- AC_SUBST([CC])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- AC_SUBST([CC])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:20: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:20: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([EXEEXT])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:20: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([OBJEXT])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:20: -1- AC_SUBST([CPP])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:20: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:20: -1- AC_SUBST([CPP])
+m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:21: -1- AC_SUBST([CXX])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:21: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([CXXFLAGS])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:21: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:21: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:21: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:21: -1- AC_SUBST([CXX])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:21: -1- AC_SUBST([ac_ct_CXX])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([ac_ct_CXX])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:21: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:21: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:21: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:21: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:22: -1- AC_SUBST([CXX])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:22: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([CXXFLAGS])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:22: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:22: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:22: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:22: -1- AC_SUBST([CXX])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:22: -1- AC_SUBST([ac_ct_CXX])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([ac_ct_CXX])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:23: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_WIN32_DLL' is obsolete.
+You should run autoupdate.], [m4/ltoptions.m4:146: AC_LIBTOOL_WIN32_DLL is expanded from...
+configure.ac:23: the top level])
+m4trace:configure.ac:23: -1- AC_SUBST([AS])
+m4trace:configure.ac:23: -1- AC_SUBST_TRACE([AS])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^AS$])
+m4trace:configure.ac:23: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:23: -1- AC_SUBST_TRACE([DLLTOOL])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:23: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:23: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:23: -1- _m4_warn([obsolete], [AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.], [m4/ltoptions.m4:146: AC_LIBTOOL_WIN32_DLL is expanded from...
+configure.ac:23: the top level])
+m4trace:configure.ac:24: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete.
 You should run autoupdate.], [m4/libtool.m4:108: AM_PROG_LIBTOOL is expanded from...
-configure.ac:44: the top level])
-m4trace:configure.ac:44: -1- LT_INIT
-m4trace:configure.ac:44: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:44: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
-m4trace:configure.ac:44: -1- AC_SUBST([LIBTOOL])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([LIBTOOL])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:44: -1- AC_SUBST([SED])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([SED])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:44: -1- AC_SUBST([GREP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:44: -1- AC_SUBST([EGREP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([EGREP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:44: -1- AC_SUBST([FGREP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([FGREP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:44: -1- AC_SUBST([GREP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:44: -1- AC_SUBST([LD])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([LD])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:44: -1- AC_SUBST([DUMPBIN])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([DUMPBIN])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:44: -1- AC_SUBST([ac_ct_DUMPBIN])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-m4trace:configure.ac:44: -1- AC_SUBST([DUMPBIN])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([DUMPBIN])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:44: -1- AC_SUBST([NM])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([NM])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:44: -1- AC_SUBST([LN_S], [$as_ln_s])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([LN_S])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:44: -1- AC_SUBST([OBJDUMP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([OBJDUMP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:44: -1- AC_SUBST([OBJDUMP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([OBJDUMP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:44: -1- AC_SUBST([DLLTOOL])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([DLLTOOL])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:44: -1- AC_SUBST([DLLTOOL])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([DLLTOOL])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:44: -1- AC_SUBST([AR])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([AR])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:44: -1- AC_SUBST([ac_ct_AR])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([ac_ct_AR])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^ac_ct_AR$])
-m4trace:configure.ac:44: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([STRIP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:44: -1- AC_SUBST([RANLIB])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([RANLIB])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:44: -1- AC_SUBST([AWK])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([AWK])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:44: -1- m4_pattern_allow([LT_OBJDIR])
-m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:44: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory in which libtool stores uninstalled libraries.
+configure.ac:24: the top level])
+m4trace:configure.ac:24: -1- LT_INIT
+m4trace:configure.ac:24: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
+m4trace:configure.ac:24: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:24: -1- AC_SUBST([LIBTOOL])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([LIBTOOL])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LIBTOOL$])
+m4trace:configure.ac:24: -1- AC_SUBST([SED])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([SED])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:24: -1- AC_SUBST([GREP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:24: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([EGREP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:24: -1- AC_SUBST([FGREP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([FGREP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:24: -1- AC_SUBST([GREP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:24: -1- AC_SUBST([LD])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([LD])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:24: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([DUMPBIN])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:24: -1- AC_SUBST([ac_ct_DUMPBIN])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:24: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([DUMPBIN])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:24: -1- AC_SUBST([NM])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([NM])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^NM$])
+m4trace:configure.ac:24: -1- AC_SUBST([LN_S], [$as_ln_s])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([LN_S])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:24: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:24: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:24: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([DLLTOOL])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:24: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([DLLTOOL])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:24: -1- AC_SUBST([AR])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:24: -1- AC_SUBST([ac_ct_AR])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([ac_ct_AR])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^ac_ct_AR$])
+m4trace:configure.ac:24: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:24: -1- AC_SUBST([RANLIB])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:24: -1- AC_SUBST([AWK])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([AWK])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:24: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LT_OBJDIR$])
+m4trace:configure.ac:24: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 @%:@undef LT_OBJDIR])
-m4trace:configure.ac:44: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:44: -1- AC_SUBST([MANIFEST_TOOL])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([MANIFEST_TOOL])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^MANIFEST_TOOL$])
-m4trace:configure.ac:44: -1- AC_SUBST([DSYMUTIL])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([DSYMUTIL])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:44: -1- AC_SUBST([NMEDIT])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([NMEDIT])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^NMEDIT$])
-m4trace:configure.ac:44: -1- AC_SUBST([LIPO])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([LIPO])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LIPO$])
-m4trace:configure.ac:44: -1- AC_SUBST([OTOOL])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([OTOOL])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OTOOL$])
-m4trace:configure.ac:44: -1- AC_SUBST([OTOOL64])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([OTOOL64])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
+m4trace:configure.ac:24: -1- LT_SUPPORTED_TAG([CC])
+m4trace:configure.ac:24: -1- AC_SUBST([MANIFEST_TOOL])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([MANIFEST_TOOL])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^MANIFEST_TOOL$])
+m4trace:configure.ac:24: -1- AC_SUBST([DSYMUTIL])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([DSYMUTIL])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:24: -1- AC_SUBST([NMEDIT])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([NMEDIT])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:24: -1- AC_SUBST([LIPO])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([LIPO])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:24: -1- AC_SUBST([OTOOL])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([OTOOL])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:24: -1- AC_SUBST([OTOOL64])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([OTOOL64])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^OTOOL64$])
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
 @%:@undef HAVE_DLFCN_H])
-m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:44: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+m4trace:configure.ac:24: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:24: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
 @%:@undef STDC_HEADERS])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
 @%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
 @%:@undef HAVE_SYS_STAT_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
 @%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
 @%:@undef HAVE_STRING_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
 @%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
 @%:@undef HAVE_STRINGS_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 @%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:44: -1- LT_SUPPORTED_TAG([CXX])
-m4trace:configure.ac:44: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:44: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:44: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:44: -1- AC_SUBST([LD])
-m4trace:configure.ac:44: -1- AC_SUBST_TRACE([LD])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:45: -1- AM_INIT_AUTOMAKE([ccrtp], [$VERSION])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:45: -1- AM_AUTOMAKE_VERSION([1.13.4])
-m4trace:configure.ac:45: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:45: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:45: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:45: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__isrc])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:45: -1- AC_SUBST([CYGPATH_W])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([CYGPATH_W])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:45: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [aclocal.m4:647: AM_INIT_AUTOMAKE is expanded from...
-configure.ac:45: the top level])
-m4trace:configure.ac:45: -1- AC_SUBST([PACKAGE], [ccrtp])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([PACKAGE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:45: -1- AC_SUBST([VERSION], [$VERSION])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([VERSION])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:45: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
+m4trace:configure.ac:24: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
+m4trace:configure.ac:24: -1- LT_SUPPORTED_TAG([CXX])
+m4trace:configure.ac:24: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:24: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:24: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:24: -1- AC_SUBST([LD])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([LD])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:25: -1- AM_INIT_AUTOMAKE([dist-zip])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:25: -1- AM_AUTOMAKE_VERSION([1.13.4])
+m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__isrc])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:25: -1- AC_SUBST([CYGPATH_W])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CYGPATH_W])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:25: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([PACKAGE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:25: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([VERSION])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:25: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
 @%:@undef PACKAGE])
-m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:45: -1- AH_OUTPUT([VERSION], [/* Version number of package */
+m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:25: -1- AH_OUTPUT([VERSION], [/* Version number of package */
 @%:@undef VERSION])
-m4trace:configure.ac:45: -1- AC_REQUIRE_AUX_FILE([missing])
-m4trace:configure.ac:45: -1- AC_SUBST([ACLOCAL])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([ACLOCAL])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:45: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AUTOCONF])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:45: -1- AC_SUBST([AUTOMAKE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AUTOMAKE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:45: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AUTOHEADER])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:45: -1- AC_SUBST([MAKEINFO])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([MAKEINFO])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:45: -1- AC_SUBST([install_sh])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([install_sh])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:45: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([STRIP])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:45: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:45: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:45: -1- AC_SUBST([MKDIR_P])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:45: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([mkdir_p])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:45: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([SET_MAKE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__leading_dot])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__leading_dot])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:45: -1- AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AMTAR])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__tar])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__tar])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__untar])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__untar])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:45: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([DEPDIR])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__include])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__include])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__quote])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__quote])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:45: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:45: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AMDEP_TRUE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:45: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AMDEP_FALSE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:45: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:45: -1- AC_SUBST([am__nodep])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__nodep])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__nodep$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__nodep])
-m4trace:configure.ac:45: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([CCDEPMODE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:45: -1- AM_CONDITIONAL([am__fastdepCC], [
+m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([missing])
+m4trace:configure.ac:25: -1- AC_SUBST([ACLOCAL])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([ACLOCAL])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:25: -1- AC_SUBST([AUTOCONF])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AUTOCONF])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:25: -1- AC_SUBST([AUTOMAKE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AUTOMAKE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:25: -1- AC_SUBST([AUTOHEADER])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AUTOHEADER])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:25: -1- AC_SUBST([MAKEINFO])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([MAKEINFO])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:25: -1- AC_SUBST([install_sh])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([install_sh])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:25: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:25: -1- AC_SUBST([MKDIR_P])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:25: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([mkdir_p])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:25: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([SET_MAKE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__leading_dot])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__leading_dot])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:25: -1- AC_SUBST([AMTAR], ['$${TAR-tar}'])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AMTAR])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__tar])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__tar])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__untar])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__untar])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:25: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([DEPDIR])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__include])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__include])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__quote])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__quote])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:25: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:25: -1- AC_SUBST([AMDEP_TRUE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AMDEP_TRUE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:25: -1- AC_SUBST([AMDEP_FALSE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AMDEP_FALSE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:25: -1- AC_SUBST([AMDEPBACKSLASH])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:25: -1- AC_SUBST([am__nodep])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__nodep])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__nodep$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__nodep])
+m4trace:configure.ac:25: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CCDEPMODE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:25: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:45: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:45: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([CXXDEPMODE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:45: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:25: -1- AC_SUBST([am__fastdepCC_TRUE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:25: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CXXDEPMODE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:25: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:45: -1- AC_SUBST([am__fastdepCXX_TRUE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:45: -1- AC_SUBST([am__fastdepCXX_FALSE])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:45: -1- AM_SILENT_RULES
-m4trace:configure.ac:45: -1- AC_SUBST([AM_V])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AM_V])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_V$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AM_V])
-m4trace:configure.ac:45: -1- AC_SUBST([AM_DEFAULT_V])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AM_DEFAULT_V])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_DEFAULT_V$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
-m4trace:configure.ac:45: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
-m4trace:configure.ac:45: -1- AC_SUBST([AM_BACKSLASH])
-m4trace:configure.ac:45: -1- AC_SUBST_TRACE([AM_BACKSLASH])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^AM_BACKSLASH$])
-m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
-m4trace:configure.ac:46: -1- _m4_warn([obsolete], ['AM_CONFIG_HEADER': this macro is obsolete.
+m4trace:configure.ac:25: -1- AC_SUBST([am__fastdepCXX_TRUE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:25: -1- AC_SUBST([am__fastdepCXX_FALSE])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:25: -1- AM_SILENT_RULES
+m4trace:configure.ac:25: -1- AC_SUBST([AM_V])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AM_V])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_V$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AM_V])
+m4trace:configure.ac:25: -1- AC_SUBST([AM_DEFAULT_V])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AM_DEFAULT_V])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_DEFAULT_V$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
+m4trace:configure.ac:25: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
+m4trace:configure.ac:25: -1- AC_SUBST([AM_BACKSLASH])
+m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AM_BACKSLASH])
+m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_BACKSLASH$])
+m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
+m4trace:configure.ac:26: -1- _m4_warn([obsolete], ['AM_CONFIG_HEADER': this macro is obsolete.
 You should use the 'AC_CONFIG_HEADERS' macro instead.], [aclocal.m4:949: AM_CONFIG_HEADER is expanded from...
-configure.ac:46: the top level])
-m4trace:configure.ac:46: -1- AC_CONFIG_HEADERS([ccrtp-config.h])
-m4trace:configure.ac:48: -1- AH_OUTPUT([restrict], [/* Define to the equivalent of the C99 \'restrict\' keyword, or to
+configure.ac:26: the top level])
+m4trace:configure.ac:26: -1- AC_CONFIG_HEADERS([ccrtp-config.h])
+m4trace:configure.ac:28: -1- AH_OUTPUT([restrict], [/* Define to the equivalent of the C99 \'restrict\' keyword, or to
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #undef restrict
@@ -601,184 +614,184 @@
 # define _Restrict
 # define __restrict__
 #endif])
-m4trace:configure.ac:48: -1- AC_DEFINE_TRACE_LITERAL([restrict])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^restrict$])
-m4trace:configure.ac:48: -1- AC_DEFINE_TRACE_LITERAL([restrict])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^restrict$])
-m4trace:configure.ac:49: -1- AC_DEFINE_TRACE_LITERAL([volatile])
-m4trace:configure.ac:49: -1- m4_pattern_allow([^volatile$])
-m4trace:configure.ac:49: -1- AH_OUTPUT([volatile], [/* Define to empty if the keyword `volatile\' does not work. Warning: valid
+m4trace:configure.ac:28: -1- AC_DEFINE_TRACE_LITERAL([restrict])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^restrict$])
+m4trace:configure.ac:28: -1- AC_DEFINE_TRACE_LITERAL([restrict])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^restrict$])
+m4trace:configure.ac:29: -1- AC_DEFINE_TRACE_LITERAL([volatile])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^volatile$])
+m4trace:configure.ac:29: -1- AH_OUTPUT([volatile], [/* Define to empty if the keyword `volatile\' does not work. Warning: valid
    code using `volatile\' can become incorrect without. Disable with care. */
 @%:@undef volatile])
-m4trace:configure.ac:50: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
+m4trace:configure.ac:30: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
    calls it, or to nothing if \'inline\' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([SRTP_SUPPORT])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^SRTP_SUPPORT$])
-m4trace:configure.ac:82: -1- AH_OUTPUT([SRTP_SUPPORT], [/* SRTP support */
+m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([SRTP_SUPPORT])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^SRTP_SUPPORT$])
+m4trace:configure.ac:38: -1- AH_OUTPUT([SRTP_SUPPORT], [/* SRTP support */
 @%:@undef SRTP_SUPPORT])
-m4trace:configure.ac:90: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.ac:46: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
 m4/libgcrypt_local.m4:23: AM_PATH_LIBGCRYPT_CCRTP is expanded from...
-configure.ac:90: the top level])
-m4trace:configure.ac:90: -1- AC_SUBST([LIBGCRYPT_CONFIG])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([LIBGCRYPT_CONFIG])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIBGCRYPT_CONFIG$])
-m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_GCRYPT_H], [/* Define to 1 if you have the <gcrypt.h> header file. */
+configure.ac:46: the top level])
+m4trace:configure.ac:46: -1- AC_SUBST([LIBGCRYPT_CONFIG])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LIBGCRYPT_CONFIG])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LIBGCRYPT_CONFIG$])
+m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_GCRYPT_H], [/* Define to 1 if you have the <gcrypt.h> header file. */
 @%:@undef HAVE_GCRYPT_H])
-m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GCRYPT_H])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^HAVE_GCRYPT_H$])
-m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_OPENSSL_BN_H], [/* Define to 1 if you have the <openssl/bn.h> header file. */
+m4trace:configure.ac:46: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GCRYPT_H])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^HAVE_GCRYPT_H$])
+m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_OPENSSL_BN_H], [/* Define to 1 if you have the <openssl/bn.h> header file. */
 @%:@undef HAVE_OPENSSL_BN_H])
-m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_OPENSSL_AES_H], [/* Define to 1 if you have the <openssl/aes.h> header file. */
+m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_OPENSSL_AES_H], [/* Define to 1 if you have the <openssl/aes.h> header file. */
 @%:@undef HAVE_OPENSSL_AES_H])
-m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_OPENSSL_SHA_H], [/* Define to 1 if you have the <openssl/sha.h> header file. */
+m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_OPENSSL_SHA_H], [/* Define to 1 if you have the <openssl/sha.h> header file. */
 @%:@undef HAVE_OPENSSL_SHA_H])
-m4trace:configure.ac:90: -1- AC_SUBST([LIBGCRYPT_CFLAGS])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([LIBGCRYPT_CFLAGS])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIBGCRYPT_CFLAGS$])
-m4trace:configure.ac:90: -1- AC_SUBST([LIBGCRYPT_LIBS])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([LIBGCRYPT_LIBS])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^LIBGCRYPT_LIBS$])
-m4trace:configure.ac:107: -1- AM_CONDITIONAL([SRTP_OPENSSL], [test "$openssl" = "true"])
-m4trace:configure.ac:107: -1- AC_SUBST([SRTP_OPENSSL_TRUE])
-m4trace:configure.ac:107: -1- AC_SUBST_TRACE([SRTP_OPENSSL_TRUE])
-m4trace:configure.ac:107: -1- m4_pattern_allow([^SRTP_OPENSSL_TRUE$])
-m4trace:configure.ac:107: -1- AC_SUBST([SRTP_OPENSSL_FALSE])
-m4trace:configure.ac:107: -1- AC_SUBST_TRACE([SRTP_OPENSSL_FALSE])
-m4trace:configure.ac:107: -1- m4_pattern_allow([^SRTP_OPENSSL_FALSE$])
-m4trace:configure.ac:107: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_TRUE])
-m4trace:configure.ac:107: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_FALSE])
-m4trace:configure.ac:108: -1- AM_CONDITIONAL([SRTP_GCRYPT], [test "$gcrypt" = "true"])
-m4trace:configure.ac:108: -1- AC_SUBST([SRTP_GCRYPT_TRUE])
-m4trace:configure.ac:108: -1- AC_SUBST_TRACE([SRTP_GCRYPT_TRUE])
-m4trace:configure.ac:108: -1- m4_pattern_allow([^SRTP_GCRYPT_TRUE$])
-m4trace:configure.ac:108: -1- AC_SUBST([SRTP_GCRYPT_FALSE])
-m4trace:configure.ac:108: -1- AC_SUBST_TRACE([SRTP_GCRYPT_FALSE])
-m4trace:configure.ac:108: -1- m4_pattern_allow([^SRTP_GCRYPT_FALSE$])
-m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_TRUE])
-m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_FALSE])
-m4trace:configure.ac:113: -1- AC_SUBST([LT_RELEASE])
-m4trace:configure.ac:113: -1- AC_SUBST_TRACE([LT_RELEASE])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_RELEASE$])
-m4trace:configure.ac:113: -1- AC_SUBST([LT_SUBVER])
-m4trace:configure.ac:113: -1- AC_SUBST_TRACE([LT_SUBVER])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_SUBVER$])
-m4trace:configure.ac:113: -1- AC_SUBST([LT_MAJOR])
-m4trace:configure.ac:113: -1- AC_SUBST_TRACE([LT_MAJOR])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_MAJOR$])
-m4trace:configure.ac:113: -1- AC_SUBST([LT_MINOR])
-m4trace:configure.ac:113: -1- AC_SUBST_TRACE([LT_MINOR])
-m4trace:configure.ac:113: -1- m4_pattern_allow([^LT_MINOR$])
-m4trace:configure.ac:114: -1- AC_SUBST([RANLIB])
-m4trace:configure.ac:114: -1- AC_SUBST_TRACE([RANLIB])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:114: -1- AC_SUBST([LT_CCXX_VERSION])
-m4trace:configure.ac:114: -1- AC_SUBST_TRACE([LT_CCXX_VERSION])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^LT_CCXX_VERSION$])
-m4trace:configure.ac:116: -1- AM_MAINTAINER_MODE
-m4trace:configure.ac:116: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-m4trace:configure.ac:116: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
-m4trace:configure.ac:116: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
-m4trace:configure.ac:116: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
-m4trace:configure.ac:116: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
-m4trace:configure.ac:116: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
-m4trace:configure.ac:116: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
-m4trace:configure.ac:116: -1- AC_SUBST([MAINT])
-m4trace:configure.ac:116: -1- AC_SUBST_TRACE([MAINT])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^MAINT$])
-m4trace:configure.ac:116: -1- AC_SUBST([FTPDIR])
-m4trace:configure.ac:116: -1- AC_SUBST_TRACE([FTPDIR])
-m4trace:configure.ac:116: -1- m4_pattern_allow([^FTPDIR$])
-m4trace:configure.ac:117: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-m4trace:configure.ac:117: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:117: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:117: -1- AC_SUBST([PKG_CONFIG_PATH])
-m4trace:configure.ac:117: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
-m4trace:configure.ac:117: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:117: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-m4trace:configure.ac:117: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:117: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:117: -1- AC_SUBST([COMMONCPP_CFLAGS])
-m4trace:configure.ac:117: -1- AC_SUBST_TRACE([COMMONCPP_CFLAGS])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^COMMONCPP_CFLAGS$])
-m4trace:configure.ac:117: -1- AC_SUBST([COMMONCPP_LIBS])
-m4trace:configure.ac:117: -1- AC_SUBST_TRACE([COMMONCPP_LIBS])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^COMMONCPP_LIBS$])
-m4trace:configure.ac:120: -1- AC_SUBST([GNULIBS])
-m4trace:configure.ac:120: -1- AC_SUBST_TRACE([GNULIBS])
-m4trace:configure.ac:120: -1- m4_pattern_allow([^GNULIBS$])
-m4trace:configure.ac:128: -1- AC_SUBST([WARN_FLAGS])
-m4trace:configure.ac:128: -1- AC_SUBST_TRACE([WARN_FLAGS])
-m4trace:configure.ac:128: -1- m4_pattern_allow([^WARN_FLAGS$])
-m4trace:configure.ac:133: -1- AH_OUTPUT([HAVE_DL_H], [/* Define to 1 if you have the <DL.h> header file. */
+m4trace:configure.ac:46: -1- AC_SUBST([LIBGCRYPT_CFLAGS])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LIBGCRYPT_CFLAGS])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LIBGCRYPT_CFLAGS$])
+m4trace:configure.ac:46: -1- AC_SUBST([LIBGCRYPT_LIBS])
+m4trace:configure.ac:46: -1- AC_SUBST_TRACE([LIBGCRYPT_LIBS])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^LIBGCRYPT_LIBS$])
+m4trace:configure.ac:63: -1- AM_CONDITIONAL([SRTP_OPENSSL], [test "$openssl" = "true"])
+m4trace:configure.ac:63: -1- AC_SUBST([SRTP_OPENSSL_TRUE])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([SRTP_OPENSSL_TRUE])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^SRTP_OPENSSL_TRUE$])
+m4trace:configure.ac:63: -1- AC_SUBST([SRTP_OPENSSL_FALSE])
+m4trace:configure.ac:63: -1- AC_SUBST_TRACE([SRTP_OPENSSL_FALSE])
+m4trace:configure.ac:63: -1- m4_pattern_allow([^SRTP_OPENSSL_FALSE$])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_TRUE])
+m4trace:configure.ac:63: -1- _AM_SUBST_NOTMAKE([SRTP_OPENSSL_FALSE])
+m4trace:configure.ac:64: -1- AM_CONDITIONAL([SRTP_GCRYPT], [test "$gcrypt" = "true"])
+m4trace:configure.ac:64: -1- AC_SUBST([SRTP_GCRYPT_TRUE])
+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([SRTP_GCRYPT_TRUE])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^SRTP_GCRYPT_TRUE$])
+m4trace:configure.ac:64: -1- AC_SUBST([SRTP_GCRYPT_FALSE])
+m4trace:configure.ac:64: -1- AC_SUBST_TRACE([SRTP_GCRYPT_FALSE])
+m4trace:configure.ac:64: -1- m4_pattern_allow([^SRTP_GCRYPT_FALSE$])
+m4trace:configure.ac:64: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_TRUE])
+m4trace:configure.ac:64: -1- _AM_SUBST_NOTMAKE([SRTP_GCRYPT_FALSE])
+m4trace:configure.ac:69: -1- AC_SUBST([LT_RELEASE])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([LT_RELEASE])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_RELEASE$])
+m4trace:configure.ac:69: -1- AC_SUBST([LT_SUBVER])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([LT_SUBVER])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_SUBVER$])
+m4trace:configure.ac:69: -1- AC_SUBST([LT_MAJOR])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([LT_MAJOR])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_MAJOR$])
+m4trace:configure.ac:69: -1- AC_SUBST([LT_MINOR])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([LT_MINOR])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^LT_MINOR$])
+m4trace:configure.ac:70: -1- AC_SUBST([RANLIB])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.ac:70: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:70: -1- AC_SUBST([LT_CCXX_VERSION])
+m4trace:configure.ac:70: -1- AC_SUBST_TRACE([LT_CCXX_VERSION])
+m4trace:configure.ac:70: -1- m4_pattern_allow([^LT_CCXX_VERSION$])
+m4trace:configure.ac:72: -1- AM_MAINTAINER_MODE
+m4trace:configure.ac:72: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+m4trace:configure.ac:72: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
+m4trace:configure.ac:72: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
+m4trace:configure.ac:72: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
+m4trace:configure.ac:72: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
+m4trace:configure.ac:72: -1- AC_SUBST([MAINT])
+m4trace:configure.ac:72: -1- AC_SUBST_TRACE([MAINT])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^MAINT$])
+m4trace:configure.ac:72: -1- AC_SUBST([FTPDIR])
+m4trace:configure.ac:72: -1- AC_SUBST_TRACE([FTPDIR])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^FTPDIR$])
+m4trace:configure.ac:73: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4trace:configure.ac:73: -1- AC_SUBST([PKG_CONFIG])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([PKG_CONFIG])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:73: -1- AC_SUBST([PKG_CONFIG_PATH])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+m4trace:configure.ac:73: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+m4trace:configure.ac:73: -1- AC_SUBST([PKG_CONFIG])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([PKG_CONFIG])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:73: -1- AC_SUBST([COMMONCPP_CFLAGS])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([COMMONCPP_CFLAGS])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^COMMONCPP_CFLAGS$])
+m4trace:configure.ac:73: -1- AC_SUBST([COMMONCPP_LIBS])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([COMMONCPP_LIBS])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^COMMONCPP_LIBS$])
+m4trace:configure.ac:76: -1- AC_SUBST([GNULIBS])
+m4trace:configure.ac:76: -1- AC_SUBST_TRACE([GNULIBS])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^GNULIBS$])
+m4trace:configure.ac:84: -1- AC_SUBST([WARN_FLAGS])
+m4trace:configure.ac:84: -1- AC_SUBST_TRACE([WARN_FLAGS])
+m4trace:configure.ac:84: -1- m4_pattern_allow([^WARN_FLAGS$])
+m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_DL_H], [/* Define to 1 if you have the <DL.h> header file. */
 @%:@undef HAVE_DL_H])
-m4trace:configure.ac:133: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DL_H])
-m4trace:configure.ac:133: -1- m4_pattern_allow([^HAVE_DL_H$])
-m4trace:configure.ac:133: -1- AH_OUTPUT([HAVE_LIBNANA], [/* Define to 1 if you have the `nana\' library (-lnana). */
+m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DL_H])
+m4trace:configure.ac:89: -1- m4_pattern_allow([^HAVE_DL_H$])
+m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBNANA], [/* Define to 1 if you have the `nana\' library (-lnana). */
 @%:@undef HAVE_LIBNANA])
-m4trace:configure.ac:133: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNANA])
-m4trace:configure.ac:133: -1- m4_pattern_allow([^HAVE_LIBNANA$])
-m4trace:configure.ac:142: -1- AC_SUBST([KDOC_DIR])
-m4trace:configure.ac:142: -1- AC_SUBST_TRACE([KDOC_DIR])
-m4trace:configure.ac:142: -1- m4_pattern_allow([^KDOC_DIR$])
-m4trace:configure.ac:143: -1- AC_SUBST([LT_VERSION])
-m4trace:configure.ac:143: -1- AC_SUBST_TRACE([LT_VERSION])
-m4trace:configure.ac:143: -1- m4_pattern_allow([^LT_VERSION$])
-m4trace:configure.ac:145: -1- AC_SUBST([DOXYGEN])
-m4trace:configure.ac:145: -1- AC_SUBST_TRACE([DOXYGEN])
-m4trace:configure.ac:145: -1- m4_pattern_allow([^DOXYGEN$])
-m4trace:configure.ac:146: -1- AC_SUBST([DOXYGEN])
-m4trace:configure.ac:146: -1- AC_SUBST_TRACE([DOXYGEN])
-m4trace:configure.ac:146: -1- m4_pattern_allow([^DOXYGEN$])
-m4trace:configure.ac:147: -1- AM_CONDITIONAL([DOXY], [test "$DOXYGEN" != "no"])
-m4trace:configure.ac:147: -1- AC_SUBST([DOXY_TRUE])
-m4trace:configure.ac:147: -1- AC_SUBST_TRACE([DOXY_TRUE])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^DOXY_TRUE$])
-m4trace:configure.ac:147: -1- AC_SUBST([DOXY_FALSE])
-m4trace:configure.ac:147: -1- AC_SUBST_TRACE([DOXY_FALSE])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^DOXY_FALSE$])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([DOXY_TRUE])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([DOXY_FALSE])
-m4trace:configure.ac:149: -1- AC_CONFIG_FILES([Makefile m4/Makefile src/Makefile src/ccrtp/Makefile
+m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNANA])
+m4trace:configure.ac:89: -1- m4_pattern_allow([^HAVE_LIBNANA$])
+m4trace:configure.ac:98: -1- AC_SUBST([KDOC_DIR])
+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([KDOC_DIR])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^KDOC_DIR$])
+m4trace:configure.ac:99: -1- AC_SUBST([LT_VERSION])
+m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LT_VERSION])
+m4trace:configure.ac:99: -1- m4_pattern_allow([^LT_VERSION$])
+m4trace:configure.ac:101: -1- AC_SUBST([DOXYGEN])
+m4trace:configure.ac:101: -1- AC_SUBST_TRACE([DOXYGEN])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^DOXYGEN$])
+m4trace:configure.ac:102: -1- AC_SUBST([DOXYGEN])
+m4trace:configure.ac:102: -1- AC_SUBST_TRACE([DOXYGEN])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^DOXYGEN$])
+m4trace:configure.ac:103: -1- AM_CONDITIONAL([DOXY], [test "$DOXYGEN" != "no"])
+m4trace:configure.ac:103: -1- AC_SUBST([DOXY_TRUE])
+m4trace:configure.ac:103: -1- AC_SUBST_TRACE([DOXY_TRUE])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^DOXY_TRUE$])
+m4trace:configure.ac:103: -1- AC_SUBST([DOXY_FALSE])
+m4trace:configure.ac:103: -1- AC_SUBST_TRACE([DOXY_FALSE])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^DOXY_FALSE$])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([DOXY_TRUE])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([DOXY_FALSE])
+m4trace:configure.ac:105: -1- AC_CONFIG_FILES([Makefile m4/Makefile src/Makefile src/ccrtp/Makefile
 doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec
-libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile])
-m4trace:configure.ac:149: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile directive])
+m4trace:configure.ac:105: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.ac:149: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:149: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:149: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:149: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:149: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:149: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:149: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:149: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:149: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:149: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:105: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:105: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:105: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:105: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:105: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:105: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:105: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/jni/libccrtp/sources/ccrtp-config.h b/jni/libccrtp/sources/ccrtp-config.h
index 464a645..bf7faf2 100644
--- a/jni/libccrtp/sources/ccrtp-config.h
+++ b/jni/libccrtp/sources/ccrtp-config.h
@@ -60,19 +60,19 @@
 #define PACKAGE_BUGREPORT ""
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "ccrtp"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "ccrtp 2.0.7"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "ccrtp"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "2.0.7"
 
 /* SRTP support */
 #define SRTP_SUPPORT /**/
@@ -81,7 +81,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.0.4"
+#define VERSION "2.0.7"
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
diff --git a/jni/libccrtp/sources/ccrtp.list b/jni/libccrtp/sources/ccrtp.list
index f21e9eb..417609d 100644
--- a/jni/libccrtp/sources/ccrtp.list
+++ b/jni/libccrtp/sources/ccrtp.list
@@ -13,7 +13,7 @@
 
 # Product information
 %product GNU C++ RTP Stack
-%version 2.0.4 -100
+%version 2.0.7 -100
 %copyright 2004 Federico Montesino Pouzols & Open Source Telecom Corporation
 %vendor Open Source Telecom Corp
 %license COPYING
@@ -26,9 +26,9 @@
 f 0644 root root ${libdir} ./src/*.la
 f 0644 root root ${libdir} ./src/.libs/*.a
 %system darwin
-f 0644 root root ${libdir} ./src/.libs/libccrtp1-2.0.4.dylib
-l 0644 root root ${libdir}/libccrtp1.dylib libccrtp1-2.0.4.dylib
-l 0644 root root ${libdir}/libccrtp1.dylib-2.0.4.2.0.dylib libccrtp1-2.0.4.dylib
+f 0644 root root ${libdir} ./src/.libs/libccrtp1-2.0.7.dylib
+l 0644 root root ${libdir}/libccrtp1.dylib libccrtp1-2.0.7.dylib
+l 0644 root root ${libdir}/libccrtp1.dylib-2.0.7.2.0.dylib libccrtp1-2.0.7.dylib
 %system freebsd
 f 0644 root root ${libdir} ./src/.libs/libccrtp1-.so.*
 %system linux solaris
diff --git a/jni/libccrtp/sources/ccrtp.spec b/jni/libccrtp/sources/ccrtp.spec
index 4fa9a6a..94beb47 100644
--- a/jni/libccrtp/sources/ccrtp.spec
+++ b/jni/libccrtp/sources/ccrtp.spec
@@ -1,5 +1,5 @@
 %{!?release: %define release 0}
-%{!?version: %define version 2.0.4}
+%{!?version: %define version 2.0.7}
 
 %define _libname libccrtp2
 %define _devname libccrtp-devel
@@ -84,5 +84,5 @@
 %postun -n %{_libname} -p /sbin/ldconfig
 
 %changelog
-* Tue Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
+* Thu Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
 - Add Skein MAC authentication algorithm
diff --git a/jni/libccrtp/sources/ccrtp.spec.cmake b/jni/libccrtp/sources/ccrtp.spec.cmake
index 735a59f..eae5e2d 100644
--- a/jni/libccrtp/sources/ccrtp.spec.cmake
+++ b/jni/libccrtp/sources/ccrtp.spec.cmake
@@ -87,6 +87,6 @@
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/ccrtp.info.gz
 
 %changelog
-* Tue Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
+* Thu Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
 - Add Skein MAC authentication algorithm
 
diff --git a/jni/libccrtp/sources/ccrtp.spec.in b/jni/libccrtp/sources/ccrtp.spec.in
index eefd0db..9e4fdb7 100644
--- a/jni/libccrtp/sources/ccrtp.spec.in
+++ b/jni/libccrtp/sources/ccrtp.spec.in
@@ -84,5 +84,5 @@
 %postun -n %{_libname} -p /sbin/ldconfig
 
 %changelog
-* Tue Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
+* Thu Jan 06 2011 - Werner Dittmann <werner.dittmann@t-online.de>
 - Add Skein MAC authentication algorithm
diff --git a/jni/libccrtp/sources/config.log b/jni/libccrtp/sources/config.log
index c6bccba..d41cf77 100644
--- a/jni/libccrtp/sources/config.log
+++ b/jni/libccrtp/sources/config.log
@@ -1,7 +1,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by configure, which was
+It was created by ccrtp configure 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ ./configure 
@@ -12,9 +12,9 @@
 
 hostname = pcal
 uname -m = x86_64
-uname -r = 3.12.7-300.fc20.x86_64
+uname -r = 3.13.4-200.fc20.x86_64
 uname -s = Linux
-uname -v = #1 SMP Fri Jan 10 15:35:31 UTC 2014
+uname -v = #1 SMP Thu Feb 20 23:00:47 UTC 2014
 
 /usr/bin/uname -p = x86_64
 /bin/uname -X     = unknown
@@ -42,8 +42,8 @@
 PATH: /home/lisional/Dev/ADT/ndk
 PATH: /home/lisional/.local/bin
 PATH: /home/lisional/Dev/ant/bin/ant
-PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.4.1.fc20.x86_64
-PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.4.1.fc20.x86_64/bin
+PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.5.1.fc20.x86_64
+PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.5.1.fc20.x86_64/bin
 PATH: /home/lisional/.local/bin
 PATH: /usr/local/bin
 PATH: /home/lisional/bin
@@ -52,32 +52,32 @@
 PATH: /home/lisional/Dev/ADT/ndk
 PATH: /home/lisional/.local/bin
 PATH: /home/lisional/Dev/ant/bin/ant
-PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.4.1.fc20.x86_64
-PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.4.1.fc20.x86_64/bin
+PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.5.1.fc20.x86_64
+PATH: /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.60-2.4.5.1.fc20.x86_64/bin
 
 
 ## ----------- ##
 ## Core tests. ##
 ## ----------- ##
 
-configure:2451: checking build system type
-configure:2465: result: x86_64-unknown-linux-gnu
-configure:2485: checking host system type
-configure:2498: result: x86_64-unknown-linux-gnu
-configure:2518: checking target system type
-configure:2531: result: x86_64-unknown-linux-gnu
-configure:2606: checking for gcc
-configure:2622: found /usr/lib64/ccache/gcc
-configure:2633: result: gcc
-configure:2862: checking for C compiler version
-configure:2871: gcc --version >&5
+configure:2434: checking build system type
+configure:2448: result: x86_64-unknown-linux-gnu
+configure:2468: checking host system type
+configure:2481: result: x86_64-unknown-linux-gnu
+configure:2501: checking target system type
+configure:2514: result: x86_64-unknown-linux-gnu
+configure:2589: checking for gcc
+configure:2605: found /usr/lib64/ccache/gcc
+configure:2616: result: gcc
+configure:2845: checking for C compiler version
+configure:2854: gcc --version >&5
 gcc (GCC) 4.8.2 20131212 (Red Hat 4.8.2-7)
 Copyright (C) 2013 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:2882: $? = 0
-configure:2871: gcc -v >&5
+configure:2865: $? = 0
+configure:2854: gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=/usr/bin/gcc
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/lto-wrapper
@@ -85,99 +85,99 @@
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin --enable-initfini-array --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-isl=/builddir/build/BUILD/gcc-4.8.2-20131212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.8.2-20131212/obj-x86_64-redhat-linux/cloog-install --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.8.2 20131212 (Red Hat 4.8.2-7) (GCC) 
-configure:2882: $? = 0
-configure:2871: gcc -V >&5
+configure:2865: $? = 0
+configure:2854: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2882: $? = 4
-configure:2871: gcc -qversion >&5
+configure:2865: $? = 4
+configure:2854: gcc -qversion >&5
 gcc: error: unrecognized command line option '-qversion'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2882: $? = 4
-configure:2902: checking whether the C compiler works
-configure:2924: gcc    conftest.c  >&5
-configure:2928: $? = 0
-configure:2976: result: yes
-configure:2979: checking for C compiler default output file name
-configure:2981: result: a.out
-configure:2987: checking for suffix of executables
-configure:2994: gcc -o conftest    conftest.c  >&5
-configure:2998: $? = 0
-configure:3020: result: 
-configure:3042: checking whether we are cross compiling
-configure:3050: gcc -o conftest    conftest.c  >&5
-configure:3054: $? = 0
-configure:3061: ./conftest
-configure:3065: $? = 0
-configure:3080: result: no
-configure:3085: checking for suffix of object files
-configure:3107: gcc -c   conftest.c >&5
-configure:3111: $? = 0
-configure:3132: result: o
-configure:3136: checking whether we are using the GNU C compiler
-configure:3155: gcc -c   conftest.c >&5
-configure:3155: $? = 0
-configure:3164: result: yes
-configure:3173: checking whether gcc accepts -g
-configure:3193: gcc -c -g  conftest.c >&5
-configure:3193: $? = 0
-configure:3234: result: yes
-configure:3251: checking for gcc option to accept ISO C89
-configure:3314: gcc  -c -g -O2  conftest.c >&5
-configure:3314: $? = 0
-configure:3327: result: none needed
-configure:3352: checking how to run the C preprocessor
-configure:3383: gcc -E  conftest.c
-configure:3383: $? = 0
-configure:3397: gcc -E  conftest.c
+configure:2865: $? = 4
+configure:2885: checking whether the C compiler works
+configure:2907: gcc    conftest.c  >&5
+configure:2911: $? = 0
+configure:2959: result: yes
+configure:2962: checking for C compiler default output file name
+configure:2964: result: a.out
+configure:2970: checking for suffix of executables
+configure:2977: gcc -o conftest    conftest.c  >&5
+configure:2981: $? = 0
+configure:3003: result: 
+configure:3025: checking whether we are cross compiling
+configure:3033: gcc -o conftest    conftest.c  >&5
+configure:3037: $? = 0
+configure:3044: ./conftest
+configure:3048: $? = 0
+configure:3063: result: no
+configure:3068: checking for suffix of object files
+configure:3090: gcc -c   conftest.c >&5
+configure:3094: $? = 0
+configure:3115: result: o
+configure:3119: checking whether we are using the GNU C compiler
+configure:3138: gcc -c   conftest.c >&5
+configure:3138: $? = 0
+configure:3147: result: yes
+configure:3156: checking whether gcc accepts -g
+configure:3176: gcc -c -g  conftest.c >&5
+configure:3176: $? = 0
+configure:3217: result: yes
+configure:3234: checking for gcc option to accept ISO C89
+configure:3297: gcc  -c -g -O2  conftest.c >&5
+configure:3297: $? = 0
+configure:3310: result: none needed
+configure:3335: checking how to run the C preprocessor
+configure:3366: gcc -E  conftest.c
+configure:3366: $? = 0
+configure:3380: gcc -E  conftest.c
 conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3397: $? = 1
+configure:3380: $? = 1
 configure: failed program was:
 | /* confdefs.h */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
+| #define PACKAGE_NAME "ccrtp"
+| #define PACKAGE_TARNAME "ccrtp"
+| #define PACKAGE_VERSION "2.0.7"
+| #define PACKAGE_STRING "ccrtp 2.0.7"
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3422: result: gcc -E
-configure:3442: gcc -E  conftest.c
-configure:3442: $? = 0
-configure:3456: gcc -E  conftest.c
+configure:3405: result: gcc -E
+configure:3425: gcc -E  conftest.c
+configure:3425: $? = 0
+configure:3439: gcc -E  conftest.c
 conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3456: $? = 1
+configure:3439: $? = 1
 configure: failed program was:
 | /* confdefs.h */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
+| #define PACKAGE_NAME "ccrtp"
+| #define PACKAGE_TARNAME "ccrtp"
+| #define PACKAGE_VERSION "2.0.7"
+| #define PACKAGE_STRING "ccrtp 2.0.7"
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3542: checking for g++
-configure:3558: found /usr/lib64/ccache/g++
-configure:3569: result: g++
-configure:3596: checking for C++ compiler version
-configure:3605: g++ --version >&5
+configure:3525: checking for g++
+configure:3541: found /usr/lib64/ccache/g++
+configure:3552: result: g++
+configure:3579: checking for C++ compiler version
+configure:3588: g++ --version >&5
 g++ (GCC) 4.8.2 20131212 (Red Hat 4.8.2-7)
 Copyright (C) 2013 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:3616: $? = 0
-configure:3605: g++ -v >&5
+configure:3599: $? = 0
+configure:3588: g++ -v >&5
 Using built-in specs.
 COLLECT_GCC=/usr/bin/g++
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/lto-wrapper
@@ -185,72 +185,72 @@
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin --enable-initfini-array --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-isl=/builddir/build/BUILD/gcc-4.8.2-20131212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.8.2-20131212/obj-x86_64-redhat-linux/cloog-install --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.8.2 20131212 (Red Hat 4.8.2-7) (GCC) 
-configure:3616: $? = 0
-configure:3605: g++ -V >&5
+configure:3599: $? = 0
+configure:3588: g++ -V >&5
 g++: error: unrecognized command line option '-V'
 g++: fatal error: no input files
 compilation terminated.
-configure:3616: $? = 4
-configure:3605: g++ -qversion >&5
+configure:3599: $? = 4
+configure:3588: g++ -qversion >&5
 g++: error: unrecognized command line option '-qversion'
 g++: fatal error: no input files
 compilation terminated.
-configure:3616: $? = 4
-configure:3620: checking whether we are using the GNU C++ compiler
-configure:3639: g++ -c   conftest.cpp >&5
-configure:3639: $? = 0
-configure:3648: result: yes
-configure:3657: checking whether g++ accepts -g
-configure:3677: g++ -c -g  conftest.cpp >&5
-configure:3677: $? = 0
-configure:3718: result: yes
-configure:3746: checking how to run the C++ preprocessor
-configure:3773: g++ -E  conftest.cpp
-configure:3773: $? = 0
-configure:3787: g++ -E  conftest.cpp
+configure:3599: $? = 4
+configure:3603: checking whether we are using the GNU C++ compiler
+configure:3622: g++ -c   conftest.cpp >&5
+configure:3622: $? = 0
+configure:3631: result: yes
+configure:3640: checking whether g++ accepts -g
+configure:3660: g++ -c -g  conftest.cpp >&5
+configure:3660: $? = 0
+configure:3701: result: yes
+configure:3729: checking how to run the C++ preprocessor
+configure:3756: g++ -E  conftest.cpp
+configure:3756: $? = 0
+configure:3770: g++ -E  conftest.cpp
 conftest.cpp:9:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3787: $? = 1
+configure:3770: $? = 1
 configure: failed program was:
 | /* confdefs.h */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
+| #define PACKAGE_NAME "ccrtp"
+| #define PACKAGE_TARNAME "ccrtp"
+| #define PACKAGE_VERSION "2.0.7"
+| #define PACKAGE_STRING "ccrtp 2.0.7"
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3812: result: g++ -E
-configure:3832: g++ -E  conftest.cpp
-configure:3832: $? = 0
-configure:3846: g++ -E  conftest.cpp
+configure:3795: result: g++ -E
+configure:3815: g++ -E  conftest.cpp
+configure:3815: $? = 0
+configure:3829: g++ -E  conftest.cpp
 conftest.cpp:9:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3846: $? = 1
+configure:3829: $? = 1
 configure: failed program was:
 | /* confdefs.h */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
+| #define PACKAGE_NAME "ccrtp"
+| #define PACKAGE_TARNAME "ccrtp"
+| #define PACKAGE_VERSION "2.0.7"
+| #define PACKAGE_STRING "ccrtp 2.0.7"
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3986: checking for C++ compiler version
-configure:3995: g++ --version >&5
+configure:3969: checking for C++ compiler version
+configure:3978: g++ --version >&5
 g++ (GCC) 4.8.2 20131212 (Red Hat 4.8.2-7)
 Copyright (C) 2013 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:4006: $? = 0
-configure:3995: g++ -v >&5
+configure:3989: $? = 0
+configure:3978: g++ -v >&5
 Using built-in specs.
 COLLECT_GCC=/usr/bin/g++
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/lto-wrapper
@@ -258,212 +258,211 @@
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin --enable-initfini-array --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-isl=/builddir/build/BUILD/gcc-4.8.2-20131212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.8.2-20131212/obj-x86_64-redhat-linux/cloog-install --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.8.2 20131212 (Red Hat 4.8.2-7) (GCC) 
-configure:4006: $? = 0
-configure:3995: g++ -V >&5
+configure:3989: $? = 0
+configure:3978: g++ -V >&5
 g++: error: unrecognized command line option '-V'
 g++: fatal error: no input files
 compilation terminated.
-configure:4006: $? = 4
-configure:3995: g++ -qversion >&5
+configure:3989: $? = 4
+configure:3978: g++ -qversion >&5
 g++: error: unrecognized command line option '-qversion'
 g++: fatal error: no input files
 compilation terminated.
-configure:4006: $? = 4
-configure:4010: checking whether we are using the GNU C++ compiler
-configure:4038: result: yes
-configure:4047: checking whether g++ accepts -g
-configure:4108: result: yes
-configure:4178: checking how to print strings
-configure:4205: result: printf
-configure:4226: checking for a sed that does not truncate output
-configure:4290: result: /usr/bin/sed
-configure:4308: checking for grep that handles long lines and -e
-configure:4366: result: /usr/bin/grep
-configure:4371: checking for egrep
-configure:4433: result: /usr/bin/grep -E
-configure:4438: checking for fgrep
-configure:4500: result: /usr/bin/grep -F
-configure:4535: checking for ld used by gcc
-configure:4602: result: /usr/bin/ld
-configure:4609: checking if the linker (/usr/bin/ld) is GNU ld
-configure:4624: result: yes
-configure:4636: checking for BSD- or MS-compatible name lister (nm)
-configure:4685: result: /usr/bin/nm -B
-configure:4815: checking the name lister (/usr/bin/nm -B) interface
-configure:4822: gcc -c -g -O2  conftest.c >&5
-configure:4825: /usr/bin/nm -B "conftest.o"
-configure:4828: output
+configure:3989: $? = 4
+configure:3993: checking whether we are using the GNU C++ compiler
+configure:4021: result: yes
+configure:4030: checking whether g++ accepts -g
+configure:4091: result: yes
+configure:4463: checking how to print strings
+configure:4490: result: printf
+configure:4511: checking for a sed that does not truncate output
+configure:4575: result: /usr/bin/sed
+configure:4593: checking for grep that handles long lines and -e
+configure:4651: result: /usr/bin/grep
+configure:4656: checking for egrep
+configure:4718: result: /usr/bin/grep -E
+configure:4723: checking for fgrep
+configure:4785: result: /usr/bin/grep -F
+configure:4820: checking for ld used by gcc
+configure:4887: result: /usr/bin/ld
+configure:4894: checking if the linker (/usr/bin/ld) is GNU ld
+configure:4909: result: yes
+configure:4921: checking for BSD- or MS-compatible name lister (nm)
+configure:4970: result: /usr/bin/nm -B
+configure:5100: checking the name lister (/usr/bin/nm -B) interface
+configure:5107: gcc -c -g -O2  conftest.c >&5
+configure:5110: /usr/bin/nm -B "conftest.o"
+configure:5113: output
 0000000000000000 B some_variable
-configure:4835: result: BSD nm
-configure:4838: checking whether ln -s works
-configure:4842: result: yes
-configure:4850: checking the maximum length of command line arguments
-configure:4980: result: 1572864
-configure:4997: checking whether the shell understands some XSI constructs
-configure:5007: result: yes
-configure:5011: checking whether the shell understands "+="
-configure:5017: result: yes
-configure:5052: checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format
-configure:5092: result: func_convert_file_noop
-configure:5099: checking how to convert x86_64-unknown-linux-gnu file names to toolchain format
-configure:5119: result: func_convert_file_noop
-configure:5126: checking for /usr/bin/ld option to reload object files
-configure:5133: result: -r
-configure:5207: checking for objdump
-configure:5223: found /usr/bin/objdump
-configure:5234: result: objdump
-configure:5266: checking how to recognize dependent libraries
-configure:5468: result: pass_all
-configure:5553: checking for dlltool
-configure:5583: result: no
-configure:5613: checking how to associate runtime and link libraries
-configure:5640: result: printf %s\n
-configure:5701: checking for ar
-configure:5717: found /usr/bin/ar
-configure:5728: result: ar
-configure:5765: checking for archiver @FILE support
-configure:5782: gcc -c -g -O2  conftest.c >&5
-configure:5782: $? = 0
-configure:5785: ar cru libconftest.a @conftest.lst >&5
-configure:5788: $? = 0
-configure:5793: ar cru libconftest.a @conftest.lst >&5
+configure:5120: result: BSD nm
+configure:5123: checking whether ln -s works
+configure:5127: result: yes
+configure:5135: checking the maximum length of command line arguments
+configure:5265: result: 1572864
+configure:5282: checking whether the shell understands some XSI constructs
+configure:5292: result: yes
+configure:5296: checking whether the shell understands "+="
+configure:5302: result: yes
+configure:5337: checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format
+configure:5377: result: func_convert_file_noop
+configure:5384: checking how to convert x86_64-unknown-linux-gnu file names to toolchain format
+configure:5404: result: func_convert_file_noop
+configure:5411: checking for /usr/bin/ld option to reload object files
+configure:5418: result: -r
+configure:5492: checking for objdump
+configure:5519: result: objdump
+configure:5548: checking how to recognize dependent libraries
+configure:5750: result: pass_all
+configure:5835: checking for dlltool
+configure:5862: result: dlltool
+configure:5892: checking how to associate runtime and link libraries
+configure:5919: result: printf %s\n
+configure:5980: checking for ar
+configure:5996: found /usr/bin/ar
+configure:6007: result: ar
+configure:6044: checking for archiver @FILE support
+configure:6061: gcc -c -g -O2  conftest.c >&5
+configure:6061: $? = 0
+configure:6064: ar cru libconftest.a @conftest.lst >&5
+configure:6067: $? = 0
+configure:6072: ar cru libconftest.a @conftest.lst >&5
 ar: conftest.o: No such file or directory
-configure:5796: $? = 1
-configure:5808: result: @
-configure:5866: checking for strip
-configure:5882: found /usr/bin/strip
-configure:5893: result: strip
-configure:5965: checking for ranlib
-configure:5981: found /usr/bin/ranlib
-configure:5992: result: ranlib
-configure:6069: checking for gawk
-configure:6085: found /usr/bin/gawk
-configure:6096: result: gawk
-configure:6136: checking command to parse /usr/bin/nm -B output from gcc object
-configure:6256: gcc -c -g -O2  conftest.c >&5
-configure:6259: $? = 0
-configure:6263: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
-configure:6266: $? = 0
-configure:6332: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-configure:6335: $? = 0
-configure:6373: result: ok
-configure:6410: checking for sysroot
-configure:6440: result: no
-configure:6517: gcc -c -g -O2  conftest.c >&5
-configure:6520: $? = 0
-configure:6702: checking for mt
-configure:6732: result: no
-configure:6752: checking if : is a manifest tool
-configure:6758: : '-?'
-configure:6766: result: no
-configure:7404: checking for ANSI C header files
-configure:7424: gcc -c -g -O2  conftest.c >&5
-configure:7424: $? = 0
-configure:7497: gcc -o conftest -g -O2   conftest.c  >&5
-configure:7497: $? = 0
-configure:7497: ./conftest
-configure:7497: $? = 0
-configure:7508: result: yes
-configure:7521: checking for sys/types.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for sys/stat.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for stdlib.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for string.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for memory.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for strings.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for inttypes.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for stdint.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7521: checking for unistd.h
-configure:7521: gcc -c -g -O2  conftest.c >&5
-configure:7521: $? = 0
-configure:7521: result: yes
-configure:7535: checking for dlfcn.h
-configure:7535: gcc -c -g -O2  conftest.c >&5
-configure:7535: $? = 0
-configure:7535: result: yes
-configure:7752: checking for objdir
-configure:7767: result: .libs
-configure:8038: checking if gcc supports -fno-rtti -fno-exceptions
-configure:8056: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
+configure:6075: $? = 1
+configure:6087: result: @
+configure:6145: checking for strip
+configure:6161: found /usr/bin/strip
+configure:6172: result: strip
+configure:6244: checking for ranlib
+configure:6260: found /usr/bin/ranlib
+configure:6271: result: ranlib
+configure:6348: checking for gawk
+configure:6364: found /usr/bin/gawk
+configure:6375: result: gawk
+configure:6415: checking command to parse /usr/bin/nm -B output from gcc object
+configure:6535: gcc -c -g -O2  conftest.c >&5
+configure:6538: $? = 0
+configure:6542: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
+configure:6545: $? = 0
+configure:6611: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
+configure:6614: $? = 0
+configure:6652: result: ok
+configure:6689: checking for sysroot
+configure:6719: result: no
+configure:6796: gcc -c -g -O2  conftest.c >&5
+configure:6799: $? = 0
+configure:6981: checking for mt
+configure:7011: result: no
+configure:7031: checking if : is a manifest tool
+configure:7037: : '-?'
+configure:7045: result: no
+configure:7683: checking for ANSI C header files
+configure:7703: gcc -c -g -O2  conftest.c >&5
+configure:7703: $? = 0
+configure:7776: gcc -o conftest -g -O2   conftest.c  >&5
+configure:7776: $? = 0
+configure:7776: ./conftest
+configure:7776: $? = 0
+configure:7787: result: yes
+configure:7800: checking for sys/types.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for sys/stat.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for stdlib.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for string.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for memory.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for strings.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for inttypes.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for stdint.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7800: checking for unistd.h
+configure:7800: gcc -c -g -O2  conftest.c >&5
+configure:7800: $? = 0
+configure:7800: result: yes
+configure:7814: checking for dlfcn.h
+configure:7814: gcc -c -g -O2  conftest.c >&5
+configure:7814: $? = 0
+configure:7814: result: yes
+configure:8029: checking for objdir
+configure:8044: result: .libs
+configure:8315: checking if gcc supports -fno-rtti -fno-exceptions
+configure:8333: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
 cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C [enabled by default]
 cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C [enabled by default]
-configure:8060: $? = 0
-configure:8073: result: no
-configure:8400: checking for gcc option to produce PIC
-configure:8407: result: -fPIC -DPIC
-configure:8415: checking if gcc PIC flag -fPIC -DPIC works
-configure:8433: gcc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
-configure:8437: $? = 0
-configure:8450: result: yes
-configure:8479: checking if gcc static flag -static works
-configure:8507: result: no
-configure:8522: checking if gcc supports -c -o file.o
-configure:8543: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-configure:8547: $? = 0
-configure:8569: result: yes
-configure:8577: checking if gcc supports -c -o file.o
-configure:8624: result: yes
-configure:8657: checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:9810: result: yes
-configure:9847: checking whether -lc should be explicitly linked in
-configure:9855: gcc -c -g -O2  conftest.c >&5
-configure:9858: $? = 0
-configure:9873: gcc -shared  -fPIC -DPIC conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep  -lc  \>/dev/null 2\>\&1
-configure:9876: $? = 0
-configure:9890: result: no
-configure:10050: checking dynamic linker characteristics
-configure:10561: gcc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c  >&5
-configure:10561: $? = 0
-configure:10787: result: GNU/Linux ld.so
-configure:10894: checking how to hardcode library paths into programs
-configure:10919: result: immediate
-configure:11459: checking whether stripping libraries is possible
-configure:11464: result: yes
-configure:11499: checking if libtool supports shared libraries
-configure:11501: result: yes
-configure:11504: checking whether to build shared libraries
-configure:11525: result: yes
-configure:11528: checking whether to build static libraries
-configure:11532: result: yes
-configure:11555: checking how to run the C++ preprocessor
-configure:11621: result: g++ -E
-configure:11641: g++ -E  conftest.cpp
-configure:11641: $? = 0
-configure:11655: g++ -E  conftest.cpp
+configure:8337: $? = 0
+configure:8350: result: no
+configure:8677: checking for gcc option to produce PIC
+configure:8684: result: -fPIC -DPIC
+configure:8692: checking if gcc PIC flag -fPIC -DPIC works
+configure:8710: gcc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
+configure:8714: $? = 0
+configure:8727: result: yes
+configure:8756: checking if gcc static flag -static works
+configure:8784: result: no
+configure:8799: checking if gcc supports -c -o file.o
+configure:8820: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
+configure:8824: $? = 0
+configure:8846: result: yes
+configure:8854: checking if gcc supports -c -o file.o
+configure:8901: result: yes
+configure:8934: checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:10087: result: yes
+configure:10124: checking whether -lc should be explicitly linked in
+configure:10132: gcc -c -g -O2  conftest.c >&5
+configure:10135: $? = 0
+configure:10150: gcc -shared  -fPIC -DPIC conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep  -lc  \>/dev/null 2\>\&1
+configure:10153: $? = 0
+configure:10167: result: no
+configure:10327: checking dynamic linker characteristics
+configure:10838: gcc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c  >&5
+configure:10838: $? = 0
+configure:11064: result: GNU/Linux ld.so
+configure:11171: checking how to hardcode library paths into programs
+configure:11196: result: immediate
+configure:11736: checking whether stripping libraries is possible
+configure:11741: result: yes
+configure:11776: checking if libtool supports shared libraries
+configure:11778: result: yes
+configure:11781: checking whether to build shared libraries
+configure:11802: result: yes
+configure:11805: checking whether to build static libraries
+configure:11809: result: yes
+configure:11832: checking how to run the C++ preprocessor
+configure:11898: result: g++ -E
+configure:11918: g++ -E  conftest.cpp
+configure:11918: $? = 0
+configure:11932: g++ -E  conftest.cpp
 conftest.cpp:21:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:11655: $? = 1
+configure:11932: $? = 1
 configure: failed program was:
 | /* confdefs.h */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
+| #define PACKAGE_NAME "ccrtp"
+| #define PACKAGE_TARNAME "ccrtp"
+| #define PACKAGE_VERSION "2.0.7"
+| #define PACKAGE_STRING "ccrtp 2.0.7"
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define STDC_HEADERS 1
@@ -480,112 +479,112 @@
 | #define LT_OBJDIR ".libs/"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:11824: checking for ld used by g++
-configure:11891: result: /usr/bin/ld -m elf_x86_64
-configure:11898: checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld
-configure:11913: result: yes
-configure:11968: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:12973: result: yes
-configure:13009: g++ -c -g -O2  conftest.cpp >&5
-configure:13012: $? = 0
-configure:13532: checking for g++ option to produce PIC
-configure:13539: result: -fPIC -DPIC
-configure:13547: checking if g++ PIC flag -fPIC -DPIC works
-configure:13565: g++ -c -g -O2  -fPIC -DPIC -DPIC conftest.cpp >&5
-configure:13569: $? = 0
-configure:13582: result: yes
-configure:13605: checking if g++ static flag -static works
-configure:13633: result: no
-configure:13645: checking if g++ supports -c -o file.o
-configure:13666: g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
-configure:13670: $? = 0
-configure:13692: result: yes
-configure:13697: checking if g++ supports -c -o file.o
-configure:13744: result: yes
-configure:13774: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:13810: result: yes
-configure:13951: checking dynamic linker characteristics
-configure:14622: result: GNU/Linux ld.so
-configure:14675: checking how to hardcode library paths into programs
-configure:14700: result: immediate
-configure:14777: checking for a BSD-compatible install
-configure:14845: result: /usr/bin/install -c
-configure:14856: checking whether build environment is sane
-configure:14911: result: yes
-configure:15062: checking for a thread-safe mkdir -p
-configure:15101: result: /usr/bin/mkdir -p
-configure:15104: checking whether make sets $(MAKE)
-configure:15126: result: yes
-configure:15156: checking for style of include used by make
-configure:15184: result: GNU
-configure:15218: checking whether make supports nested variables
-configure:15235: result: yes
-configure:15321: checking dependency style of gcc
-configure:15432: result: none
-configure:15449: checking dependency style of g++
-configure:15560: result: none
-configure:15579: checking for C/C++ restrict keyword
-configure:15604: gcc -c -g -O2  conftest.c >&5
-configure:15604: $? = 0
-configure:15612: result: __restrict
-configure:15625: checking for working volatile
-configure:15644: gcc -c -g -O2  conftest.c >&5
-configure:15644: $? = 0
-configure:15651: result: yes
-configure:15659: checking for inline
-configure:15675: gcc -c -g -O2  conftest.c >&5
-configure:15675: $? = 0
-configure:15683: result: inline
-configure:15760: checking for libgcrypt-config
-configure:15778: found /usr/bin/libgcrypt-config
-configure:15791: result: /usr/bin/libgcrypt-config
-configure:15808: checking for LIBGCRYPT - version >= 1.2.3
-configure:15842: result: yes (1.5.3)
-configure:15854: checking LIBGCRYPT API version
-configure:15857: result: okay
-configure:15872: checking gcrypt.h usability
-configure:15872: gcc -c -g -O2  conftest.c >&5
-configure:15872: $? = 0
-configure:15872: result: yes
-configure:15872: checking gcrypt.h presence
-configure:15872: gcc -E  conftest.c
-configure:15872: $? = 0
-configure:15872: result: yes
-configure:15872: checking for gcrypt.h
-configure:15872: result: yes
-configure:16031: checking for ranlib
-configure:16058: result: ranlib
-configure:16089: checking for genorated automake files
-configure:16101: result: found
-configure:16107: checking whether to enable maintainer-specific portions of Makefiles
-configure:16116: result: no
-configure:16197: checking for pkg-config
-configure:16215: found /usr/bin/pkg-config
-configure:16227: result: /usr/bin/pkg-config
-configure:16252: checking pkg-config is at least version 0.9.0
-configure:16255: result: yes
-configure:16265: checking for COMMONCPP
-configure:16272: $PKG_CONFIG --exists --print-errors "commoncpp >= $REQUIRES"
-configure:16275: $? = 0
-configure:16289: $PKG_CONFIG --exists --print-errors "commoncpp >= $REQUIRES"
-configure:16292: $? = 0
-configure:16350: result: yes
-configure:16367: checking for debugging
-configure:16380: result: no
-configure:16382: checking for profiling
-configure:16394: result: no
-configure:16471: checking for doxygen
-configure:16489: found /usr/bin/doxygen
-configure:16502: result: /usr/bin/doxygen
-configure:16630: checking that generated files are newer than configure
-configure:16636: result: done
-configure:16679: creating ./config.status
+configure:12101: checking for ld used by g++
+configure:12168: result: /usr/bin/ld -m elf_x86_64
+configure:12175: checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld
+configure:12190: result: yes
+configure:12245: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:13250: result: yes
+configure:13286: g++ -c -g -O2  conftest.cpp >&5
+configure:13289: $? = 0
+configure:13809: checking for g++ option to produce PIC
+configure:13816: result: -fPIC -DPIC
+configure:13824: checking if g++ PIC flag -fPIC -DPIC works
+configure:13842: g++ -c -g -O2  -fPIC -DPIC -DPIC conftest.cpp >&5
+configure:13846: $? = 0
+configure:13859: result: yes
+configure:13882: checking if g++ static flag -static works
+configure:13910: result: no
+configure:13922: checking if g++ supports -c -o file.o
+configure:13943: g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
+configure:13947: $? = 0
+configure:13969: result: yes
+configure:13974: checking if g++ supports -c -o file.o
+configure:14021: result: yes
+configure:14051: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:14087: result: yes
+configure:14228: checking dynamic linker characteristics
+configure:14899: result: GNU/Linux ld.so
+configure:14952: checking how to hardcode library paths into programs
+configure:14977: result: immediate
+configure:15054: checking for a BSD-compatible install
+configure:15122: result: /usr/bin/install -c
+configure:15133: checking whether build environment is sane
+configure:15188: result: yes
+configure:15339: checking for a thread-safe mkdir -p
+configure:15378: result: /usr/bin/mkdir -p
+configure:15381: checking whether make sets $(MAKE)
+configure:15403: result: yes
+configure:15433: checking for style of include used by make
+configure:15461: result: GNU
+configure:15495: checking whether make supports nested variables
+configure:15512: result: yes
+configure:15597: checking dependency style of gcc
+configure:15708: result: none
+configure:15725: checking dependency style of g++
+configure:15836: result: none
+configure:15855: checking for C/C++ restrict keyword
+configure:15880: gcc -c -g -O2  conftest.c >&5
+configure:15880: $? = 0
+configure:15888: result: __restrict
+configure:15901: checking for working volatile
+configure:15920: gcc -c -g -O2  conftest.c >&5
+configure:15920: $? = 0
+configure:15927: result: yes
+configure:15935: checking for inline
+configure:15951: gcc -c -g -O2  conftest.c >&5
+configure:15951: $? = 0
+configure:15959: result: inline
+configure:16012: checking for libgcrypt-config
+configure:16030: found /usr/bin/libgcrypt-config
+configure:16043: result: /usr/bin/libgcrypt-config
+configure:16060: checking for LIBGCRYPT - version >= 1.2.3
+configure:16094: result: yes (1.5.3)
+configure:16106: checking LIBGCRYPT API version
+configure:16109: result: okay
+configure:16124: checking gcrypt.h usability
+configure:16124: gcc -c -g -O2  conftest.c >&5
+configure:16124: $? = 0
+configure:16124: result: yes
+configure:16124: checking gcrypt.h presence
+configure:16124: gcc -E  conftest.c
+configure:16124: $? = 0
+configure:16124: result: yes
+configure:16124: checking for gcrypt.h
+configure:16124: result: yes
+configure:16283: checking for ranlib
+configure:16310: result: ranlib
+configure:16341: checking for genorated automake files
+configure:16353: result: found
+configure:16359: checking whether to enable maintainer-specific portions of Makefiles
+configure:16368: result: no
+configure:16449: checking for pkg-config
+configure:16467: found /usr/bin/pkg-config
+configure:16479: result: /usr/bin/pkg-config
+configure:16504: checking pkg-config is at least version 0.9.0
+configure:16507: result: yes
+configure:16517: checking for COMMONCPP
+configure:16524: $PKG_CONFIG --exists --print-errors "commoncpp >= $REQUIRES"
+configure:16527: $? = 0
+configure:16541: $PKG_CONFIG --exists --print-errors "commoncpp >= $REQUIRES"
+configure:16544: $? = 0
+configure:16602: result: yes
+configure:16619: checking for debugging
+configure:16632: result: no
+configure:16634: checking for profiling
+configure:16646: result: no
+configure:16723: checking for doxygen
+configure:16741: found /usr/bin/doxygen
+configure:16754: result: /usr/bin/doxygen
+configure:16882: checking that generated files are newer than configure
+configure:16888: result: done
+configure:16931: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
 ## ---------------------- ##
 
-This file was extended by config.status, which was
+This file was extended by ccrtp config.status 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = 
@@ -596,23 +595,24 @@
 
 on pcal
 
-config.status:1190: creating Makefile
-config.status:1190: creating m4/Makefile
-config.status:1190: creating src/Makefile
-config.status:1190: creating src/ccrtp/Makefile
-config.status:1190: creating doc/Makefile
-config.status:1190: creating demo/Makefile
-config.status:1190: creating phone/Makefile
-config.status:1190: creating w32/Makefile
-config.status:1190: creating ccrtp.spec
-config.status:1190: creating libccrtp.spec
-config.status:1190: creating ccrtp.list
-config.status:1298: WARNING:  'ccrtp.list.in' seems to ignore the --datarootdir setting
-config.status:1190: creating libccrtp.pc
-config.status:1190: creating src/ccrtp/crypto/Makefile
-config.status:1190: creating ccrtp-config.h
-config.status:1419: executing libtool commands
-config.status:1419: executing depfiles commands
+config.status:1193: creating Makefile
+config.status:1193: creating m4/Makefile
+config.status:1193: creating src/Makefile
+config.status:1193: creating src/ccrtp/Makefile
+config.status:1193: creating doc/Makefile
+config.status:1193: creating demo/Makefile
+config.status:1193: creating phone/Makefile
+config.status:1193: creating w32/Makefile
+config.status:1193: creating ccrtp.spec
+config.status:1193: creating libccrtp.spec
+config.status:1193: creating ccrtp.list
+config.status:1301: WARNING:  'ccrtp.list.in' seems to ignore the --datarootdir setting
+config.status:1193: creating libccrtp.pc
+config.status:1193: creating src/ccrtp/crypto/Makefile
+config.status:1193: creating directive
+config.status:1193: creating ccrtp-config.h
+config.status:1422: executing libtool commands
+config.status:1422: executing depfiles commands
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -689,6 +689,7 @@
 ac_cv_prog_ac_ct_AR=ar
 ac_cv_prog_ac_ct_CC=gcc
 ac_cv_prog_ac_ct_CXX=g++
+ac_cv_prog_ac_ct_DLLTOOL=dlltool
 ac_cv_prog_ac_ct_OBJDUMP=objdump
 ac_cv_prog_ac_ct_RANLIB=ranlib
 ac_cv_prog_ac_ct_STRIP=strip
@@ -749,6 +750,7 @@
 AM_DEFAULT_VERBOSITY='1'
 AM_V='$(V)'
 AR='ar'
+AS='as'
 AUTOCONF='${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf'
 AUTOHEADER='${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader'
 AUTOMAKE='${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13'
@@ -767,7 +769,7 @@
 CYGPATH_W='echo'
 DEFS='-DHAVE_CONFIG_H'
 DEPDIR='.deps'
-DLLTOOL='false'
+DLLTOOL='dlltool'
 DOXYGEN='/usr/bin/doxygen'
 DOXY_FALSE='#'
 DOXY_TRUE=''
@@ -798,12 +800,12 @@
 LIPO=''
 LN_S='ln -s'
 LTLIBOBJS=''
-LT_CCXX_VERSION='-version-info 2:2:0'
+LT_CCXX_VERSION='-version-info 2:4:0'
 LT_MAJOR='2'
 LT_MINOR='0'
 LT_RELEASE=''
 LT_SUBVER='2.0'
-LT_VERSION='2:2:0'
+LT_VERSION='2:4:0'
 MAINT='#'
 MAINTAINER_MODE_FALSE=''
 MAINTAINER_MODE_TRUE='#'
@@ -818,15 +820,15 @@
 OTOOL=''
 PACKAGE='ccrtp'
 PACKAGE_BUGREPORT=''
-PACKAGE_NAME=''
-PACKAGE_STRING=''
-PACKAGE_TARNAME=''
+PACKAGE_NAME='ccrtp'
+PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_TARNAME='ccrtp'
 PACKAGE_URL=''
-PACKAGE_VERSION=''
+PACKAGE_VERSION='2.0.7'
 PATH_SEPARATOR=':'
 PKG_CONFIG='/usr/bin/pkg-config'
 PKG_CONFIG_LIBDIR=''
-PKG_CONFIG_PATH='/usr/local/lib/pkgconfig'
+PKG_CONFIG_PATH=''
 RANLIB='ranlib'
 SED='/usr/bin/sed'
 SET_MAKE=''
@@ -836,7 +838,7 @@
 SRTP_OPENSSL_FALSE=''
 SRTP_OPENSSL_TRUE='#'
 STRIP='strip'
-VERSION='2.0.4'
+VERSION='2.0.7'
 WARN_FLAGS='-fno-strict-aliasing -Wall -ansi -pedantic'
 ac_ct_AR='ar'
 ac_ct_CC='gcc'
@@ -863,7 +865,7 @@
 build_vendor='unknown'
 datadir='${datarootdir}'
 datarootdir='${prefix}/share'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 dvidir='${docdir}'
 exec_prefix='${prefix}'
 host='x86_64-unknown-linux-gnu'
@@ -900,10 +902,10 @@
 ## ----------- ##
 
 /* confdefs.h */
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
+#define PACKAGE_NAME "ccrtp"
+#define PACKAGE_TARNAME "ccrtp"
+#define PACKAGE_VERSION "2.0.7"
+#define PACKAGE_STRING "ccrtp 2.0.7"
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_URL ""
 #define STDC_HEADERS 1
@@ -919,7 +921,7 @@
 #define HAVE_DLFCN_H 1
 #define LT_OBJDIR ".libs/"
 #define PACKAGE "ccrtp"
-#define VERSION "2.0.4"
+#define VERSION "2.0.7"
 #define restrict __restrict
 #define SRTP_SUPPORT /**/
 #define HAVE_GCRYPT_H 1
diff --git a/jni/libccrtp/sources/config.status b/jni/libccrtp/sources/config.status
index a112c83..e218915 100755
--- a/jni/libccrtp/sources/config.status
+++ b/jni/libccrtp/sources/config.status
@@ -380,7 +380,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by ccrtp $as_me 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -393,7 +393,7 @@
 "
 
 # Files that config.status was made for.
-config_files=" Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile"
+config_files=" Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile directive"
 config_headers=" ccrtp-config.h"
 config_commands=" libtool depfiles"
 
@@ -429,7 +429,7 @@
 
 ac_cs_config=""
 ac_cs_version="\
-config.status
+ccrtp config.status 2.0.7
 configured by ./configure, generated by GNU Autoconf 2.69,
   with options \"$ac_cs_config\"
 
@@ -548,6 +548,9 @@
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+AS='as'
+DLLTOOL='dlltool'
+OBJDUMP='objdump'
 macro_version='2.4.2'
 macro_revision='1.3337'
 enable_shared='yes'
@@ -581,12 +584,10 @@
 lt_cv_to_tool_file_cmd='func_convert_file_noop'
 reload_flag=' -r'
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
-OBJDUMP='objdump'
 deplibs_check_method='pass_all'
 file_magic_cmd='$MAGIC_CMD'
 file_magic_glob=''
 want_nocaseglob='no'
-DLLTOOL='false'
 sharedlib_from_linklib_cmd='printf %s\n'
 AR='ar'
 AR_FLAGS='cru'
@@ -749,7 +750,7 @@
 }
 
 # Quote evaled strings.
-for var in SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag OBJDUMP deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob DLLTOOL sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix nm_file_list_spec lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib compiler_lib_search_dirs predep_objects postdep_objects predeps postdeps compiler_lib_search_path LD_CXX reload_flag_CXX compiler_CXX lt_prog_compiler_no_builtin_flag_CXX lt_prog_compiler_pic_CXX lt_prog_compiler_wl_CXX lt_prog_compiler_static_CXX lt_cv_prog_compiler_c_o_CXX export_dynamic_flag_spec_CXX whole_archive_flag_spec_CXX compiler_needs_object_CXX with_gnu_ld_CXX allow_undefined_flag_CXX no_undefined_flag_CXX hardcode_libdir_flag_spec_CXX hardcode_libdir_separator_CXX exclude_expsyms_CXX include_expsyms_CXX file_list_spec_CXX compiler_lib_search_dirs_CXX predep_objects_CXX postdep_objects_CXX predeps_CXX postdeps_CXX compiler_lib_search_path_CXX; do
+for var in AS DLLTOOL OBJDUMP SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix nm_file_list_spec lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib compiler_lib_search_dirs predep_objects postdep_objects predeps postdeps compiler_lib_search_path LD_CXX reload_flag_CXX compiler_CXX lt_prog_compiler_no_builtin_flag_CXX lt_prog_compiler_pic_CXX lt_prog_compiler_wl_CXX lt_prog_compiler_static_CXX lt_cv_prog_compiler_c_o_CXX export_dynamic_flag_spec_CXX whole_archive_flag_spec_CXX compiler_needs_object_CXX with_gnu_ld_CXX allow_undefined_flag_CXX no_undefined_flag_CXX hardcode_libdir_flag_spec_CXX hardcode_libdir_separator_CXX exclude_expsyms_CXX include_expsyms_CXX file_list_spec_CXX compiler_lib_search_dirs_CXX predep_objects_CXX postdep_objects_CXX predeps_CXX postdeps_CXX compiler_lib_search_path_CXX; do
     case `eval \\$ECHO \\""\\$$var"\\"` in
     *[\\\`\"\$]*)
       eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED \"\$sed_quote_subst\"\`\\\""
@@ -784,7 +785,7 @@
 
 
     PACKAGE='ccrtp'
-    VERSION='2.0.4'
+    VERSION='2.0.7'
     TIMESTAMP=''
     RM='rm -f'
     ofile='libtool'
@@ -816,6 +817,7 @@
     "ccrtp.list") CONFIG_FILES="$CONFIG_FILES ccrtp.list" ;;
     "libccrtp.pc") CONFIG_FILES="$CONFIG_FILES libccrtp.pc" ;;
     "src/ccrtp/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/ccrtp/crypto/Makefile" ;;
+    "directive") CONFIG_FILES="$CONFIG_FILES directive" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -888,20 +890,20 @@
 S["DOXY_FALSE"]="#"
 S["DOXY_TRUE"]=""
 S["DOXYGEN"]="/usr/bin/doxygen"
-S["LT_VERSION"]="2:2:0"
+S["LT_VERSION"]="2:4:0"
 S["KDOC_DIR"]="$(top_srcdir)/doc"
 S["WARN_FLAGS"]="-fno-strict-aliasing -Wall -ansi -pedantic"
 S["GNULIBS"]="-lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error "
 S["COMMONCPP_LIBS"]="-lcommoncpp -lucommon -lrt -ldl -lpthread "
 S["COMMONCPP_CFLAGS"]="-Wno-long-long -fexceptions -DNEW_STDCPP -pthread -fno-check-new -finline -fvisibility=hidden -DUCOMMON_VISIBILITY=1 "
 S["PKG_CONFIG_LIBDIR"]=""
-S["PKG_CONFIG_PATH"]="/usr/local/lib/pkgconfig"
+S["PKG_CONFIG_PATH"]=""
 S["PKG_CONFIG"]="/usr/bin/pkg-config"
 S["FTPDIR"]=""
 S["MAINT"]="#"
 S["MAINTAINER_MODE_FALSE"]=""
 S["MAINTAINER_MODE_TRUE"]="#"
-S["LT_CCXX_VERSION"]="-version-info 2:2:0"
+S["LT_CCXX_VERSION"]="-version-info 2:4:0"
 S["LT_MINOR"]="0"
 S["LT_MAJOR"]="2"
 S["LT_SUBVER"]="2.0"
@@ -944,7 +946,7 @@
 S["AUTOMAKE"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13"
 S["AUTOCONF"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf"
 S["ACLOCAL"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing aclocal-1.13"
-S["VERSION"]="2.0.4"
+S["VERSION"]="2.0.7"
 S["PACKAGE"]="ccrtp"
 S["CYGPATH_W"]="echo"
 S["am__isrc"]=""
@@ -962,8 +964,6 @@
 S["STRIP"]="strip"
 S["ac_ct_AR"]="ar"
 S["AR"]="ar"
-S["DLLTOOL"]="false"
-S["OBJDUMP"]="objdump"
 S["LN_S"]="ln -s"
 S["NM"]="/usr/bin/nm -B"
 S["ac_ct_DUMPBIN"]=""
@@ -974,6 +974,9 @@
 S["GREP"]="/usr/bin/grep"
 S["SED"]="/usr/bin/sed"
 S["LIBTOOL"]="$(SHELL) $(top_builddir)/libtool"
+S["OBJDUMP"]="objdump"
+S["DLLTOOL"]="dlltool"
+S["AS"]="as"
 S["CXXCPP"]="g++ -E"
 S["ac_ct_CXX"]="g++"
 S["CXXFLAGS"]="-g -O2 -Wno-long-long -fexceptions -DNEW_STDCPP -pthread -fno-check-new -finline -fvisibility=hidden -DUCOMMON_VISIBILITY=1 "
@@ -1014,7 +1017,7 @@
 S["dvidir"]="${docdir}"
 S["htmldir"]="${docdir}"
 S["infodir"]="${datarootdir}/info"
-S["docdir"]="${datarootdir}/doc/${PACKAGE}"
+S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"
 S["oldincludedir"]="/usr/include"
 S["includedir"]="${prefix}/include"
 S["localstatedir"]="${prefix}/var"
@@ -1030,10 +1033,10 @@
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]=""
 S["PACKAGE_BUGREPORT"]=""
-S["PACKAGE_STRING"]=""
-S["PACKAGE_VERSION"]=""
-S["PACKAGE_TARNAME"]=""
-S["PACKAGE_NAME"]=""
+S["PACKAGE_STRING"]="ccrtp 2.0.7"
+S["PACKAGE_VERSION"]="2.0.7"
+S["PACKAGE_TARNAME"]="ccrtp"
+S["PACKAGE_NAME"]="ccrtp"
 S["PATH_SEPARATOR"]=":"
 S["SHELL"]="/bin/sh"
 _ACAWK
@@ -1077,10 +1080,10 @@
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
-D["PACKAGE_NAME"]=" \"\""
-D["PACKAGE_TARNAME"]=" \"\""
-D["PACKAGE_VERSION"]=" \"\""
-D["PACKAGE_STRING"]=" \"\""
+D["PACKAGE_NAME"]=" \"ccrtp\""
+D["PACKAGE_TARNAME"]=" \"ccrtp\""
+D["PACKAGE_VERSION"]=" \"2.0.7\""
+D["PACKAGE_STRING"]=" \"ccrtp 2.0.7\""
 D["PACKAGE_BUGREPORT"]=" \"\""
 D["PACKAGE_URL"]=" \"\""
 D["STDC_HEADERS"]=" 1"
@@ -1096,7 +1099,7 @@
 D["HAVE_DLFCN_H"]=" 1"
 D["LT_OBJDIR"]=" \".libs/\""
 D["PACKAGE"]=" \"ccrtp\""
-D["VERSION"]=" \"2.0.4\""
+D["VERSION"]=" \"2.0.7\""
 D["restrict"]=" __restrict"
 D["SRTP_SUPPORT"]=" /**/"
 D["HAVE_GCRYPT_H"]=" 1"
@@ -1299,7 +1302,7 @@
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
   ac_datarootdir_hack='
   s&@datadir@&${datarootdir}&g
-  s&@docdir@&${datarootdir}/doc/${PACKAGE}&g
+  s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g
   s&@infodir@&${datarootdir}/info&g
   s&@localedir@&${datarootdir}/locale&g
   s&@mandir@&${datarootdir}/man&g
@@ -1477,6 +1480,15 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
 # Which release of libtool.m4 was used?
 macro_version=$macro_version
 macro_revision=$macro_revision
@@ -1557,9 +1569,6 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
@@ -1572,9 +1581,6 @@
 # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
 want_nocaseglob=$lt_want_nocaseglob
 
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
 # Command to associate shared and link libraries.
 sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 
diff --git a/jni/libccrtp/sources/configure b/jni/libccrtp/sources/configure
index 717e6f7..a506147 100755
--- a/jni/libccrtp/sources/configure
+++ b/jni/libccrtp/sources/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for ccrtp 2.0.7.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -585,12 +585,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='ccrtp'
+PACKAGE_TARNAME='ccrtp'
+PACKAGE_VERSION='2.0.7'
+PACKAGE_STRING='ccrtp 2.0.7'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="src/ccrtp/rtp.h"
 # Factoring default headers for most tests.
@@ -710,8 +710,6 @@
 STRIP
 ac_ct_AR
 AR
-DLLTOOL
-OBJDUMP
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -722,6 +720,9 @@
 GREP
 SED
 LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
 CXXCPP
 ac_ct_CXX
 CXXFLAGS
@@ -861,7 +862,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1361,7 +1362,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures ccrtp 2.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1410,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/ccrtp]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1431,7 +1432,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of ccrtp 2.0.7:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1556,7 +1559,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+ccrtp configure 2.0.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2042,7 +2045,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by ccrtp $as_me 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2391,30 +2394,10 @@
 
 
 
-cfg_options=""
-if test -z "$*" ; then
-        if test -f ~/.configure ; then
-        cfg_options=`grep ^ccrtp: ~/.configure | sed -e s/^ccrtp://`
-        elif test -f /etc/configure.conf ; then
-        cfg_options=`grep ^ccrtp: /etc/configure.conf | sed -e s/^ccrtp://`
-        fi
-fi
 
-if test ! -z "$cfg_options" ; then
-        echo "using ~/.configure defaults...$cfg_options"
-        case "$SHELL" in
-        */bash*)
-                exec $SHELL $0 $cfg_options
-                exit -1
-                ;;
-        esac
-        exec $0 $cfg_options
-        exit -1
-fi
-
-VERSION="2.0.4"
+LT_VERSION="2:4:0"
 REQUIRES="5.0.0"
-LT_VERSION="2:2:0"
+
 ac_aux_dir=
 for ac_dir in autoconf "$srcdir"/autoconf; do
   if test -f "$ac_dir/install-sh"; then
@@ -4128,7 +4111,309 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# OST_PROG_CC_POSIX
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -5260,9 +5545,6 @@
 
 
 
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if ${lt_cv_deplibs_check_method+:} false; then :
@@ -5607,9 +5889,6 @@
 
 
 
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 $as_echo_n "checking how to associate runtime and link libraries... " >&6; }
 if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
@@ -7565,8 +7844,6 @@
         enable_dlopen=no
 
 
-  enable_win32_dll=no
-
 
             # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
@@ -15264,9 +15541,8 @@
 
 
 # Define the identity of the package.
-
- PACKAGE=ccrtp
- VERSION=$VERSION
+ PACKAGE='ccrtp'
+ VERSION='2.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15699,30 +15975,6 @@
 esac
 
 
-if test -z "$PKG_CONFIG_PATH" ; then
-        PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-fi
-
-if test "$prefix" != "NONE" ; then
-        PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
-fi
-
-export PKG_CONFIG_PATH
-
-# use "-no-undefined" on Cygwin to force (trigger) libtool to create
-# the shared lib. If this is not set this library
-# is not created. Be sure that the LIBS variable above contains _all_
-# libraries necessary to build ours, Cygwin does not allow undefined
-# symbols.
-case $host in
-#  *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
-  *-*-cygwin*)
-    LDFLAGS="$LDFLAGS -no-undefined"
-    ;;
-  *)
-    ;;
-esac
-
 # SRTP support
 # Check whether --enable-srtp was given.
 if test "${enable_srtp+set}" = set; then :
@@ -16517,7 +16769,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile"
+ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile directive"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17068,7 +17320,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by ccrtp $as_me 2.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17134,7 +17386,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+ccrtp config.status 2.0.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17262,6 +17514,9 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
@@ -17295,12 +17550,10 @@
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
 file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
 want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
@@ -17460,7 +17713,10 @@
 }
 
 # Quote evaled strings.
-for var in SHELL \
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
 ECHO \
 PATH_SEPARATOR \
 SED \
@@ -17473,12 +17729,10 @@
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
-OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
 file_magic_glob \
 want_nocaseglob \
-DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
@@ -17654,6 +17908,7 @@
     "ccrtp.list") CONFIG_FILES="$CONFIG_FILES ccrtp.list" ;;
     "libccrtp.pc") CONFIG_FILES="$CONFIG_FILES libccrtp.pc" ;;
     "src/ccrtp/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/ccrtp/crypto/Makefile" ;;
+    "directive") CONFIG_FILES="$CONFIG_FILES directive" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -18303,6 +18558,15 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
 # Which release of libtool.m4 was used?
 macro_version=$macro_version
 macro_revision=$macro_revision
@@ -18383,9 +18647,6 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
@@ -18398,9 +18659,6 @@
 # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
 want_nocaseglob=$lt_want_nocaseglob
 
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
 # Command to associate shared and link libraries.
 sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 
diff --git a/jni/libccrtp/sources/configure.ac b/jni/libccrtp/sources/configure.ac
index 5368afb..261a1c9 100644
--- a/jni/libccrtp/sources/configure.ac
+++ b/jni/libccrtp/sources/configure.ac
@@ -9,70 +9,26 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT(src/ccrtp/rtp.h)
+AC_INIT([ccrtp], [2.0.7])
+AC_CONFIG_SRCDIR([src/ccrtp/rtp.h])
 
-cfg_options=""
-if test -z "$*" ; then
-        if test -f ~/.configure ; then
-        cfg_options=`grep ^ccrtp: ~/.configure | sed -e s/^ccrtp://`
-        elif test -f /etc/configure.conf ; then
-        cfg_options=`grep ^ccrtp: /etc/configure.conf | sed -e s/^ccrtp://`
-        fi
-fi
-
-if test ! -z "$cfg_options" ; then
-        echo "using ~/.configure defaults...$cfg_options"
-        case "$SHELL" in
-        */bash*)
-                exec $SHELL $0 $cfg_options
-                exit -1
-                ;;
-        esac
-        exec $0 $cfg_options
-        exit -1
-fi
-
-VERSION="2.0.4"
+LT_VERSION="2:4:0"
 REQUIRES="5.0.0"
-LT_VERSION="2:2:0"
+
 AC_CONFIG_AUX_DIR(autoconf)
 AC_CANONICAL_SYSTEM
 AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_CXX
-# OST_PROG_CC_POSIX
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
-AM_INIT_AUTOMAKE(ccrtp,[$VERSION])
+AM_INIT_AUTOMAKE([dist-zip])
 AM_CONFIG_HEADER(ccrtp-config.h)
 
 AC_C_RESTRICT
 AC_C_VOLATILE
 AC_C_INLINE
 
-if test -z "$PKG_CONFIG_PATH" ; then
-        PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-fi
-
-if test "$prefix" != "NONE" ; then
-        PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
-fi
-
-export PKG_CONFIG_PATH
-
-# use "-no-undefined" on Cygwin to force (trigger) libtool to create
-# the shared lib. If this is not set this library
-# is not created. Be sure that the LIBS variable above contains _all_
-# libraries necessary to build ours, Cygwin does not allow undefined
-# symbols.
-case $host in
-#  *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
-  *-*-cygwin*)
-    LDFLAGS="$LDFLAGS -no-undefined"
-    ;;
-  *)
-    ;;
-esac
-
 # SRTP support
 AC_ARG_ENABLE(srtp,
     AS_HELP_STRING([--enable-srtp],
@@ -148,4 +104,4 @@
 
 AC_OUTPUT(Makefile m4/Makefile src/Makefile src/ccrtp/Makefile
 doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec
-libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile)
+libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile directive)
diff --git a/jni/libccrtp/sources/demo/Makefile b/jni/libccrtp/sources/demo/Makefile
index 428ed00..13e791c 100644
--- a/jni/libccrtp/sources/demo/Makefile
+++ b/jni/libccrtp/sources/demo/Makefile
@@ -114,59 +114,37 @@
 PROGRAMS = $(noinst_PROGRAMS)
 am_audiorx_OBJECTS = audiorx.$(OBJEXT)
 audiorx_OBJECTS = $(am_audiorx_OBJECTS)
-audiorx_LDADD = $(LDADD)
+audiorx_DEPENDENCIES = ../src/libccrtp.la
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-audiorx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(audiorx_LDFLAGS) $(LDFLAGS) -o $@
 am_audiotx_OBJECTS = audiotx.$(OBJEXT)
 audiotx_OBJECTS = $(am_audiotx_OBJECTS)
-audiotx_LDADD = $(LDADD)
-audiotx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(audiotx_LDFLAGS) $(LDFLAGS) -o $@
+audiotx_DEPENDENCIES = ../src/libccrtp.la
 am_ccrtptest_OBJECTS = ccrtptest.$(OBJEXT)
 ccrtptest_OBJECTS = $(am_ccrtptest_OBJECTS)
-ccrtptest_LDADD = $(LDADD)
-ccrtptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(ccrtptest_LDFLAGS) $(LDFLAGS) -o $@
+ccrtptest_DEPENDENCIES = ../src/libccrtp.la
 am__ccsrtptest_SOURCES_DIST = ccsrtptest.cpp
 ##am_ccsrtptest_OBJECTS =  \
 ##	ccsrtptest.$(OBJEXT)
 am_ccsrtptest_OBJECTS = ccsrtptest.$(OBJEXT)
 ccsrtptest_OBJECTS = $(am_ccsrtptest_OBJECTS)
-ccsrtptest_LDADD = $(LDADD)
-ccsrtptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(ccsrtptest_LDFLAGS) $(LDFLAGS) -o $@
+##ccsrtptest_DEPENDENCIES =  \
+##	../src/libccrtp.la
+ccsrtptest_DEPENDENCIES = ../src/libccrtp.la
 am_rtpduphello_OBJECTS = rtpduphello.$(OBJEXT)
 rtpduphello_OBJECTS = $(am_rtpduphello_OBJECTS)
-rtpduphello_LDADD = $(LDADD)
-rtpduphello_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtpduphello_LDFLAGS) $(LDFLAGS) -o $@
+rtpduphello_DEPENDENCIES = ../src/libccrtp.la
 am_rtphello_OBJECTS = rtphello.$(OBJEXT)
 rtphello_OBJECTS = $(am_rtphello_OBJECTS)
-rtphello_LDADD = $(LDADD)
-rtphello_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtphello_LDFLAGS) $(LDFLAGS) -o $@
+rtphello_DEPENDENCIES = ../src/libccrtp.la
 am_rtplisten_OBJECTS = rtplisten.$(OBJEXT)
 rtplisten_OBJECTS = $(am_rtplisten_OBJECTS)
-rtplisten_LDADD = $(LDADD)
-rtplisten_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtplisten_LDFLAGS) $(LDFLAGS) -o $@
+rtplisten_DEPENDENCIES = ../src/libccrtp.la
 am_rtpsend_OBJECTS = rtpsend.$(OBJEXT)
 rtpsend_OBJECTS = $(am_rtpsend_OBJECTS)
-rtpsend_LDADD = $(LDADD)
-rtpsend_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtpsend_LDFLAGS) $(LDFLAGS) -o $@
+rtpsend_DEPENDENCIES = ../src/libccrtp.la
 AM_V_P = $(am__v_P_$(V))
 am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
 am__v_P_0 = false
@@ -254,6 +232,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -272,7 +251,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -302,12 +281,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = -version-info 2:2:0
+LT_VERSION = -version-info 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -320,21 +299,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
@@ -358,7 +337,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
@@ -402,22 +381,22 @@
 #srtp_src = ccsrtptest
 ccsrtptest_SOURCES = ccsrtptest.cpp
 #ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
-#ccsrtptest_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+ccsrtptest_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+#ccsrtptest_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 rtpsend_SOURCES = rtpsend.cpp
-rtpsend_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+rtpsend_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 rtplisten_SOURCES = rtplisten.cpp
-rtplisten_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+rtplisten_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 rtphello_SOURCES = rtphello.cpp
-rtphello_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+rtphello_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 rtpduphello_SOURCES = rtpduphello.cpp
-rtpduphello_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+rtpduphello_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 audiorx_SOURCES = audiorx.cpp audio.h
-audiorx_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+audiorx_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 audiotx_SOURCES = audiotx.cpp
-audiotx_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+audiotx_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 ccrtptest_SOURCES = ccrtptest.cpp
-ccrtptest_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+ccrtptest_LDADD = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 all: all-am
 
 .SUFFIXES:
@@ -464,35 +443,35 @@
 
 audiorx$(EXEEXT): $(audiorx_OBJECTS) $(audiorx_DEPENDENCIES) $(EXTRA_audiorx_DEPENDENCIES) 
 	@rm -f audiorx$(EXEEXT)
-	$(AM_V_CXXLD)$(audiorx_LINK) $(audiorx_OBJECTS) $(audiorx_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(audiorx_OBJECTS) $(audiorx_LDADD) $(LIBS)
 
 audiotx$(EXEEXT): $(audiotx_OBJECTS) $(audiotx_DEPENDENCIES) $(EXTRA_audiotx_DEPENDENCIES) 
 	@rm -f audiotx$(EXEEXT)
-	$(AM_V_CXXLD)$(audiotx_LINK) $(audiotx_OBJECTS) $(audiotx_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(audiotx_OBJECTS) $(audiotx_LDADD) $(LIBS)
 
 ccrtptest$(EXEEXT): $(ccrtptest_OBJECTS) $(ccrtptest_DEPENDENCIES) $(EXTRA_ccrtptest_DEPENDENCIES) 
 	@rm -f ccrtptest$(EXEEXT)
-	$(AM_V_CXXLD)$(ccrtptest_LINK) $(ccrtptest_OBJECTS) $(ccrtptest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(ccrtptest_OBJECTS) $(ccrtptest_LDADD) $(LIBS)
 
 ccsrtptest$(EXEEXT): $(ccsrtptest_OBJECTS) $(ccsrtptest_DEPENDENCIES) $(EXTRA_ccsrtptest_DEPENDENCIES) 
 	@rm -f ccsrtptest$(EXEEXT)
-	$(AM_V_CXXLD)$(ccsrtptest_LINK) $(ccsrtptest_OBJECTS) $(ccsrtptest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(ccsrtptest_OBJECTS) $(ccsrtptest_LDADD) $(LIBS)
 
 rtpduphello$(EXEEXT): $(rtpduphello_OBJECTS) $(rtpduphello_DEPENDENCIES) $(EXTRA_rtpduphello_DEPENDENCIES) 
 	@rm -f rtpduphello$(EXEEXT)
-	$(AM_V_CXXLD)$(rtpduphello_LINK) $(rtpduphello_OBJECTS) $(rtpduphello_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtpduphello_OBJECTS) $(rtpduphello_LDADD) $(LIBS)
 
 rtphello$(EXEEXT): $(rtphello_OBJECTS) $(rtphello_DEPENDENCIES) $(EXTRA_rtphello_DEPENDENCIES) 
 	@rm -f rtphello$(EXEEXT)
-	$(AM_V_CXXLD)$(rtphello_LINK) $(rtphello_OBJECTS) $(rtphello_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtphello_OBJECTS) $(rtphello_LDADD) $(LIBS)
 
 rtplisten$(EXEEXT): $(rtplisten_OBJECTS) $(rtplisten_DEPENDENCIES) $(EXTRA_rtplisten_DEPENDENCIES) 
 	@rm -f rtplisten$(EXEEXT)
-	$(AM_V_CXXLD)$(rtplisten_LINK) $(rtplisten_OBJECTS) $(rtplisten_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtplisten_OBJECTS) $(rtplisten_LDADD) $(LIBS)
 
 rtpsend$(EXEEXT): $(rtpsend_OBJECTS) $(rtpsend_DEPENDENCIES) $(EXTRA_rtpsend_DEPENDENCIES) 
 	@rm -f rtpsend$(EXEEXT)
-	$(AM_V_CXXLD)$(rtpsend_LINK) $(rtpsend_OBJECTS) $(rtpsend_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtpsend_OBJECTS) $(rtpsend_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff --git a/jni/libccrtp/sources/demo/Makefile.am b/jni/libccrtp/sources/demo/Makefile.am
index 5e6e3a0..5a11837 100644
--- a/jni/libccrtp/sources/demo/Makefile.am
+++ b/jni/libccrtp/sources/demo/Makefile.am
@@ -19,35 +19,35 @@
 if SRTP_GCRYPT
 srtp_src = ccsrtptest
 ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
 endif
 
 if SRTP_OPENSSL
 srtp_src = ccsrtptest
 ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
 endif
 
 noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \
     ccrtptest $(srtp_src)
 
 rtpsend_SOURCES = rtpsend.cpp
-rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpsend_LDADD = ../src/libccrtp.la @GNULIBS@
 
 rtplisten_SOURCES = rtplisten.cpp
-rtplisten_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtplisten_LDADD = ../src/libccrtp.la @GNULIBS@
 
 rtphello_SOURCES = rtphello.cpp
-rtphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtphello_LDADD = ../src/libccrtp.la @GNULIBS@
 
 rtpduphello_SOURCES = rtpduphello.cpp
-rtpduphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpduphello_LDADD = ../src/libccrtp.la @GNULIBS@
 
 audiorx_SOURCES = audiorx.cpp audio.h
-audiorx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiorx_LDADD = ../src/libccrtp.la @GNULIBS@
 
 audiotx_SOURCES = audiotx.cpp
-audiotx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiotx_LDADD = ../src/libccrtp.la @GNULIBS@
 
 ccrtptest_SOURCES = ccrtptest.cpp
-ccrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
diff --git a/jni/libccrtp/sources/demo/Makefile.in b/jni/libccrtp/sources/demo/Makefile.in
index 26ea5d2..9f386a7 100644
--- a/jni/libccrtp/sources/demo/Makefile.in
+++ b/jni/libccrtp/sources/demo/Makefile.in
@@ -114,59 +114,37 @@
 PROGRAMS = $(noinst_PROGRAMS)
 am_audiorx_OBJECTS = audiorx.$(OBJEXT)
 audiorx_OBJECTS = $(am_audiorx_OBJECTS)
-audiorx_LDADD = $(LDADD)
+audiorx_DEPENDENCIES = ../src/libccrtp.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-audiorx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(audiorx_LDFLAGS) $(LDFLAGS) -o $@
 am_audiotx_OBJECTS = audiotx.$(OBJEXT)
 audiotx_OBJECTS = $(am_audiotx_OBJECTS)
-audiotx_LDADD = $(LDADD)
-audiotx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(audiotx_LDFLAGS) $(LDFLAGS) -o $@
+audiotx_DEPENDENCIES = ../src/libccrtp.la
 am_ccrtptest_OBJECTS = ccrtptest.$(OBJEXT)
 ccrtptest_OBJECTS = $(am_ccrtptest_OBJECTS)
-ccrtptest_LDADD = $(LDADD)
-ccrtptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(ccrtptest_LDFLAGS) $(LDFLAGS) -o $@
+ccrtptest_DEPENDENCIES = ../src/libccrtp.la
 am__ccsrtptest_SOURCES_DIST = ccsrtptest.cpp
 @SRTP_GCRYPT_FALSE@@SRTP_OPENSSL_TRUE@am_ccsrtptest_OBJECTS =  \
 @SRTP_GCRYPT_FALSE@@SRTP_OPENSSL_TRUE@	ccsrtptest.$(OBJEXT)
 @SRTP_GCRYPT_TRUE@am_ccsrtptest_OBJECTS = ccsrtptest.$(OBJEXT)
 ccsrtptest_OBJECTS = $(am_ccsrtptest_OBJECTS)
-ccsrtptest_LDADD = $(LDADD)
-ccsrtptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(ccsrtptest_LDFLAGS) $(LDFLAGS) -o $@
+@SRTP_GCRYPT_FALSE@@SRTP_OPENSSL_TRUE@ccsrtptest_DEPENDENCIES =  \
+@SRTP_GCRYPT_FALSE@@SRTP_OPENSSL_TRUE@	../src/libccrtp.la
+@SRTP_GCRYPT_TRUE@ccsrtptest_DEPENDENCIES = ../src/libccrtp.la
 am_rtpduphello_OBJECTS = rtpduphello.$(OBJEXT)
 rtpduphello_OBJECTS = $(am_rtpduphello_OBJECTS)
-rtpduphello_LDADD = $(LDADD)
-rtpduphello_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtpduphello_LDFLAGS) $(LDFLAGS) -o $@
+rtpduphello_DEPENDENCIES = ../src/libccrtp.la
 am_rtphello_OBJECTS = rtphello.$(OBJEXT)
 rtphello_OBJECTS = $(am_rtphello_OBJECTS)
-rtphello_LDADD = $(LDADD)
-rtphello_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtphello_LDFLAGS) $(LDFLAGS) -o $@
+rtphello_DEPENDENCIES = ../src/libccrtp.la
 am_rtplisten_OBJECTS = rtplisten.$(OBJEXT)
 rtplisten_OBJECTS = $(am_rtplisten_OBJECTS)
-rtplisten_LDADD = $(LDADD)
-rtplisten_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtplisten_LDFLAGS) $(LDFLAGS) -o $@
+rtplisten_DEPENDENCIES = ../src/libccrtp.la
 am_rtpsend_OBJECTS = rtpsend.$(OBJEXT)
 rtpsend_OBJECTS = $(am_rtpsend_OBJECTS)
-rtpsend_LDADD = $(LDADD)
-rtpsend_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(rtpsend_LDFLAGS) $(LDFLAGS) -o $@
+rtpsend_DEPENDENCIES = ../src/libccrtp.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -254,6 +232,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -402,22 +381,22 @@
 @SRTP_OPENSSL_TRUE@srtp_src = ccsrtptest
 @SRTP_GCRYPT_TRUE@ccsrtptest_SOURCES = ccsrtptest.cpp
 @SRTP_OPENSSL_TRUE@ccsrtptest_SOURCES = ccsrtptest.cpp
-@SRTP_GCRYPT_TRUE@ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
-@SRTP_OPENSSL_TRUE@ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+@SRTP_GCRYPT_TRUE@ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
+@SRTP_OPENSSL_TRUE@ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
 rtpsend_SOURCES = rtpsend.cpp
-rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpsend_LDADD = ../src/libccrtp.la @GNULIBS@
 rtplisten_SOURCES = rtplisten.cpp
-rtplisten_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtplisten_LDADD = ../src/libccrtp.la @GNULIBS@
 rtphello_SOURCES = rtphello.cpp
-rtphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtphello_LDADD = ../src/libccrtp.la @GNULIBS@
 rtpduphello_SOURCES = rtpduphello.cpp
-rtpduphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpduphello_LDADD = ../src/libccrtp.la @GNULIBS@
 audiorx_SOURCES = audiorx.cpp audio.h
-audiorx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiorx_LDADD = ../src/libccrtp.la @GNULIBS@
 audiotx_SOURCES = audiotx.cpp
-audiotx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiotx_LDADD = ../src/libccrtp.la @GNULIBS@
 ccrtptest_SOURCES = ccrtptest.cpp
-ccrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
 all: all-am
 
 .SUFFIXES:
@@ -464,35 +443,35 @@
 
 audiorx$(EXEEXT): $(audiorx_OBJECTS) $(audiorx_DEPENDENCIES) $(EXTRA_audiorx_DEPENDENCIES) 
 	@rm -f audiorx$(EXEEXT)
-	$(AM_V_CXXLD)$(audiorx_LINK) $(audiorx_OBJECTS) $(audiorx_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(audiorx_OBJECTS) $(audiorx_LDADD) $(LIBS)
 
 audiotx$(EXEEXT): $(audiotx_OBJECTS) $(audiotx_DEPENDENCIES) $(EXTRA_audiotx_DEPENDENCIES) 
 	@rm -f audiotx$(EXEEXT)
-	$(AM_V_CXXLD)$(audiotx_LINK) $(audiotx_OBJECTS) $(audiotx_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(audiotx_OBJECTS) $(audiotx_LDADD) $(LIBS)
 
 ccrtptest$(EXEEXT): $(ccrtptest_OBJECTS) $(ccrtptest_DEPENDENCIES) $(EXTRA_ccrtptest_DEPENDENCIES) 
 	@rm -f ccrtptest$(EXEEXT)
-	$(AM_V_CXXLD)$(ccrtptest_LINK) $(ccrtptest_OBJECTS) $(ccrtptest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(ccrtptest_OBJECTS) $(ccrtptest_LDADD) $(LIBS)
 
 ccsrtptest$(EXEEXT): $(ccsrtptest_OBJECTS) $(ccsrtptest_DEPENDENCIES) $(EXTRA_ccsrtptest_DEPENDENCIES) 
 	@rm -f ccsrtptest$(EXEEXT)
-	$(AM_V_CXXLD)$(ccsrtptest_LINK) $(ccsrtptest_OBJECTS) $(ccsrtptest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(ccsrtptest_OBJECTS) $(ccsrtptest_LDADD) $(LIBS)
 
 rtpduphello$(EXEEXT): $(rtpduphello_OBJECTS) $(rtpduphello_DEPENDENCIES) $(EXTRA_rtpduphello_DEPENDENCIES) 
 	@rm -f rtpduphello$(EXEEXT)
-	$(AM_V_CXXLD)$(rtpduphello_LINK) $(rtpduphello_OBJECTS) $(rtpduphello_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtpduphello_OBJECTS) $(rtpduphello_LDADD) $(LIBS)
 
 rtphello$(EXEEXT): $(rtphello_OBJECTS) $(rtphello_DEPENDENCIES) $(EXTRA_rtphello_DEPENDENCIES) 
 	@rm -f rtphello$(EXEEXT)
-	$(AM_V_CXXLD)$(rtphello_LINK) $(rtphello_OBJECTS) $(rtphello_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtphello_OBJECTS) $(rtphello_LDADD) $(LIBS)
 
 rtplisten$(EXEEXT): $(rtplisten_OBJECTS) $(rtplisten_DEPENDENCIES) $(EXTRA_rtplisten_DEPENDENCIES) 
 	@rm -f rtplisten$(EXEEXT)
-	$(AM_V_CXXLD)$(rtplisten_LINK) $(rtplisten_OBJECTS) $(rtplisten_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtplisten_OBJECTS) $(rtplisten_LDADD) $(LIBS)
 
 rtpsend$(EXEEXT): $(rtpsend_OBJECTS) $(rtpsend_DEPENDENCIES) $(EXTRA_rtpsend_DEPENDENCIES) 
 	@rm -f rtpsend$(EXEEXT)
-	$(AM_V_CXXLD)$(rtpsend_LINK) $(rtpsend_OBJECTS) $(rtpsend_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(rtpsend_OBJECTS) $(rtpsend_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff --git a/jni/libccrtp/sources/directive b/jni/libccrtp/sources/directive
index 7630069..2a678dc 100644
--- a/jni/libccrtp/sources/directive
+++ b/jni/libccrtp/sources/directive
@@ -1,3 +1,3 @@
 version: 1.1
 directory: ccrtp
-filename: ccrtp-2.0.4.tar.gz
+filename: ccrtp-2.0.7.tar.gz
diff --git a/jni/libccrtp/sources/doc/Makefile b/jni/libccrtp/sources/doc/Makefile
index d72520d..d7d5999 100644
--- a/jni/libccrtp/sources/doc/Makefile
+++ b/jni/libccrtp/sources/doc/Makefile
@@ -202,6 +202,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -220,7 +221,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -250,12 +251,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = 2:2:0
+LT_VERSION = 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -268,21 +269,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/doc
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/doc
@@ -306,7 +307,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
@@ -343,6 +344,7 @@
 top_srcdir = ..
 AUTOMAKE_OPTIONS = no-dependencies
 EXTRA_DIST = srcmodel.txt srcmodel.dia Doxyfile Doxymini
+AM_MAKEINFOFLAGS = --no-warn
 info_TEXINFOS = ccrtp.texi
 ccrtp_TEXINFOS = gpl.texi fdl.texi fdlnotice.texi
 noinst_DATA = doxy
diff --git a/jni/libccrtp/sources/doc/Makefile.am b/jni/libccrtp/sources/doc/Makefile.am
index aa9d618..203afce 100644
--- a/jni/libccrtp/sources/doc/Makefile.am
+++ b/jni/libccrtp/sources/doc/Makefile.am
@@ -10,6 +10,7 @@
 
 AUTOMAKE_OPTIONS = no-dependencies
 EXTRA_DIST = srcmodel.txt srcmodel.dia Doxyfile Doxymini
+AM_MAKEINFOFLAGS = --no-warn
 
 info_TEXINFOS = ccrtp.texi
 ccrtp_TEXINFOS = gpl.texi fdl.texi fdlnotice.texi
diff --git a/jni/libccrtp/sources/doc/Makefile.in b/jni/libccrtp/sources/doc/Makefile.in
index df07e2c..db42c49 100644
--- a/jni/libccrtp/sources/doc/Makefile.in
+++ b/jni/libccrtp/sources/doc/Makefile.in
@@ -202,6 +202,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -343,6 +344,7 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = no-dependencies
 EXTRA_DIST = srcmodel.txt srcmodel.dia Doxyfile Doxymini
+AM_MAKEINFOFLAGS = --no-warn
 info_TEXINFOS = ccrtp.texi
 ccrtp_TEXINFOS = gpl.texi fdl.texi fdlnotice.texi
 @DOXY_TRUE@noinst_DATA = doxy
diff --git a/jni/libccrtp/sources/doc/ccrtp.texi b/jni/libccrtp/sources/doc/ccrtp.texi
index b6f5099..c878b82 100644
--- a/jni/libccrtp/sources/doc/ccrtp.texi
+++ b/jni/libccrtp/sources/doc/ccrtp.texi
@@ -46,7 +46,7 @@
 
 @page
 @vskip 0pt plus 1filll
-@center{Copyright @copyright{} 2001, 2002, 2003, 2004, 2005 Federico Montesino Pouzols}
+@center Copyright @copyright{} 2001, 2002, 2003, 2004, 2005 Federico Montesino Pouzols
 @include fdlnotice.texi
 @page
 @end titlepage
@@ -732,8 +732,8 @@
 RTP sessions (@code{RTPSession}). The relations among these entities
 are shown in the following diagram:
 
-@image{srcmodel,8cm,,{Relations between applications, participants,
-sources and sessions}}
+@image{srcmodel,8cm,,Relations between applications, participants,
+sources and sessions}
 
 @cindex CNAME
 An @acronym{RTP} application establishes a space of CNAME identifiers,
diff --git a/jni/libccrtp/sources/libccrtp.spec b/jni/libccrtp/sources/libccrtp.spec
index 3e47e36..757573a 100644
--- a/jni/libccrtp/sources/libccrtp.spec
+++ b/jni/libccrtp/sources/libccrtp.spec
@@ -26,7 +26,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:    on
 Summary:        A Common C++ Class Framework for RTP Packets
-Version:        2.0.4
+Version:        2.0.7
 Release:        2
 Source0:        ccrtp-%{version}.tar.bz2
 Source1:        rpmlintrc
diff --git a/jni/libccrtp/sources/libtool b/jni/libccrtp/sources/libtool
index 4eded0a..518dbb0 100755
--- a/jni/libccrtp/sources/libtool
+++ b/jni/libccrtp/sources/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ccrtp) 2.0.4
+# Generated automatically by config.status (ccrtp) 2.0.7
 # Libtool was configured on host pcal:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
@@ -39,6 +39,15 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Assembler program.
+AS="as"
+
+# DLL creation program.
+DLLTOOL="dlltool"
+
+# Object dumper program.
+OBJDUMP="objdump"
+
 # Which release of libtool.m4 was used?
 macro_version=2.4.2
 macro_revision=1.3337
@@ -119,9 +128,6 @@
 # convert $build files to toolchain format.
 to_tool_file_cmd=func_convert_file_noop
 
-# An object symbol dumper.
-OBJDUMP="objdump"
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
 
@@ -134,9 +140,6 @@
 # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
 want_nocaseglob="no"
 
-# DLL creation program.
-DLLTOOL="false"
-
 # Command to associate shared and link libraries.
 sharedlib_from_linklib_cmd="printf %s\\n"
 
diff --git a/jni/libccrtp/sources/m4/Makefile b/jni/libccrtp/sources/m4/Makefile
index c741925..3e5957a 100644
--- a/jni/libccrtp/sources/m4/Makefile
+++ b/jni/libccrtp/sources/m4/Makefile
@@ -148,6 +148,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -166,7 +167,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -196,12 +197,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = 2:2:0
+LT_VERSION = 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -214,21 +215,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/m4
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/m4
@@ -252,7 +253,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
diff --git a/jni/libccrtp/sources/m4/Makefile.in b/jni/libccrtp/sources/m4/Makefile.in
index c933687..3d1ff18 100644
--- a/jni/libccrtp/sources/m4/Makefile.in
+++ b/jni/libccrtp/sources/m4/Makefile.in
@@ -148,6 +148,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/jni/libccrtp/sources/phone/Makefile b/jni/libccrtp/sources/phone/Makefile
index 6302484..9767eff 100644
--- a/jni/libccrtp/sources/phone/Makefile
+++ b/jni/libccrtp/sources/phone/Makefile
@@ -210,6 +210,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -228,7 +229,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -258,12 +259,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = -version-info 2:2:0
+LT_VERSION = -version-info 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -276,21 +277,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/phone
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/phone
@@ -314,7 +315,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
diff --git a/jni/libccrtp/sources/phone/Makefile.in b/jni/libccrtp/sources/phone/Makefile.in
index 15448aa..670ddb3 100644
--- a/jni/libccrtp/sources/phone/Makefile.in
+++ b/jni/libccrtp/sources/phone/Makefile.in
@@ -210,6 +210,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/jni/libccrtp/sources/src/Makefile b/jni/libccrtp/sources/src/Makefile
index 986ca55..5e9cc6d 100644
--- a/jni/libccrtp/sources/src/Makefile
+++ b/jni/libccrtp/sources/src/Makefile
@@ -136,7 +136,7 @@
   }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libccrtp_la_LIBADD =
+libccrtp_la_DEPENDENCIES =
 am__libccrtp_la_SOURCES_DIST = rtppkt.cpp rtcppkt.cpp source.cpp \
 	data.cpp incqueue.cpp outqueue.cpp queue.cpp control.cpp \
 	members.cpp socket.cpp duplex.cpp pool.cpp CryptoContext.cpp \
@@ -289,6 +289,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -307,7 +308,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -337,12 +338,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = 2:2:0
+LT_VERSION = 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -355,21 +356,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src
@@ -393,7 +394,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
@@ -435,7 +436,7 @@
 AM_CPPFLAGS = -fno-strict-aliasing -Wall -ansi -pedantic -I$(top_srcdir)/src/ccrtp
 
 # RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
-RELEASE = --version-info $(LT_VERSION)
+RELEASE = -version-info $(LT_VERSION)
 lib_LTLIBRARIES = libccrtp.la
 #srtp_src_o = ccrtp/crypto/openssl/hmac.cpp \
 #        ccrtp/crypto/openssl/SrtpSymCrypto.cpp
@@ -454,7 +455,8 @@
     outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \
     CryptoContext.cpp CryptoContextCtrl.cpp $(srtp_src_g) $(srtp_src_o) $(skein_srcs)
 
-libccrtp_la_LDFLAGS = $(RELEASE) -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
+libccrtp_la_LDFLAGS = $(RELEASE)
+libccrtp_la_LIBADD = -lcommoncpp -lucommon -lrt -ldl -lpthread  -lgcrypt -ldl -lgpg-error 
 noinst_HEADERS = private.h
 all: all-recursive
 
diff --git a/jni/libccrtp/sources/src/Makefile.am b/jni/libccrtp/sources/src/Makefile.am
index 58cf4c1..1683a2d 100644
--- a/jni/libccrtp/sources/src/Makefile.am
+++ b/jni/libccrtp/sources/src/Makefile.am
@@ -16,7 +16,7 @@
 AM_CPPFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp
 
 # RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
-RELEASE = --version-info $(LT_VERSION)
+RELEASE = -version-info $(LT_VERSION)
 
 lib_LTLIBRARIES = libccrtp.la
 
@@ -43,6 +43,7 @@
     outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \
     CryptoContext.cpp CryptoContextCtrl.cpp $(srtp_src_g) $(srtp_src_o) $(skein_srcs)
 
-libccrtp_la_LDFLAGS = $(RELEASE) @GNULIBS@
+libccrtp_la_LDFLAGS = $(RELEASE)
+libccrtp_la_LIBADD = @GNULIBS@
 
 noinst_HEADERS = private.h
diff --git a/jni/libccrtp/sources/src/Makefile.in b/jni/libccrtp/sources/src/Makefile.in
index 8c18c2d..d01ebea 100644
--- a/jni/libccrtp/sources/src/Makefile.in
+++ b/jni/libccrtp/sources/src/Makefile.in
@@ -136,7 +136,7 @@
   }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libccrtp_la_LIBADD =
+libccrtp_la_DEPENDENCIES =
 am__libccrtp_la_SOURCES_DIST = rtppkt.cpp rtcppkt.cpp source.cpp \
 	data.cpp incqueue.cpp outqueue.cpp queue.cpp control.cpp \
 	members.cpp socket.cpp duplex.cpp pool.cpp CryptoContext.cpp \
@@ -289,6 +289,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -435,7 +436,7 @@
 AM_CPPFLAGS = @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp
 
 # RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
-RELEASE = --version-info $(LT_VERSION)
+RELEASE = -version-info $(LT_VERSION)
 lib_LTLIBRARIES = libccrtp.la
 @SRTP_OPENSSL_TRUE@srtp_src_o = ccrtp/crypto/openssl/hmac.cpp \
 @SRTP_OPENSSL_TRUE@        ccrtp/crypto/openssl/SrtpSymCrypto.cpp
@@ -454,7 +455,8 @@
     outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \
     CryptoContext.cpp CryptoContextCtrl.cpp $(srtp_src_g) $(srtp_src_o) $(skein_srcs)
 
-libccrtp_la_LDFLAGS = $(RELEASE) @GNULIBS@
+libccrtp_la_LDFLAGS = $(RELEASE)
+libccrtp_la_LIBADD = @GNULIBS@
 noinst_HEADERS = private.h
 all: all-recursive
 
diff --git a/jni/libccrtp/sources/src/ccrtp/Makefile b/jni/libccrtp/sources/src/ccrtp/Makefile
index a74f4d3..c0a3c5f 100644
--- a/jni/libccrtp/sources/src/ccrtp/Makefile
+++ b/jni/libccrtp/sources/src/ccrtp/Makefile
@@ -180,6 +180,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -198,7 +199,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -228,12 +229,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = 2:2:0
+LT_VERSION = 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -246,21 +247,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp
@@ -284,7 +285,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
diff --git a/jni/libccrtp/sources/src/ccrtp/Makefile.in b/jni/libccrtp/sources/src/ccrtp/Makefile.in
index f32459f..88de9d5 100644
--- a/jni/libccrtp/sources/src/ccrtp/Makefile.in
+++ b/jni/libccrtp/sources/src/ccrtp/Makefile.in
@@ -180,6 +180,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/jni/libccrtp/sources/src/ccrtp/crypto/Makefile b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile
index d5364bc..db21f7d 100644
--- a/jni/libccrtp/sources/src/ccrtp/crypto/Makefile
+++ b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile
@@ -151,6 +151,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -169,7 +170,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -199,12 +200,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = 2:2:0
+LT_VERSION = 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -217,21 +218,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp/crypto
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/src/ccrtp/crypto
@@ -255,7 +256,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
diff --git a/jni/libccrtp/sources/src/ccrtp/crypto/Makefile.in b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile.in
index de39e2f..6aec152 100644
--- a/jni/libccrtp/sources/src/ccrtp/crypto/Makefile.in
+++ b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile.in
@@ -151,6 +151,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/jni/libccrtp/sources/src/control.cpp b/jni/libccrtp/sources/src/control.cpp
index 2ae816a..9f37cca 100644
--- a/jni/libccrtp/sources/src/control.cpp
+++ b/jni/libccrtp/sources/src/control.cpp
@@ -773,7 +773,7 @@
     }
 
 
-    unsigned char buffer[BYE_BUFFER_LENGTH];
+    unsigned char buffer[BYE_BUFFER_LENGTH] = {0};
     // Build an empty RR as first packet in the compound.
         // TODO: provide more information if available. Not really
     // important, since this is the last packet being sent.
@@ -1088,7 +1088,7 @@
     memcpy(buf,value,len);
     buf[len] = '\0';
     ParticipantHandler::setPRIVPrefix(part,buf);
-    delete buf;
+    delete [] buf;
 }
 
 SDESItemType QueueRTCPManager::scheduleSDESItem()
diff --git a/jni/libccrtp/sources/src/incqueue.cpp b/jni/libccrtp/sources/src/incqueue.cpp
index cd82194..01b529f 100644
--- a/jni/libccrtp/sources/src/incqueue.cpp
+++ b/jni/libccrtp/sources/src/incqueue.cpp
@@ -187,7 +187,7 @@
     unsigned char* buffer = new unsigned char[nextSize];
     int32 rtn = (int32)recvData(buffer,nextSize,network_address,transport_port);
     if ( (rtn < 0) || ((uint32)rtn > getMaxRecvPacketSize()) ){
-        delete buffer;
+        delete [] buffer;
         return 0;
     }
 
@@ -600,7 +600,8 @@
             result = NULL;
         } else if ( recvFirst->getTimestamp() > timestamp ) {
             // there are only newer packets in the queue
-            l->setPrev(NULL);
+            if (l)
+                l->setPrev(NULL);
             result = NULL;
         } else {
             // (recvFirst->getTimestamp() == stamp) is true
diff --git a/jni/libccrtp/sources/src/outqueue.cpp b/jni/libccrtp/sources/src/outqueue.cpp
index df37ee7..60feaed 100644
--- a/jni/libccrtp/sources/src/outqueue.cpp
+++ b/jni/libccrtp/sources/src/outqueue.cpp
@@ -586,10 +586,12 @@
     while ( packetLink )
     {
         uint32 pstamp = packetLink->getPacket()->getTimestamp();
-        if ( pstamp > stamp )
+        if ( pstamp > stamp ) {
             packetLink = NULL;
-        if ( pstamp >= stamp )
             break;
+        } else if ( pstamp == stamp ) {
+            break;
+        }
 
         packetLink = packetLink->getNext();
     }
diff --git a/jni/libccrtp/sources/src/rtcppkt.cpp b/jni/libccrtp/sources/src/rtcppkt.cpp
index dbd7727..1c81327 100644
--- a/jni/libccrtp/sources/src/rtcppkt.cpp
+++ b/jni/libccrtp/sources/src/rtcppkt.cpp
@@ -82,7 +82,7 @@
 }
 
 RTCPCompoundHandler::RTCPCompoundHandler(uint16 mtu) :
-rtcpSendBuffer(new unsigned char[mtu]), rtcpRecvBuffer(new unsigned char[mtu]),
+rtcpSendBuffer(new unsigned char[mtu]()), rtcpRecvBuffer(new unsigned char[mtu]()),
 pathMTU(mtu)
 {
 }
diff --git a/jni/libccrtp/sources/w32/Makefile b/jni/libccrtp/sources/w32/Makefile
index bfe3ff4..d8d9f78 100644
--- a/jni/libccrtp/sources/w32/Makefile
+++ b/jni/libccrtp/sources/w32/Makefile
@@ -128,6 +128,7 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AR = ar
+AS = as
 AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
 AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
 AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
@@ -146,7 +147,7 @@
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = false
+DLLTOOL = dlltool
 DOXYGEN = /usr/bin/doxygen
 DSYMUTIL = 
 DUMPBIN = 
@@ -176,12 +177,12 @@
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-LT_CCXX_VERSION = -version-info 2:2:0
+LT_CCXX_VERSION = -version-info 2:4:0
 LT_MAJOR = 2
 LT_MINOR = 0
 LT_RELEASE = 
 LT_SUBVER = 2.0
-LT_VERSION = 2:2:0
+LT_VERSION = 2:4:0
 MAINT = #
 MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
 MANIFEST_TOOL = :
@@ -194,21 +195,21 @@
 OTOOL64 = 
 PACKAGE = ccrtp
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
+PACKAGE_NAME = ccrtp
+PACKAGE_STRING = ccrtp 2.0.7
+PACKAGE_TARNAME = ccrtp
 PACKAGE_URL = 
-PACKAGE_VERSION = 
+PACKAGE_VERSION = 2.0.7
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+PKG_CONFIG_PATH = 
 RANLIB = ranlib
 SED = /usr/bin/sed
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = strip
-VERSION = 2.0.4
+VERSION = 2.0.7
 WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
 abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/w32
 abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/w32
@@ -232,7 +233,7 @@
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
diff --git a/jni/libccrtp/sources/w32/Makefile.in b/jni/libccrtp/sources/w32/Makefile.in
index 0a7733e..5e4a4ad 100644
--- a/jni/libccrtp/sources/w32/Makefile.in
+++ b/jni/libccrtp/sources/w32/Makefile.in
@@ -128,6 +128,7 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@