Switch commoncpp2 to ucommon to solve dependency conflicts.
libccrtp was depending on commoncpp2, and have been replaced by a version
depending on ucommon as well.
diff --git a/jni/libccrtp/sources/config.status b/jni/libccrtp/sources/config.status
index a37c4d7..a112c83 100755
--- a/jni/libccrtp/sources/config.status
+++ b/jni/libccrtp/sources/config.status
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
# Generated by configure.
# Run this file to recreate the current configuration.
# Compiler output produced by configure, useful for debugging
@@ -8,7 +8,7 @@
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/bash}
+SHELL=${CONFIG_SHELL-/bin/sh}
export SHELL
## -------------------- ##
## M4sh Initialization. ##
@@ -285,16 +285,16 @@
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -354,28 +354,16 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -393,7 +381,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -405,8 +393,8 @@
"
# 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 libccrtp1.pc src/ccrtp/crypto/Makefile"
-config_headers=" src/config.h"
+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_headers=" ccrtp-config.h"
config_commands=" libtool depfiles"
ac_cs_usage="\
@@ -439,20 +427,20 @@
Report bugs to the package provider."
-ac_cs_config="'--host=arm-linux-androideabi' '--with-sysroot=/home/evigier/android-14b-toolchain/sysroot' '--prefix=/home/evigier/android-ndk-r8b/platforms/android-14/arch-arm/usr' '--disable-srtp' 'host_alias=arm-linux-androideabi'"
+ac_cs_config=""
ac_cs_version="\
config.status
-configured by ./configure, generated by GNU Autoconf 2.68,
+configured by ./configure, generated by GNU Autoconf 2.69,
with options \"$ac_cs_config\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/home/evigier/git/ccrtp-1.8.0-android'
+ac_pwd='/home/lisional/git/sflphone-android/jni/libccrtp/sources'
srcdir='.'
INSTALL='/usr/bin/install -c'
-MKDIR_P='/bin/mkdir -p'
+MKDIR_P='/usr/bin/mkdir -p'
AWK='gawk'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
@@ -531,10 +519,10 @@
fi
if $ac_cs_recheck; then
- set X '/bin/bash' './configure' '--host=arm-linux-androideabi' '--with-sysroot=/home/evigier/android-14b-toolchain/sysroot' '--prefix=/home/evigier/android-ndk-r8b/platforms/android-14/arch-arm/usr' '--disable-srtp' 'host_alias=arm-linux-androideabi' $ac_configure_extra_args --no-create --no-recursion
+ set X /bin/sh './configure' $ac_configure_extra_args --no-create --no-recursion
shift
- $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
- CONFIG_SHELL='/bin/bash'
+ $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
+ CONFIG_SHELL='/bin/sh'
export CONFIG_SHELL
exec "$@"
fi
@@ -560,27 +548,28 @@
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
double_quote_subst='s/\(["`\\]\)/\\\1/g'
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
enable_shared='yes'
enable_static='yes'
pic_mode='default'
enable_fast_install='yes'
-SHELL='/bin/bash'
+SHELL='/bin/sh'
ECHO='printf %s\n'
-host_alias='arm-linux-androideabi'
-host='arm-unknown-linux-androideabi'
-host_os='linux-androideabi'
+PATH_SEPARATOR=':'
+host_alias=''
+host='x86_64-unknown-linux-gnu'
+host_os='linux-gnu'
build_alias=''
build='x86_64-unknown-linux-gnu'
build_os='linux-gnu'
-SED='/bin/sed'
-Xsed='/bin/sed -e 1s/^X//'
-GREP='/bin/grep'
-EGREP='/bin/grep -E'
-FGREP='/bin/grep -F'
-LD='/home/evigier/android-14b-toolchain/arm-linux-androideabi/bin/ld'
-NM='/home/evigier/android-14b-toolchain/bin/arm-linux-androideabi-nm -B'
+SED='/usr/bin/sed'
+Xsed='/usr/bin/sed -e 1s/^X//'
+GREP='/usr/bin/grep'
+EGREP='/usr/bin/grep -E'
+FGREP='/usr/bin/grep -F'
+LD='/usr/bin/ld -m elf_x86_64'
+NM='/usr/bin/nm -B'
LN_S='ln -s'
max_cmd_len='1572864'
ac_objext='o'
@@ -592,38 +581,38 @@
lt_cv_to_tool_file_cmd='func_convert_file_noop'
reload_flag=' -r'
reload_cmds='$LD$reload_flag -o $output$reload_objs'
-OBJDUMP='arm-linux-androideabi-objdump'
+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='arm-linux-androideabi-ar'
+AR='ar'
AR_FLAGS='cru'
archiver_list_spec='@'
-STRIP='arm-linux-androideabi-strip'
-RANLIB='arm-linux-androideabi-ranlib'
-old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $oldlib'
+STRIP='strip'
+RANLIB='ranlib'
+old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $tool_oldlib'
old_postuninstall_cmds=''
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $oldlib'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
lock_old_archive_extraction='no'
-CC='arm-linux-androideabi-gcc'
+CC='gcc'
CFLAGS='-g -O2'
-compiler='arm-linux-androideabi-g++'
+compiler='g++'
GCC='yes'
lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"\2", (void *) \&\2},/p'\'''
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/ {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"lib\2", (void *) \&\2},/p'\'''
nm_file_list_spec='@'
-lt_sysroot='/home/evigier/android-14b-toolchain/sysroot'
+lt_sysroot=''
objdir='.libs'
MAGIC_CMD='file'
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
lt_prog_compiler_pic=' -fPIC -DPIC'
lt_prog_compiler_wl='-Wl,'
-lt_prog_compiler_static='-static'
+lt_prog_compiler_static=''
lt_cv_prog_compiler_c_o='yes'
need_locks='no'
MANIFEST_TOOL=':'
@@ -653,7 +642,6 @@
allow_undefined_flag=''
no_undefined_flag=''
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-hardcode_libdir_flag_spec_ld=''
hardcode_libdir_separator=''
hardcode_direct='no'
hardcode_direct_absolute='no'
@@ -661,7 +649,7 @@
hardcode_shlibpath_var='unsupported'
hardcode_automatic='no'
inherit_rpath='no'
-link_all_deplibs='no'
+link_all_deplibs='unknown'
always_export_symbols='no'
export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
@@ -685,30 +673,30 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
finish_eval=''
hardcode_into_libs='yes'
-sys_lib_search_path_spec='/home/evigier/android-14b-toolchain/lib/gcc/arm-linux-androideabi/4.6.x-google /home/evigier/android-14b-toolchain/lib/gcc /home/evigier/android-14b-toolchain/arm-linux-androideabi/lib /home/evigier/android-14b-toolchain/sysroot/usr/lib '
-sys_lib_dlsearch_path_spec='/lib /usr/lib /lib32 /usr/lib32 /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa '
+sys_lib_search_path_spec='/usr/lib/gcc/x86_64-redhat-linux/4.8.2 /usr/lib64 /lib64 '
+sys_lib_dlsearch_path_spec='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/dyninst /usr/lib64/iscsi /usr/lib64/llvm /usr/lib64/mysql /usr/lib64/qt-3.3/lib /usr/lib64/tracker-0.16 /usr/lib64/xulrunner '
hardcode_action='immediate'
enable_dlopen='unknown'
enable_dlopen_self='unknown'
enable_dlopen_self_static='unknown'
-old_striplib='arm-linux-androideabi-strip --strip-debug'
-striplib='arm-linux-androideabi-strip --strip-unneeded'
+old_striplib='strip --strip-debug'
+striplib='strip --strip-unneeded'
compiler_lib_search_dirs=''
predep_objects=''
postdep_objects=''
predeps=''
postdeps=''
compiler_lib_search_path=''
-LD_CXX='/home/evigier/android-14b-toolchain/arm-linux-androideabi/bin/ld'
+LD_CXX='/usr/bin/ld -m elf_x86_64'
reload_flag_CXX=' -r'
reload_cmds_CXX='$LD$reload_flag -o $output$reload_objs'
-old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $oldlib'
-compiler_CXX='arm-linux-androideabi-g++'
+old_archive_cmds_CXX='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
+compiler_CXX='g++'
GCC_CXX='yes'
lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
lt_prog_compiler_pic_CXX=' -fPIC -DPIC'
lt_prog_compiler_wl_CXX='-Wl,'
-lt_prog_compiler_static_CXX='-static'
+lt_prog_compiler_static_CXX=''
lt_cv_prog_compiler_c_o_CXX='yes'
archive_cmds_need_lc_CXX='no'
enable_shared_with_static_runtimes_CXX='no'
@@ -725,7 +713,6 @@
allow_undefined_flag_CXX=''
no_undefined_flag_CXX=''
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-hardcode_libdir_flag_spec_ld_CXX=''
hardcode_libdir_separator_CXX=''
hardcode_direct_CXX='no'
hardcode_direct_absolute_CXX='no'
@@ -733,7 +720,7 @@
hardcode_shlibpath_var_CXX='unsupported'
hardcode_automatic_CXX='no'
inherit_rpath_CXX='no'
-link_all_deplibs_CXX='no'
+link_all_deplibs_CXX='unknown'
always_export_symbols_CXX='no'
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
@@ -742,16 +729,16 @@
postlink_cmds_CXX=''
file_list_spec_CXX=''
hardcode_action_CXX='immediate'
-compiler_lib_search_dirs_CXX='/home/evigier/android-14b-toolchain/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google /home/evigier/android-14b-toolchain/bin/../lib/gcc /home/evigier/android-14b-toolchain/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google/../../../../arm-linux-androideabi/lib /home/evigier/android-14b-toolchain/bin/../sysroot/usr/lib'
-predep_objects_CXX='/home/evigier/android-14b-toolchain/bin/../sysroot/usr/lib/crtbegin_so.o'
-postdep_objects_CXX='/home/evigier/android-14b-toolchain/bin/../sysroot/usr/lib/crtend_so.o'
+compiler_lib_search_dirs_CXX='/usr/lib/gcc/x86_64-redhat-linux/4.8.2 /usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../..'
+predep_objects_CXX='/usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.8.2/crtbeginS.o'
+postdep_objects_CXX='/usr/lib/gcc/x86_64-redhat-linux/4.8.2/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../../../lib64/crtn.o'
predeps_CXX=''
-postdeps_CXX='-lstdc++ -lm -lgcc -lc -ldl -lgcc'
-compiler_lib_search_path_CXX='-L/home/evigier/android-14b-toolchain/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google -L/home/evigier/android-14b-toolchain/bin/../lib/gcc -L/home/evigier/android-14b-toolchain/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google/../../../../arm-linux-androideabi/lib -L/home/evigier/android-14b-toolchain/bin/../sysroot/usr/lib'
+postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s'
+compiler_lib_search_path_CXX='-L/usr/lib/gcc/x86_64-redhat-linux/4.8.2 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../..'
-LTCC='arm-linux-androideabi-gcc'
+LTCC='gcc'
LTCFLAGS='-g -O2'
-compiler='arm-linux-androideabi-gcc'
+compiler='gcc'
# A function that is used when there is no print builtin or printf.
func_fallback_echo ()
@@ -762,7 +749,7 @@
}
# Quote evaled strings.
-for var in SHELL ECHO 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_flag_spec_ld 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_flag_spec_ld_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 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
case `eval \\$ECHO \\""\\$$var"\\"` in
*[\\\`\"\$]*)
eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED \"\$sed_quote_subst\"\`\\\""
@@ -797,7 +784,7 @@
PACKAGE='ccrtp'
- VERSION='1.8.0'
+ VERSION='2.0.4'
TIMESTAMP=''
RM='rm -f'
ofile='libtool'
@@ -815,7 +802,7 @@
case $ac_config_target in
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
+ "ccrtp-config.h") CONFIG_HEADERS="$CONFIG_HEADERS ccrtp-config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -827,7 +814,7 @@
"ccrtp.spec") CONFIG_FILES="$CONFIG_FILES ccrtp.spec" ;;
"libccrtp.spec") CONFIG_FILES="$CONFIG_FILES libccrtp.spec" ;;
"ccrtp.list") CONFIG_FILES="$CONFIG_FILES ccrtp.list" ;;
- "libccrtp1.pc") CONFIG_FILES="$CONFIG_FILES libccrtp1.pc" ;;
+ "libccrtp.pc") CONFIG_FILES="$CONFIG_FILES libccrtp.pc" ;;
"src/ccrtp/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/ccrtp/crypto/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -898,62 +885,66 @@
S["am__EXEEXT_TRUE"]="#"
S["LTLIBOBJS"]=""
S["LIBOBJS"]=""
-S["LIB_MAJOR"]="0"
-S["LIB_VERSION"]="1_8"
-S["DOXY_FALSE"]=""
-S["DOXY_TRUE"]="#"
-S["DOXYGEN"]="no"
+S["DOXY_FALSE"]="#"
+S["DOXY_TRUE"]=""
+S["DOXYGEN"]="/usr/bin/doxygen"
+S["LT_VERSION"]="2:2:0"
S["KDOC_DIR"]="$(top_srcdir)/doc"
S["WARN_FLAGS"]="-fno-strict-aliasing -Wall -ansi -pedantic"
-S["GNULIBS"]="-L/usr/lib -pthread -lccgnu2 -ldl -lrt "
-S["COMMON_LIBS"]="-pthread -lccgnu2 -ldl -lrt "
-S["COMMON_CFLAGS"]="-D_GNU_SOURCE "
+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"]="/home/evigier/android-ndk-r8b/platforms/android-14/arch-arm/usr/lib/pkgconfig:/usr/local/lib/pkgconfig"
+S["PKG_CONFIG_PATH"]="/usr/local/lib/pkgconfig"
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 0:0"
+S["LT_CCXX_VERSION"]="-version-info 2:2:0"
S["LT_MINOR"]="0"
-S["LT_MAJOR"]="0"
-S["LT_SUBVER"]="0.0"
-S["LT_RELEASE"]="1.8"
-S["LIBGCRYPT_LIBS"]=""
-S["LIBGCRYPT_CFLAGS"]=""
-S["LIBGCRYPT_CONFIG"]=""
-S["SRTP_GCRYPT_FALSE"]=""
-S["SRTP_GCRYPT_TRUE"]="#"
+S["LT_MAJOR"]="2"
+S["LT_SUBVER"]="2.0"
+S["LT_RELEASE"]=""
+S["SRTP_GCRYPT_FALSE"]="#"
+S["SRTP_GCRYPT_TRUE"]=""
S["SRTP_OPENSSL_FALSE"]=""
S["SRTP_OPENSSL_TRUE"]="#"
+S["LIBGCRYPT_LIBS"]="-lgcrypt -ldl -lgpg-error"
+S["LIBGCRYPT_CFLAGS"]=""
+S["LIBGCRYPT_CONFIG"]="/usr/bin/libgcrypt-config"
+S["AM_BACKSLASH"]="\\"
+S["AM_DEFAULT_VERBOSITY"]="1"
+S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)"
+S["AM_V"]="$(V)"
S["am__fastdepCXX_FALSE"]=""
S["am__fastdepCXX_TRUE"]="#"
S["CXXDEPMODE"]="depmode=none"
S["am__fastdepCC_FALSE"]=""
S["am__fastdepCC_TRUE"]="#"
S["CCDEPMODE"]="depmode=none"
+S["am__nodep"]="_no"
S["AMDEPBACKSLASH"]="\\"
S["AMDEP_FALSE"]="#"
S["AMDEP_TRUE"]=""
S["am__quote"]=""
S["am__include"]="include"
S["DEPDIR"]=".deps"
-S["am__untar"]="${AMTAR} xf -"
-S["am__tar"]="${AMTAR} chof - \"$$tardir\""
-S["AMTAR"]="${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run tar"
+S["am__untar"]="$${TAR-tar} xf -"
+S["am__tar"]="$${TAR-tar} chof - \"$$tardir\""
+S["AMTAR"]="$${TAR-tar}"
S["am__leading_dot"]="."
S["SET_MAKE"]=""
-S["mkdir_p"]="/bin/mkdir -p"
-S["MKDIR_P"]="/bin/mkdir -p"
+S["mkdir_p"]="$(MKDIR_P)"
+S["MKDIR_P"]="/usr/bin/mkdir -p"
S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
-S["install_sh"]="${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/install-sh"
-S["MAKEINFO"]="${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run makeinfo"
-S["AUTOHEADER"]="${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run autoheader"
-S["AUTOMAKE"]="${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run automake-1.11"
-S["AUTOCONF"]="${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run autoconf"
-S["ACLOCAL"]="${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run aclocal-1.11"
-S["VERSION"]="1.8.0"
+S["install_sh"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/install-sh"
+S["MAKEINFO"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo"
+S["AUTOHEADER"]="${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader"
+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["PACKAGE"]="ccrtp"
S["CYGPATH_W"]="echo"
S["am__isrc"]=""
@@ -967,50 +958,50 @@
S["DSYMUTIL"]=""
S["MANIFEST_TOOL"]=":"
S["AWK"]="gawk"
-S["RANLIB"]="arm-linux-androideabi-ranlib"
-S["STRIP"]="arm-linux-androideabi-strip"
-S["ac_ct_AR"]=""
-S["AR"]="arm-linux-androideabi-ar"
+S["RANLIB"]="ranlib"
+S["STRIP"]="strip"
+S["ac_ct_AR"]="ar"
+S["AR"]="ar"
S["DLLTOOL"]="false"
-S["OBJDUMP"]="arm-linux-androideabi-objdump"
+S["OBJDUMP"]="objdump"
S["LN_S"]="ln -s"
-S["NM"]="/home/evigier/android-14b-toolchain/bin/arm-linux-androideabi-nm -B"
+S["NM"]="/usr/bin/nm -B"
S["ac_ct_DUMPBIN"]=""
S["DUMPBIN"]=""
-S["LD"]="/home/evigier/android-14b-toolchain/arm-linux-androideabi/bin/ld"
-S["FGREP"]="/bin/grep -F"
-S["EGREP"]="/bin/grep -E"
-S["GREP"]="/bin/grep"
-S["SED"]="/bin/sed"
+S["LD"]="/usr/bin/ld -m elf_x86_64"
+S["FGREP"]="/usr/bin/grep -F"
+S["EGREP"]="/usr/bin/grep -E"
+S["GREP"]="/usr/bin/grep"
+S["SED"]="/usr/bin/sed"
S["LIBTOOL"]="$(SHELL) $(top_builddir)/libtool"
-S["CXXCPP"]="arm-linux-androideabi-g++ -E"
-S["ac_ct_CXX"]=""
-S["CXXFLAGS"]="-g -O2 -D_GNU_SOURCE "
-S["CXX"]="arm-linux-androideabi-g++"
-S["CPP"]="arm-linux-androideabi-gcc -E"
+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 "
+S["CXX"]="g++"
+S["CPP"]="gcc -E"
S["OBJEXT"]="o"
S["EXEEXT"]=""
-S["ac_ct_CC"]=""
+S["ac_ct_CC"]="gcc"
S["CPPFLAGS"]=""
S["LDFLAGS"]=""
S["CFLAGS"]="-g -O2"
-S["CC"]="arm-linux-androideabi-gcc"
-S["target_os"]="linux-androideabi"
+S["CC"]="gcc"
+S["target_os"]="linux-gnu"
S["target_vendor"]="unknown"
-S["target_cpu"]="arm"
-S["target"]="arm-unknown-linux-androideabi"
-S["host_os"]="linux-androideabi"
+S["target_cpu"]="x86_64"
+S["target"]="x86_64-unknown-linux-gnu"
+S["host_os"]="linux-gnu"
S["host_vendor"]="unknown"
-S["host_cpu"]="arm"
-S["host"]="arm-unknown-linux-androideabi"
+S["host_cpu"]="x86_64"
+S["host"]="x86_64-unknown-linux-gnu"
S["build_os"]="linux-gnu"
S["build_vendor"]="unknown"
S["build_cpu"]="x86_64"
S["build"]="x86_64-unknown-linux-gnu"
S["target_alias"]=""
-S["host_alias"]="arm-linux-androideabi"
+S["host_alias"]=""
S["build_alias"]=""
-S["LIBS"]=""
+S["LIBS"]="-lgcrypt -ldl -lgpg-error "
S["ECHO_T"]=""
S["ECHO_N"]="-n"
S["ECHO_C"]=""
@@ -1035,7 +1026,7 @@
S["sbindir"]="${exec_prefix}/sbin"
S["bindir"]="${exec_prefix}/bin"
S["program_transform_name"]="s,x,x,"
-S["prefix"]="/home/evigier/android-ndk-r8b/platforms/android-14/arch-arm/usr"
+S["prefix"]="/usr/local"
S["exec_prefix"]="${prefix}"
S["PACKAGE_URL"]=""
S["PACKAGE_BUGREPORT"]=""
@@ -1044,7 +1035,7 @@
S["PACKAGE_TARNAME"]=""
S["PACKAGE_NAME"]=""
S["PATH_SEPARATOR"]=":"
-S["SHELL"]="/bin/bash"
+S["SHELL"]="/bin/sh"
_ACAWK
cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
@@ -1105,8 +1096,10 @@
D["HAVE_DLFCN_H"]=" 1"
D["LT_OBJDIR"]=" \".libs/\""
D["PACKAGE"]=" \"ccrtp\""
-D["VERSION"]=" \"1.8.0\""
+D["VERSION"]=" \"2.0.4\""
D["restrict"]=" __restrict"
+D["SRTP_SUPPORT"]=" /**/"
+D["HAVE_GCRYPT_H"]=" 1"
for (key in D) D_is_set[key] = 1
FS = ""
}
@@ -1451,8 +1444,8 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -1506,6 +1499,9 @@
# An echo program that protects backslashes.
ECHO=$lt_ECHO
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
# The host system.
host_alias=$host_alias
host=$host
@@ -1807,10 +1803,6 @@
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
@@ -2153,10 +2145,6 @@
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
@@ -2233,7 +2221,7 @@
;;
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -2246,7 +2234,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -2280,21 +2268,19 @@
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||