Commit 4bacb8d5 authored by Emmanuel Milou's avatar Emmanuel Milou

Merge branch 'master' into release

parents 23b04e09 b48d3e92

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -14,6 +14,8 @@ Makefile
*.so
*.raw
*.pod
.libs
.deps
autom4te.cache
config.guess
......@@ -40,10 +42,6 @@ doc/doxygen/core-doc
doc/doxygen/gtk-gui-doc
doc/*.html
# Ignore built stuff
.libs
.deps
# PJSIP files
*.depend
*i686-pc-linux-gnu
......
[submodule "kde"]
path = kde
url = http://anongit.kde.org/sflphone-kde.git
......@@ -31,7 +31,7 @@ rm -f *.tar.gz
rm -rf lang/
rm -rf tools/
rm -rf kde/
#rm -rf kde/
rm -rf .git/
rm -f .gitignore
......
......@@ -71,8 +71,26 @@ http://www.savoirfairelinux.com/
How to compile
--------------
# First compile the SIP library
# Install libav-0.7 and some encoder/decoder librairies
sudo apt-get install libtheora-dev libvpx-dev libmp3lame-dev
# x264 doesn't do releases, so grab the last snapshot of it
wget ftp://ftp.videolan.org/pub/x264/snapshots/last_x264.tar.bz2
tar -jxf last_x264.tar.bz2
cd x264-snapshot...
./configure --enable-shared --enable-pic
make && sudo make install
# get the libav-0.7 release
wget http://libav.org/releases/libav-0.7.tar.gz
tar xzf libav-0.7.tar.gz
cd libav-0.7
./configure --enable-libx264 --enable-gpl --enable-swscale --enable-libvpx --enable-libmp3lame --enable-pic --enable-libtheora
make && sudo make install
# Compile the PJSIP library
cd libs/pjproject
./autogen.sh
./configure --disable-ilbc-codec && make clean && make dep && make
sudo make install
......
......@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
# Silent build by default. Use make V=1 to increase verbosity
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
#m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl Improve make variable MAKE
AC_PROG_MAKE_SET
......@@ -63,29 +63,29 @@ AC_CHECK_TYPES([ptrdiff_t])
dnl ********************************
dnl Check for needed functions
dnl ********************************
AC_FUNC_CHOWN
AC_FUNC_ERROR_AT_LINE
AC_FUNC_FORK
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MALLOC
AC_FUNC_MEMCMP
AC_FUNC_REALLOC
AC_FUNC_SELECT_ARGTYPES
AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void.
Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([#include <sys/types.h>
#include <signal.h>
],
[return *(signal (0, 0)) (0) == 1;])],
[ac_cv_type_signal=int],
[ac_cv_type_signal=void])])
AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
(`int' or `void').])
AC_FUNC_STAT
AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF
#AC_FUNC_CHOWN
#AC_FUNC_ERROR_AT_LINE
#AC_FUNC_FORK
#AC_PROG_GCC_TRADITIONAL
#AC_FUNC_MALLOC
#AC_FUNC_MEMCMP
#AC_FUNC_REALLOC
#AC_FUNC_SELECT_ARGTYPES
#AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void.
#Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
#AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
#[AC_LANG_PROGRAM([#include <sys/types.h>
##include <signal.h>
#],
# [return *(signal (0, 0)) (0) == 1;])],
# [ac_cv_type_signal=int],
# [ac_cv_type_signal=void])])
#AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
# (`int' or `void').])
#AC_FUNC_STAT
#AC_FUNC_UTIME_NULL
#AC_FUNC_VPRINTF
dnl Check for GNU ccRTP
PKG_PROG_PKG_CONFIG
......@@ -106,12 +106,49 @@ PKG_CHECK_MODULES(ALSA, alsa >= ${ALSA_MIN_VERSION},, AC_MSG_ERROR([Missing alsa
dnl Check for pulseaudio development package - name: libpulse-dev
LIBPULSE_MIN_VERSION=0.9.15
PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= ${LIBPULSE_MIN_VERSION},, AC_MSG_ERROR([Missing pulseaudio development package: libpulse-dev]))
AC_ARG_WITH([pulse],
[ AS_HELP_STRING([--without-pulse], [disable support for pulseaudio]) ],
[],
[with_pulse=yes])
AS_IF([test "x$with_pulse" = "xyes"], [
PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= ${LIBPULSE_MIN_VERSION},, AC_MSG_ERROR([Missing pulseaudio development package: libpulse-dev]))
]);
AC_DEFINE_UNQUOTED([HAVE_PULSE], `if test "x$with_pulse" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have pulseaudio])
AM_CONDITIONAL(BUILD_PULSE, test "x$with_pulse" = "xyes" )
dnl Check for the samplerate development package - name: libsamplerate0-dev
LIBSAMPLERATE_MIN_VERSION=0.1.2
PKG_CHECK_MODULES(SAMPLERATE, samplerate >= ${LIBSAMPLERATE_MIN_VERSION},, AC_MSG_ERROR([Missing libsamplerate development package: libsamplerate0-dev]))
dnl Video is default-disabled
AC_ARG_ENABLE([video], AS_HELP_STRING([--enable-video], [Enable video]))