fix configure.in

git-svn-id: svn://svn.savannah.nongnu.org/exosip/trunk/exosip@54 b4fb6cef-10e1-4022-a11b-4669fa468031
This commit is contained in:
aymeric
2003-04-28 11:35:06 +00:00
parent cbb1c820fb
commit cbd304fd04
5 changed files with 30 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
AC_REVISION($Revision: 1.6 $)dnl
AC_REVISION($Revision: 1.7 $)dnl
AC_PREREQ(2.50)
AC_INIT(eXosip/eXosip.h)
@@ -13,7 +13,7 @@ dnl *********************************************************************
dnl Source packaging numbers
EXOSIP_MAJOR_VERSION=0
EXOSIP_MINOR_VERSION=6
EXOSIP_MICRO_VERSION=4
EXOSIP_MICRO_VERSION=5
dnl program extension
EXOSIP_VERSION=$EXOSIP_MAJOR_VERSION.$EXOSIP_MINOR_VERSION.$EXOSIP_MICRO_VERSION

View File

@@ -11,7 +11,7 @@ jnotify.c jsubscribers.c jsubscribe.c jevents.c \
sdp_offans.c sdpcontext.c sdphandler.c \
bodyhandler.c bodycontext.c
libeXosip_la_LDFLAGS = -O -Wall
libeXosip_la_LDFLAGS = -version-info $(LIBEXOSIP_SO_VERSION)
libeXosip_la_LIBADD = -lfsmtl2 -losip2 @EXOSIP_LIB@ @PTHREAD_LIBS@
INCLUDES = -I$(top_srcdir)

View File

@@ -618,8 +618,9 @@ void eXosip_update_audio_session(osip_transaction_t *transaction)
pid = fork();
if (pid==0)
{
int ret = system(tmp);
int ret;
#ifndef USE_EXECL
ret = system(tmp);
if (WIFSIGNALED(ret) &&
(WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT))
{
@@ -630,6 +631,12 @@ void eXosip_update_audio_session(osip_transaction_t *transaction)
OSIP_TRACE(osip_trace(__FILE__,__LINE__,OSIP_INFO1,NULL,"Could not start audio\n", tmp));
}
exit(0);
#else
char _remoteipport[100];
snprintf(_remoteipport, 100, "%s:%s", remaddr, remote_port);
ret = execl("mediastream","--local", local_port,
"--remote", _remoteipport, "--payload", payload);
#endif
}
#endif

View File

@@ -1,3 +1,3 @@
EXTRA_DIST = config.guess config.sub install-sh missing mkinstalldirs ltmain.sh \
acx_pthread.m4 ac_c_gethostbyname_r.m4
EXTRA_DIST = config.guess config.sub install-sh missing mkinstalldirs \
ltmain.sh acx_pthread.m4 ac_c_gethostbyname_r.m4 aclocal-include.m4

View File

@@ -0,0 +1,16 @@
# aclocal-include.m4
#
# This macro adds the name macrodir to the set of directories
# that `aclocal' searches for macros.
# serial 1
dnl AM_ACLOCAL_INCLUDE(macrodir)
AC_DEFUN([AM_ACLOCAL_INCLUDE],
[
AM_CONDITIONAL(INSIDE_GNOME_COMMON, false)
test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
])