Commit e1844d74 authored by johan's avatar johan

Merge branch 'master' of git.linphone.org:bzrtp

parents a662ab01 1eaed1ef
Makefile
Makefile.in
aclocal.m4
autom4te.cache
compile
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
install-sh
intltool-extract
intltool-merge
intltool-update
libtool
ltmain.sh
missing
mkinstalldirs
stamp-h1
*.o
*.exe
*.zip
*~
*.lo
*.la
*.swp
.deps
.libs
#!/bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
THEDIR=`pwd`
cd $srcdir
#AM_VERSION="1.11"
if ! type aclocal-$AM_VERSION 1>/dev/null 2>&1; then
AUTOMAKE=automake
......@@ -19,6 +25,10 @@ if test -d /opt/local/share/aclocal ; then
ACLOCAL_ARGS="-I /opt/local/share/aclocal"
fi
if test -d /share/aclocal ; then
ACLOCAL_ARGS="-I /share/aclocal"
fi
echo "Generating build scripts for BZRtp: ZRTP engine"
set -x
$LIBTOOLIZE --copy --force
......@@ -27,3 +37,5 @@ $ACLOCAL $ACLOCAL_ARGS
$AUTOMAKE --force-missing --add-missing --copy
autoconf
cd $THEDIR
......@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([tar-ustar --warnings=no-portability])
AC_PROG_CC(["xcrun clang" gcc])
AC_PROG_LIBTOOL
LT_INIT(win32-dll shared disable-static)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_ARG_ENABLE(strict,
......@@ -91,10 +91,10 @@ fi
# Create the following files from their .in counterparts
AC_CONFIG_FILES([
Makefile
src/Makefile
include/Makefile
include/bzrtp/Makefile
test/Makefile
src/Makefile
include/Makefile
include/bzrtp/Makefile
test/Makefile
libbzrtp.pc
])
......
......@@ -228,7 +228,9 @@ int floadAlice(void *clientData, uint8_t **output, uint32_t *size) {
*size = ftell(ALICECACHE); /* Get file length */
rewind(ALICECACHE); /* Back to start of file */
*output = (uint8_t *)malloc(*size*sizeof(uint8_t)+1);
fread(*output, 1, *size, ALICECACHE);
if (fread(*output, 1, *size, ALICECACHE)==0){
fprintf(stderr,"floadAlice() fread() error\n");
}
*(*output+*size) = '\0';
*size += 1;
fclose(ALICECACHE);
......@@ -256,7 +258,10 @@ int floadBob(void *clientData, uint8_t **output, uint32_t *size) {
*size = ftell(BOBCACHE); /* Get file length */
rewind(BOBCACHE); /* Back to start of file */
*output = (uint8_t *)malloc(*size*sizeof(uint8_t)+1);
fread(*output, 1, *size, BOBCACHE);
if (fread(*output, 1, *size, BOBCACHE)==0){
fprintf(stderr,"floadBob(): fread error.\n");
return -1;
}
*(*output+*size) = '\0';
*size += 1;
fclose(BOBCACHE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment