diff --git a/Makefile.am b/Makefile.am
index da3a8d7..88f6bbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,20 +3,7 @@
# let make re-run automake upon need
ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_MACOS_FLAGS)
-if EXTERNAL_MEDIASTREAMER
-MS2_DIR=
-else
-MS2_DIR=mediastreamer2
-endif
-
-if EXTERNAL_ORTP
-ORTP_DIR=
-else
-ORTP_DIR=oRTP
-endif
-
-
-SUBDIRS = m4 pixmaps po $(ORTP_DIR) $(MS2_DIR) \
+SUBDIRS = m4 pixmaps po @ORTP_DIR@ @MEDIASTREAMER_DIR@ \
coreapi console gtk share scripts
diff --git a/autogen.sh b/autogen.sh
index f32cf85..1cdf35b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,45 +1,21 @@
-#!/bin/sh
+#! /bin/sh
-#AM_VERSION="1.10"
-if ! type aclocal-$AM_VERSION 1>/dev/null 2>&1; then
- # automake-1.10 (recommended) is not available on Fedora 8
- AUTOMAKE=automake
- ACLOCAL=aclocal
-else
- ACLOCAL=aclocal-${AM_VERSION}
- AUTOMAKE=automake-${AM_VERSION}
-fi
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
-if test -f /opt/local/bin/glibtoolize ; then
- # darwin
- LIBTOOLIZE=/opt/local/bin/glibtoolize
-else
- LIBTOOLIZE=libtoolize
-fi
-if test -d /opt/local/share/aclocal ; then
- ACLOCAL_ARGS="-I /opt/local/share/aclocal"
-fi
+ORIGDIR=`pwd`
-if test -f /opt/local/bin/intltoolize ; then
- #darwin
- INTLTOOLIZE=/opt/local/bin/intltoolize
-else
- #on mingw, it is important to invoke intltoolize with an absolute path to avoid a bug
- INTLTOOLIZE=/usr/bin/intltoolize
+if [ -x $srcdir/mediastreamer2/autogen.sh ]; then
+ ( cd $srcdir/mediastreamer2 && ./autogen.sh )
fi
-echo "Generating build scripts in linphone..."
-set -x
-$LIBTOOLIZE --copy --force
+if [ -x $srcdir/oRTP/autogen.sh ]; then
+ ( cd $srcdir/oRTP && ./autogen.sh )
+fi
-$INTLTOOLIZE -c --force --automake
-$ACLOCAL -I m4 $ACLOCAL_ARGS
-autoheader
-$AUTOMAKE --force-missing --add-missing --copy
-autoconf
+cd $srcdir
-echo "Generating build scripts in oRTP..."
-cd oRTP && ./autogen.sh && cd -
+intltoolize --copy --force --automake
+autoreconf -v --install || exit 1
-echo "Generating build scripts in mediastreamer2..."
-cd mediastreamer2 && ./autogen.sh && cd -
+cd $ORIGDIR || exit $?
diff --git a/configure.ac b/configure.ac
index 3448536..49a73aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,6 @@ IT_PROG_INTLTOOL([0.40], [no-xml])
dnl Initialize libtool
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
@@ -382,23 +381,22 @@ AC_ARG_ENABLE([external-mediastreamer],
AS_CASE($enable_external_mediastreamer,
[yes],[
PKG_CHECK_MODULES([MEDIASTREAMER], [mediastreamer])
- MS2_VERSION=`$PKG_CONFIG --modversion mediastreamer`
- AM_CONDITIONAL(EXTERNAL_MEDIASTREAMER, [true])],
+ MS2_VERSION=`$PKG_CONFIG --modversion mediastreamer`],
[no],[
AC_CONFIG_SUBDIRS( mediastreamer2 )
- MEDIASTREAMER_DIR=${top_srcdir}/mediastreamer2
+ MEDIASTREAMER_DIR=mediastreamer2
MEDIASTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
MEDIASTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
dnl need to temporary change quotes to allow square brackets
changequote(<<, >>)
MS2_VERSION=`grep -e '^.C_INIT(' $MEDIASTREAMER_DIR/configure.ac | sed -e 's:\([^(]\+\)(\[mediastreamer\],\[\(.*\)\]):\2:g'`
- changequote([, ])
- AM_CONDITIONAL(EXTERNAL_MEDIASTREAMER, [false])],
+ changequote([, ])],
[AC_MSG_ERROR([bad value '${enable_external_mediastreamer}' for --enable-external-mediastreamer])])
AC_SUBST(MEDIASTREAMER_CFLAGS)
AC_SUBST(MEDIASTREAMER_LIBS)
AC_SUBST([MS2_VERSION])
+AC_SUBST([MEDIASTREAMER_DIR])
dnl check for db2html (docbook) to generate html user manual
AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
@@ -433,6 +431,7 @@ if test "$external_ortp" = 'true'; then
ORTP_VERSION=`$PKG_CONFIG --modversion ortp`
else
AC_CONFIG_SUBDIRS( oRTP )
+ ORTP_DIR=oRTP
ORTP_CFLAGS="-I\$(top_srcdir)/oRTP/include"
ORTP_LIBS="\$(top_builddir)/oRTP/src/libortp.la"
if test x$ac_cv_c_bigendian = xyes ; then
@@ -445,8 +444,7 @@ fi
AC_SUBST(ORTP_CFLAGS)
AC_SUBST(ORTP_LIBS)
AC_SUBST([ORTP_VERSION])
-
-AM_CONDITIONAL(EXTERNAL_ORTP, [test "$external_ortp" = 'true'])
+AC_SUBST([ORTP_DIR])
dnl ##################################################
dnl # Check for doxygen
diff --git a/console/linphonec.c b/console/linphonec.c
index fa16946..cd963b1 100644
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -847,21 +847,21 @@ linphonec_prompt_for_auth_final(LinphoneCore *lc)
void
print_usage (int exit_status)
{
- fprintf (stdout, "\n\
-usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n\
- linphonec -v\n\
-\n\
- -b file specify path of readonly factory configuration file.\n\
- -c file specify path of configuration file.\n\
- -d level be verbose. 0 is no output. 6 is all output\n\
- -l logfile specify the log file for your SIP phone\n\
- -s sipaddress specify the sip call to do at startup\n\
- -a enable auto answering for incoming calls\n\
- -V enable video features globally (disabled by default)\n\
- -C enable video capture only (disabled by default)\n\
- -D enable video display only (disabled by default)\n\
- -S show general state messages (disabled by default)\n\
- -v or --version display version and exits.\n");
+ fprintf (stdout, "\n"
+"usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n"
+" linphonec -v\n"
+"\n"
+" -b file specify path of readonly factory configuration file.\n"
+" -c file specify path of configuration file.\n"
+" -d level be verbose. 0 is no output. 6 is all output\n"
+" -l logfile specify the log file for your SIP phone\n"
+" -s sipaddress specify the sip call to do at startup\n"
+" -a enable auto answering for incoming calls\n"
+" -V enable video features globally (disabled by default)\n"
+" -C enable video capture only (disabled by default)\n"
+" -D enable video display only (disabled by default)\n"
+" -S show general state messages (disabled by default)\n"
+" -v or --version display version and exits.\n");
exit(exit_status);
}
diff --git a/coreapi/sal_eXosip2_presence.c b/coreapi/sal_eXosip2_presence.c
index a38fdf9..aa22d69 100644
--- a/coreapi/sal_eXosip2_presence.c
+++ b/coreapi/sal_eXosip2_presence.c
@@ -184,114 +184,116 @@ static void add_presence_body(osip_message_t *notify, SalPresenceStatus online_s
if (online_status==SalPresenceOnline)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-", contact_info, atom_id, contact_info);
+\\
+
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"", contact_info, atom_id, contact_info);
}
else if (online_status==SalPresenceBusy)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-", contact_info, atom_id, contact_info);
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"", contact_info, atom_id, contact_info);
}
else if (online_status==SalPresenceBerightback)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-", contact_info, atom_id, contact_info);
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"", contact_info, atom_id, contact_info);
}
else if (online_status==SalPresenceAway)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-", contact_info, atom_id, contact_info);
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"", contact_info, atom_id, contact_info);
}
else if (online_status==SalPresenceOnthephone)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-", contact_info, atom_id, contact_info);
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"", contact_info, atom_id, contact_info);
}
else if (online_status==SalPresenceOuttolunch)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-", contact_info, atom_id, contact_info);
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"", contact_info, atom_id, contact_info);
}
else
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-\n\
-", contact_info, atom_id, contact_info);
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"", contact_info, atom_id, contact_info);
}
osip_message_set_body(notify, buf, strlen(buf));
@@ -300,131 +302,131 @@ PUBLIC \"-//IETF//DTD RFCxxxx XPIDF 1.0//EN\" \"xpidf.dtd\">\n\
if (online_status==SalPresenceOnline)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-open\n\
-\n\
-%s\n\
-online\n\
-\n\
-",
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"open\n"
+"\n"
+"%s\n"
+"online\n"
+"\n"
+"",
contact_info, contact_info);
}
else if (online_status==SalPresenceBusy)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-open\n\
-\n\
- busy\n\
-\n\
-\n\
-%s\n\
-busy\n\
-\n\
-",
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"open\n"
+"\n"
+" busy\n"
+"\n"
+"\n"
+"%s\n"
+"busy\n"
+"\n"
+"",
contact_info, contact_info);
}
else if (online_status==SalPresenceBerightback)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-open\n\
-\n\
- in-transit\n\
-\n\
-\n\
-%s\n\
-be right back\n\
-\n\
-",
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"open\n"
+"\n"
+" in-transit\n"
+"\n"
+"\n"
+"%s\n"
+"be right back\n"
+"\n"
+"",
contact_info, contact_info);
}
else if (online_status==SalPresenceAway)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-open\n\
-\n\
- away\n\
-\n\
-\n\
-%s\n\
-away\n\
-\n\
-",
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"open\n"
+"\n"
+" away\n"
+"\n"
+"\n"
+"%s\n"
+"away\n"
+"\n"
+"",
contact_info, contact_info);
}
else if (online_status==SalPresenceOnthephone)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-open\n\
-\n\
- on-the-phone\n\
-\n\
-\n\
-%s\n\
-on the phone\n\
-\n\
-",
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"open\n"
+"\n"
+" on-the-phone\n"
+"\n"
+"\n"
+"%s\n"
+"on the phone\n"
+"\n"
+"",
contact_info, contact_info);
}
else if (online_status==SalPresenceOuttolunch)
{
- sprintf(buf, "\n\
-\n\
-\n\
-\n\
-open\n\
-\n\
- meal\n\
-\n\
-\n\
-%s\n\
-out to lunch\n\
-\n\
-",
+ sprintf(buf, "\n"
+"\n"
+"\n"
+"\n"
+"open\n"
+"\n"
+" meal\n"
+"\n"
+"\n"
+"%s\n"
+"out to lunch\n"
+"\n"
+"",
contact_info, contact_info);
}
else
{
/* */
- sprintf(buf, "\n\
-\n%s",
+ sprintf(buf, "\n"
+"\n%s",
contact_info,
-"\n\
-\n\
-closed\n\
-\n\
- permanent-absence\n\
-\n\
-\n\
-\n\
-\n\n");
+"\n"
+"\n"
+"closed\n"
+"\n"
+" permanent-absence\n"
+"\n"
+"\n"
+"\n"
+"\n\n");
}
osip_message_set_body(notify, buf, strlen(buf));
osip_message_set_content_type(notify, "application/pidf+xml");
@@ -478,132 +480,132 @@ int sal_publish(SalOp *op, const char *from, const char *to, SalPresenceStatus p
if (presence_mode==SalPresenceOnline)
{
- snprintf(buf, sizeof(buf), "\n\
- \n\
- \n\
- \n\
- open\n\
- \n\
- %s\n\
- online\n\
- \n\
- ",
+ snprintf(buf, sizeof(buf), "\n"
+" \n"
+" \n"
+" \n"
+" open\n"
+" \n"
+" %s\n"
+" online\n"
+" \n"
+" ",
from, from);
}
else if (presence_mode==SalPresenceBusy
||presence_mode==SalPresenceDonotdisturb)
{
- snprintf(buf, sizeof(buf), "\n\
- \n\
- \n\
- \n\
- open\n\
- \n\
- busy\n\
- \n\
- \n\
- %s\n\
- busy\n\
- \n\
- ",
+ snprintf(buf, sizeof(buf), "\n"
+" \n"
+" \n"
+" \n"
+" open\n"
+" \n"
+" busy\n"
+" \n"
+" \n"
+" %s\n"
+" busy\n"
+" \n"
+" ",
from, from);
}
else if (presence_mode==SalPresenceBerightback)
{
- snprintf(buf, sizeof(buf), "\n\
- \n\
- \n\
- \n\
- open\n\
- \n\
- in-transit\n\
- \n\
- \n\
- %s\n\
- be right back\n\
- \n\
- ",
+ snprintf(buf, sizeof(buf), "\n"
+" \n"
+" \n"
+" \n"
+" open\n"
+" \n"
+" in-transit\n"
+" \n"
+" \n"
+" %s\n"
+" be right back\n"
+" \n"
+" ",
from,from);
}
else if (presence_mode==SalPresenceAway
||presence_mode==SalPresenceMoved)
{
- snprintf(buf, sizeof(buf), "\n\
- \n\
- \n\
- \n\
- open\n\
- \n\
- away\n\
- \n\
- \n\
- %s\n\
- away\n\
- \n\
- ",
+ snprintf(buf, sizeof(buf), "\n"
+" \n"
+" \n"
+" \n"
+" open\n"
+" \n"
+" away\n"
+" \n"
+" \n"
+" %s\n"
+" away\n"
+" \n"
+" ",
from, from);
}
else if (presence_mode==SalPresenceOnthephone)
{
- snprintf(buf, sizeof(buf), "\n\
- \n\
- \n\
- \n\
- open\n\
- \n\
- on-the-phone\n\
- \n\
- \n\
- %s\n\
- on the phone\n\
- \n\
- ",
+ snprintf(buf, sizeof(buf), "\n"
+" \n"
+" \n"
+" \n"
+" open\n"
+" \n"
+" on-the-phone\n"
+" \n"
+" \n"
+" %s\n"
+" on the phone\n"
+" \n"
+" ",
from, from);
}
else if (presence_mode==SalPresenceOuttolunch)
{
- snprintf(buf, sizeof(buf), "\n\
- \n\
- \n\
- \n\
- open\n\
- \n\
- meal\n\
- \n\
- \n\
- %s\n\
- out to lunch\n\
- \n\
- ",
+ snprintf(buf, sizeof(buf), "\n"
+" \n"
+" \n"
+" \n"
+" open\n"
+" \n"
+" meal\n"
+" \n"
+" \n"
+" %s\n"
+" out to lunch\n"
+" \n"
+" ",
from, from);
}
else{
/* offline */
- snprintf(buf, sizeof(buf), "\n\
- \n%s",
+ snprintf(buf, sizeof(buf), "\n"
+" \n%s",
from,
- "\n\
- \n\
- closed\n\
- \n\
- permanent-absence\n\
- \n\
- \n\
- \n\
- \n\n");
+" \n"
+" \n"
+" closed\n"
+" \n"
+" permanent-absence\n"
+" \n"
+" \n"
+" \n"
+" \n\n");
}
i = eXosip_build_publish(&pub,from, to, NULL, "presence", "1800", "application/pidf+xml", buf);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 704f413..60ea0a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,47 +29,4 @@ coreapi/presence.c
coreapi/friend.c
coreapi/proxy.c
coreapi/callbacks.c
-mediastreamer2/src/alaw.c
-mediastreamer2/src/alsa.c
-mediastreamer2/src/aqsnd.c
-mediastreamer2/src/dtmfgen.c
-mediastreamer2/src/gsm.c
-mediastreamer2/src/macsnd.c
-mediastreamer2/src/msconf.c
-mediastreamer2/src/msfileplayer.c
-mediastreamer2/src/msfilerec.c
-mediastreamer2/src/msfilerec_win.c
-mediastreamer2/src/msjoin.c
-mediastreamer2/src/msresample.c
-mediastreamer2/src/msrtp.c
-mediastreamer2/src/msspeex.c
-mediastreamer2/src/msvolume.c
-mediastreamer2/src/msv4l.c
-mediastreamer2/src/msv4l2.c
-mediastreamer2/src/msv4m.m
-mediastreamer2/src/nowebcam.c
-mediastreamer2/src/oss.c
-mediastreamer2/src/pixconv.c
-mediastreamer2/src/sizeconv.c
-mediastreamer2/src/speexec.c
-mediastreamer2/src/tee.c
-mediastreamer2/src/theora.c
-mediastreamer2/src/ulaw.c
-mediastreamer2/src/videodec.c
-mediastreamer2/src/videoenc.c
-mediastreamer2/src/videoout.c
-mediastreamer2/src/wincevideods.c
-mediastreamer2/src/winvideo.c
-mediastreamer2/src/winvideods.c
-mediastreamer2/src/winvideo2.c
-mediastreamer2/src/ice.c
-mediastreamer2/src/void.c
-mediastreamer2/src/equalizer.c
-mediastreamer2/src/msdscap-mingw.cc
-mediastreamer2/src/drawdib-display.c
-mediastreamer2/src/audiomixer.c
-mediastreamer2/src/chanadapt.c
-mediastreamer2/src/itc.c
-mediastreamer2/src/extdisplay.c
-mediastreamer2/src/msiounit.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8b13789..78ab51f 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,42 @@
-
+mediastreamer2/src/alaw.c
+mediastreamer2/src/alsa.c
+mediastreamer2/src/aqsnd.c
+mediastreamer2/src/audiomixer.c
+mediastreamer2/src/chanadapt.c
+mediastreamer2/src/drawdib-display.c
+mediastreamer2/src/dtmfgen.c
+mediastreamer2/src/equalizer.c
+mediastreamer2/src/extdisplay.c
+mediastreamer2/src/gsm.c
+mediastreamer2/src/ice.c
+mediastreamer2/src/itc.c
+mediastreamer2/src/macsnd.c
+mediastreamer2/src/msconf.c
+mediastreamer2/src/msdscap-mingw.cc
+mediastreamer2/src/msfileplayer.c
+mediastreamer2/src/msfilerec.c
+mediastreamer2/src/msfilerec_win.c
+mediastreamer2/src/msiounit.c
+mediastreamer2/src/msjoin.c
+mediastreamer2/src/msresample.c
+mediastreamer2/src/msrtp.c
+mediastreamer2/src/msspeex.c
+mediastreamer2/src/msv4l.c
+mediastreamer2/src/msv4l2.c
+mediastreamer2/src/msvolume.c
+mediastreamer2/src/nowebcam.c
+mediastreamer2/src/oss.c
+mediastreamer2/src/pixconv.c
+mediastreamer2/src/sizeconv.c
+mediastreamer2/src/speexec.c
+mediastreamer2/src/tee.c
+mediastreamer2/src/theora.c
+mediastreamer2/src/ulaw.c
+mediastreamer2/src/videodec.c
+mediastreamer2/src/videoenc.c
+mediastreamer2/src/videoout.c
+mediastreamer2/src/void.c
+mediastreamer2/src/wincevideods.c
+mediastreamer2/src/winvideo.c
+mediastreamer2/src/winvideo2.c
+mediastreamer2/src/winvideods.c