[svn-commits] file: branch group/vldtmf r41238 - in
/team/group/vldtmf: ./ agi/ apps/ build...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Mon Aug 28 11:48:22 MST 2006
Author: file
Date: Mon Aug 28 13:48:21 2006
New Revision: 41238
URL: http://svn.digium.com/view/asterisk?rev=41238&view=rev
Log:
Bring this branch up to date, resolve conflicts, and reactivate automerge!
Added:
team/group/vldtmf/pbx/ael/ael-test/ael-test14/
- copied from r41235, trunk/pbx/ael/ael-test/ael-test14/
Modified:
team/group/vldtmf/ (props changed)
team/group/vldtmf/Makefile
team/group/vldtmf/Makefile.moddir_rules
team/group/vldtmf/UPGRADE.txt
team/group/vldtmf/agi/Makefile
team/group/vldtmf/apps/Makefile
team/group/vldtmf/apps/app_speech_utils.c
team/group/vldtmf/bootstrap.sh
team/group/vldtmf/build_tools/make_buildopts_h
team/group/vldtmf/build_tools/mkpkgconfig
team/group/vldtmf/cdr/Makefile
team/group/vldtmf/channels/Makefile
team/group/vldtmf/channels/chan_iax2.c
team/group/vldtmf/channels/chan_mgcp.c
team/group/vldtmf/channels/chan_sip.c
team/group/vldtmf/channels/chan_skinny.c
team/group/vldtmf/channels/chan_zap.c
team/group/vldtmf/codecs/Makefile
team/group/vldtmf/codecs/gsm/Makefile
team/group/vldtmf/configs/modules.conf.sample
team/group/vldtmf/configs/zapata.conf.sample
team/group/vldtmf/configure
team/group/vldtmf/configure.ac
team/group/vldtmf/doc/queues-with-callback-members.txt
team/group/vldtmf/doc/speechrec.txt
team/group/vldtmf/formats/Makefile
team/group/vldtmf/funcs/Makefile
team/group/vldtmf/include/asterisk/autoconfig.h.in
team/group/vldtmf/include/asterisk/linkedlists.h
team/group/vldtmf/include/asterisk/paths.h
team/group/vldtmf/include/asterisk/rtp.h
team/group/vldtmf/main/Makefile
team/group/vldtmf/main/asterisk.c
team/group/vldtmf/main/channel.c
team/group/vldtmf/main/file.c
team/group/vldtmf/main/loader.c
team/group/vldtmf/main/pbx.c
team/group/vldtmf/main/rtp.c
team/group/vldtmf/main/utils.c
team/group/vldtmf/makeopts.in
team/group/vldtmf/pbx/Makefile
team/group/vldtmf/pbx/pbx_ael.c
team/group/vldtmf/res/Makefile
team/group/vldtmf/res/res_musiconhold.c
team/group/vldtmf/sounds/Makefile
team/group/vldtmf/utils/ (props changed)
team/group/vldtmf/utils/Makefile
team/group/vldtmf/utils/ael_main.c
Propchange: team/group/vldtmf/
------------------------------------------------------------------------------
automerge = maybe
Propchange: team/group/vldtmf/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/group/vldtmf/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/group/vldtmf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 28 13:48:21 2006
@@ -21,5 +21,4 @@
config.log
menuselect-tree
autom4te.cache
-muted
makeopts.embed_rules
Propchange: team/group/vldtmf/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 28 13:48:21 2006
@@ -1,1 +1,1 @@
-/trunk:1-40926
+/trunk:1-41237
Modified: team/group/vldtmf/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/Makefile?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/Makefile (original)
+++ team/group/vldtmf/Makefile Mon Aug 28 13:48:21 2006
@@ -163,7 +163,8 @@
endif
ifeq ($(OSARCH),FreeBSD)
- BSDVERSION=$(shell $(MAKE) -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+ # -V is understood by BSD Make, not by GNU make.
+ BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
endif
@@ -331,7 +332,7 @@
rm -f build_tools/menuselect-deps
datafiles: all
- if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
@@ -646,7 +647,7 @@
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
- @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)"
+ @unset CC LD AR RANLIB && $(MAKE) -C menuselect
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
@echo "Generating input for menuselect ..."
Modified: team/group/vldtmf/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/Makefile.moddir_rules?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/Makefile.moddir_rules (original)
+++ team/group/vldtmf/Makefile.moddir_rules Mon Aug 28 13:48:21 2006
@@ -13,6 +13,10 @@
ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
CFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
+endif
+
+ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
+ CFLAGS+=${GC_CFLAGS}
endif
ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
@@ -91,9 +95,7 @@
uninstall::
-ifneq ($(wildcard .depend),)
- include .depend
-endif
+-include .depend
depend: .depend
Modified: team/group/vldtmf/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/UPGRADE.txt?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/UPGRADE.txt (original)
+++ team/group/vldtmf/UPGRADE.txt Mon Aug 28 13:48:21 2006
@@ -304,6 +304,10 @@
will want to turn on the rfc2833compensate option. Without this option your
DTMF reception may act poorly.
+* The $SIPUSERAGENT dialplan variable is deprecated and will be removed
+ in coming versions of Asterisk. Please use the dialplan function
+ SIPCHANINFO(useragent) instead.
+
The Zap channel:
* Support for MFC/R2 has been removed, as it has not been functional for some
Modified: team/group/vldtmf/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/agi/Makefile?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/agi/Makefile (original)
+++ team/group/vldtmf/agi/Makefile Mon Aug 28 13:48:21 2006
@@ -40,9 +40,7 @@
clean: clean-depend
rm -f *.so *.o look eagi-test eagi-sphinx-test
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend
depend: .depend
Modified: team/group/vldtmf/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/apps/Makefile?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/apps/Makefile (original)
+++ team/group/vldtmf/apps/Makefile Mon Aug 28 13:48:21 2006
@@ -9,10 +9,7 @@
# the GNU General Public License
#
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
- include ../menuselect.makeopts
- include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc)))
Modified: team/group/vldtmf/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/apps/app_speech_utils.c?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/apps/app_speech_utils.c (original)
+++ team/group/vldtmf/apps/app_speech_utils.c Mon Aug 28 13:48:21 2006
@@ -64,8 +64,7 @@
"Once they stop talking the processing sound is played to indicate the speech recognition engine is working.\n"
"Once results are available the application returns and results (score and text) are available using dialplan functions.\n"
"The first text and score are ${SPEECH_TEXT(0)} AND ${SPEECH_SCORE(0)} while the second are ${SPEECH_TEXT(1)} and ${SPEECH_SCORE(1)}.\n"
-"This may change in the future, however, to use a dialplan function instead of dialplan variables. Note it is possible to have more then one result.\n"
- "The first argument is the sound file and the second is the timeout. Note the timeout will only start once the sound file has stopped playing.\n";
+"The first argument is the sound file and the second is the timeout. Note the timeout will only start once the sound file has stopped playing.\n";
static char *speechdeactivategrammar_descrip =
"SpeechDeactivateGrammar(Grammar Name)\n"
Modified: team/group/vldtmf/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/bootstrap.sh?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/bootstrap.sh (original)
+++ team/group/vldtmf/bootstrap.sh Mon Aug 28 13:48:21 2006
@@ -12,17 +12,17 @@
uname -s | grep -q FreeBSD
if [ $? = 0 ]
then
- check_for_app autoconf259
- check_for_app autoheader259
+ check_for_app autoconf260
+ check_for_app autoheader260
check_for_app automake19
check_for_app aclocal19
echo "Generating the configure script ..."
aclocal19 2>/dev/null
- autoconf259
- autoheader259
+ autoconf260
+ autoheader260
automake19 --add-missing --copy 2>/dev/null
else
- AUTOCONF_VERSION=2.59
+ AUTOCONF_VERSION=2.60
AUTOMAKE_VERSION=1.9
export AUTOCONF_VERSION
export AUTOMAKE_VERSION
Modified: team/group/vldtmf/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/build_tools/make_buildopts_h?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/build_tools/make_buildopts_h (original)
+++ team/group/vldtmf/build_tools/make_buildopts_h Mon Aug 28 13:48:21 2006
@@ -7,7 +7,7 @@
*/
END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
for x in ${TMP}; do
echo "#define ${x} 1"
done
Modified: team/group/vldtmf/build_tools/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/build_tools/mkpkgconfig?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/build_tools/mkpkgconfig (original)
+++ team/group/vldtmf/build_tools/mkpkgconfig Mon Aug 28 13:48:21 2006
@@ -13,13 +13,20 @@
exit
fi
+#Solaris (and some others) don't have sed -r. perl -p is equivalent
+if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | grep -c "yyy"` != 0 ]]; then
+ EXTREGEX="sed -r -e"
+else
+ EXTREGEX="perl -pe"
+fi
+
## Clean out CFLAGS for the spec file.
-LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
- sed -r -e 's/-I(include|\.\.\/include) //g' | \
- sed -e 's/-DINSTALL_PREFIX=\S* //g' | \
- sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \
- sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \
+ ${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \
+ ${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \
+ ${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \
+ ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
cat <<EOF > $PPATH/asterisk.pc
Modified: team/group/vldtmf/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/cdr/Makefile?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/cdr/Makefile (original)
+++ team/group/vldtmf/cdr/Makefile Mon Aug 28 13:48:21 2006
@@ -9,10 +9,7 @@
# the GNU General Public License
#
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
- include ../menuselect.makeopts
- include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
C_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.cc,%,$(wildcard cdr_*.cc)))
Modified: team/group/vldtmf/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/Makefile?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/channels/Makefile (original)
+++ team/group/vldtmf/channels/Makefile Mon Aug 28 13:48:21 2006
@@ -9,10 +9,7 @@
# the GNU General Public License
#
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
- include ../menuselect.makeopts
- include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))
CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.cc,%,$(wildcard chan_*.cc)))
@@ -66,9 +63,7 @@
rm -f busy.h ringtone.h gentone
$(MAKE) -C misdn clean
-ifneq ($(wildcard $(PWD)/Makefile.ast),)
- include $(PWD)/Makefile.ast
-endif
+-include $(PWD)/Makefile.ast
$(eval $(call ast_make_final_host,gentone,gentone.c))
gentone: LIBS+=-lm
Modified: team/group/vldtmf/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/chan_iax2.c?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/channels/chan_iax2.c (original)
+++ team/group/vldtmf/channels/chan_iax2.c Mon Aug 28 13:48:21 2006
@@ -4750,19 +4750,21 @@
/* Keep this check last */
if (!ast_strlen_zero(user->dbsecret)) {
char *family, *key=NULL;
+ char buf[80];
family = ast_strdupa(user->dbsecret);
key = strchr(family, '/');
if (key) {
*key = '\0';
key++;
}
- if (!key || ast_db_get(family, key, (char*)iaxs[callno]->secret, sizeof(iaxs[callno]->secret))) {
+ if (!key || ast_db_get(family, key, buf, sizeof(buf))) {
ast_log(LOG_WARNING, "Unable to retrieve database password for family/key '%s'!\n", user->dbsecret);
if (ast_test_flag(user, IAX_TEMPONLY)) {
destroy_user(user);
user = NULL;
}
- }
+ } else
+ ast_string_field_set(iaxs[callno], secret, buf);
} else
ast_string_field_set(iaxs[callno], secret, user->secret);
res = 0;
Modified: team/group/vldtmf/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/chan_mgcp.c?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/channels/chan_mgcp.c (original)
+++ team/group/vldtmf/channels/chan_mgcp.c Mon Aug 28 13:48:21 2006
@@ -3884,13 +3884,19 @@
return (gw_reload ? NULL : gw);
}
-static struct ast_rtp *mgcp_get_rtp_peer(struct ast_channel *chan)
-{
- struct mgcp_subchannel *sub;
- sub = chan->tech_pvt;
- if (sub && sub->rtp && sub->parent->canreinvite)
- return sub->rtp;
- return NULL;
+static enum ast_rtp_get_result mgcp_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
+{
+ struct mgcp_subchannel *sub = NULL;
+
+ if (!(sub = chan->tech_pvt) || !(sub->rtp))
+ return AST_RTP_GET_FAILED;
+
+ *rtp = sub->rtp;
+
+ if (sub->parent->canreinvite)
+ return AST_RTP_TRY_NATIVE;
+ else
+ return AST_RTP_TRY_PARTIAL;
}
static int mgcp_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs, int nat_active)
Modified: team/group/vldtmf/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/chan_sip.c?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/channels/chan_sip.c (original)
+++ team/group/vldtmf/channels/chan_sip.c Mon Aug 28 13:48:21 2006
@@ -1481,8 +1481,8 @@
/*----- RTP interface functions */
static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs, int nat_active);
-static struct ast_rtp *sip_get_rtp_peer(struct ast_channel *chan);
-static struct ast_rtp *sip_get_vrtp_peer(struct ast_channel *chan);
+static enum ast_rtp_get_result sip_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
+static enum ast_rtp_get_result sip_get_vrtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
static int sip_get_codec(struct ast_channel *chan);
static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p, int *faxdetect);
@@ -16085,34 +16085,53 @@
/*! \brief Returns null if we can't reinvite audio (part of RTP interface) */
-static struct ast_rtp *sip_get_rtp_peer(struct ast_channel *chan)
-{
- struct sip_pvt *p;
- struct ast_rtp *rtp = NULL;
- p = chan->tech_pvt;
- if (!p)
- return NULL;
+static enum ast_rtp_get_result sip_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
+{
+ struct sip_pvt *p = NULL;
+ enum ast_rtp_get_result res = AST_RTP_TRY_PARTIAL;
+
+ if (!(p = chan->tech_pvt))
+ return AST_RTP_GET_FAILED;
+
ast_mutex_lock(&p->lock);
- if (p->rtp && ast_test_flag(&p->flags[0], SIP_CAN_REINVITE))
- rtp = p->rtp;
+ if (!(p->rtp)) {
+ ast_mutex_unlock(&p->lock);
+ return AST_RTP_GET_FAILED;
+ }
+
+ *rtp = p->rtp;
+
+ if (ast_test_flag(&p->flags[0], SIP_CAN_REINVITE))
+ res = AST_RTP_TRY_NATIVE;
+
ast_mutex_unlock(&p->lock);
- return rtp;
+
+ return res;
}
/*! \brief Returns null if we can't reinvite video (part of RTP interface) */
-static struct ast_rtp *sip_get_vrtp_peer(struct ast_channel *chan)
-{
- struct sip_pvt *p;
- struct ast_rtp *rtp = NULL;
- p = chan->tech_pvt;
- if (!p)
- return NULL;
+static enum ast_rtp_get_result sip_get_vrtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
+{
+ struct sip_pvt *p = NULL;
+ enum ast_rtp_get_result res = AST_RTP_TRY_PARTIAL;
+
+ if (!(p = chan->tech_pvt))
+ return AST_RTP_GET_FAILED;
ast_mutex_lock(&p->lock);
- if (p->vrtp && ast_test_flag(&p->flags[0], SIP_CAN_REINVITE))
- rtp = p->vrtp;
+ if (!(p->rtp)) {
+ ast_mutex_unlock(&p->lock);
+ return AST_RTP_GET_FAILED;
+ }
+
+ *rtp = p->vrtp;
+
+ if (ast_test_flag(&p->flags[0], SIP_CAN_REINVITE))
+ res = AST_RTP_TRY_NATIVE;
+
ast_mutex_unlock(&p->lock);
- return rtp;
+
+ return res;
}
/*! \brief Set the RTP peer for this call */
Modified: team/group/vldtmf/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/chan_skinny.c?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/channels/chan_skinny.c (original)
+++ team/group/vldtmf/channels/chan_skinny.c Mon Aug 28 13:48:21 2006
@@ -1593,24 +1593,28 @@
/* I do not believe skinny can deal with video.
Anyone know differently? */
/* Yes, it can. Currently 7985 and Cisco VT Advantage do video. */
-static struct ast_rtp *skinny_get_vrtp_peer(struct ast_channel *c)
-{
- struct skinny_subchannel *sub;
- sub = c->tech_pvt;
- if (sub && sub->vrtp) {
- return sub->vrtp;
- }
- return NULL;
-}
-
-static struct ast_rtp *skinny_get_rtp_peer(struct ast_channel *c)
-{
- struct skinny_subchannel *sub;
- sub = c->tech_pvt;
- if (sub && sub->rtp) {
- return sub->rtp;
- }
- return NULL;
+static enum ast_rtp_get_result skinny_get_vrtp_peer(struct ast_channel *c, struct ast_rtp **rtp)
+{
+ struct skinny_subchannel *sub = NULL;
+
+ if (!(sub = c->tech_pvt) || !(sub->vrtp))
+ return AST_RTP_GET_FAILED;
+
+ *rtp = sub->vrtp;
+
+ return AST_RTP_TRY_NATIVE;
+}
+
+static enum ast_rtp_get_result skinny_get_rtp_peer(struct ast_channel *c, struct ast_rtp **rtp)
+{
+ struct skinny_subchannel *sub = NULL;
+
+ if (!(sub = c->tech_pvt) || !(sub->rtp))
+ return AST_RTP_GET_FAILED;
+
+ *rtp = sub->rtp;
+
+ return AST_RTP_TRY_NATIVE;
}
static int skinny_set_rtp_peer(struct ast_channel *c, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs, int nat_active)
Modified: team/group/vldtmf/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/chan_zap.c?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/channels/chan_zap.c (original)
+++ team/group/vldtmf/channels/chan_zap.c Mon Aug 28 13:48:21 2006
@@ -8686,10 +8686,11 @@
res = set_actual_gain(pri->pvts[chanpos]->subs[SUB_REAL].zfd, 0, pri->pvts[chanpos]->rxgain, pri->pvts[chanpos]->txgain, law);
if (res < 0)
ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvts[chanpos]->channel);
- if (e->ring.complete || !pri->overlapdial)
+ if (e->ring.complete || !pri->overlapdial) {
/* Just announce proceeding */
+ pri->pvts[chanpos]->proceeding = 1;
pri_proceeding(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 0);
- else {
+ } else {
if (pri->switchtype != PRI_SWITCH_GR303_TMC)
pri_need_more_info(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 1);
else
Modified: team/group/vldtmf/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/codecs/Makefile?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/codecs/Makefile (original)
+++ team/group/vldtmf/codecs/Makefile Mon Aug 28 13:48:21 2006
@@ -11,10 +11,7 @@
# the GNU General Public License
#
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
- include ../menuselect.makeopts
- include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
C_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
CC_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.cc,%,$(wildcard codec_*.cc)))
Modified: team/group/vldtmf/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/codecs/gsm/Makefile?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/codecs/gsm/Makefile (original)
+++ team/group/vldtmf/codecs/gsm/Makefile Mon Aug 28 13:48:21 2006
@@ -38,7 +38,7 @@
######### probably require gcc.
ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc ppc64 ia64 s390 bfin ))
+ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc powerpc ppc64 ia64 s390 bfin ))
ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
OPTIMIZE+=-march=$(PROC)
endif
Modified: team/group/vldtmf/configs/modules.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/configs/modules.conf.sample?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/configs/modules.conf.sample (original)
+++ team/group/vldtmf/configs/modules.conf.sample Mon Aug 28 13:48:21 2006
@@ -36,8 +36,3 @@
;
noload => chan_alsa.so
;noload => chan_oss.so
-;
-; Module names listed in "global" section will have symbols globally
-; exported to modules loaded after them.
-;
-[global]
Modified: team/group/vldtmf/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/configs/zapata.conf.sample?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/configs/zapata.conf.sample (original)
+++ team/group/vldtmf/configs/zapata.conf.sample Mon Aug 28 13:48:21 2006
@@ -73,6 +73,7 @@
; local: Local ISDN
; national: National ISDN
; international: International ISDN
+; dynamic: Dynamically selects the appropriate dialplan
;
;pridialplan=national
;
@@ -83,6 +84,7 @@
; local: Local ISDN
; national: National ISDN
; international: International ISDN
+; dynamic: Dynamically selects the appropriate dialplan
;
;prilocaldialplan=national
;
Modified: team/group/vldtmf/configure
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/configure?rev=41238&r1=41237&r2=41238&view=diff
==============================================================================
--- team/group/vldtmf/configure (original)
+++ team/group/vldtmf/configure Mon Aug 28 13:48:21 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 40790 .
+# From configure.ac Revision: 41133 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -795,6 +795,8 @@
EGREP
LIBOBJS
POW_LIB
+GC_CFLAGS
+GC_LDFLAGS
GSM_INTERNAL
KDEINIT
KDEDIR
@@ -810,7 +812,8 @@
GTK_LIB
CURL
PBX_CURL
-CURLLIB
+CURL_INCLUDE
+CURL_LIB
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -4853,6 +4856,35 @@
+# http://www.mail-archive.com/bug-make@gnu.org/msg02871.html
+echo 'define A' > testMakefile
+echo '12345: $(1:.idl=.hh) $(1:.idl=S.h) $(1:.idl=C.h) $(1:.idl=SK.cc) $(1:.idl=DynSK.cc)' >> testMakefile
+echo 'endef' >> testMakefile
+echo '$(eval $(call A,01234567890123456789012345678901.idl))' >> testMakefile
+echo '01234567890123456789012345678901.hh:' >> testMakefile
+echo '01234567890123456789012345678901S.h:' >> testMakefile
+echo '01234567890123456789012345678901C.h:' >> testMakefile
+echo '01234567890123456789012345678901SK.cc:' >> testMakefile
+echo '01234567890123456789012345678901DynSK.cc:' >> testMakefile
+$GNU_MAKE -r -f testMakefile 2>&1 > /dev/null
+if test "$?" != "0" ; then
+ rm -f testMakefile
+ { echo "$as_me:$LINENO: ********** ERROR **********" >&5
+echo "$as_me: ********** ERROR **********" >&6;}
+ { echo "$as_me:$LINENO: Your version of GNU Make contains a bug that will cause the Asterisk build" >&5
+echo "$as_me: Your version of GNU Make contains a bug that will cause the Asterisk build" >&6;}
+ { echo "$as_me:$LINENO: system to not function properly. This bug is known to be fixed in version" >&5
+echo "$as_me: system to not function properly. This bug is known to be fixed in version" >&6;}
+ { echo "$as_me:$LINENO: 3.81 as well as distributions of 3.80 that contain backported bug fixes. You" >&5
+echo "$as_me: 3.81 as well as distributions of 3.80 that contain backported bug fixes. You" >&6;}
+ { echo "$as_me:$LINENO: must update GNU make to build Asterisk." >&5
+echo "$as_me: must update GNU make to build Asterisk." >&6;}
+ { echo "$as_me:$LINENO: ***************************" >&5
+echo "$as_me: ***************************" >&6;}
+ exit 1
+fi
+rm -f testMakefile
+
# Extract the first word of "grep", so it can be a program name with args.
set dummy grep; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -13584,6 +13616,490 @@
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+
+{ echo "$as_me:$LINENO: checking checking for compiler 'attribute pure' support" >&5
+echo $ECHO_N "checking checking for compiler 'attribute pure' support... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+static int __attribute__((pure)) test(void) {}
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ATTRIBUTE_pure 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+{ echo "$as_me:$LINENO: checking checking for compiler 'attribute malloc' support" >&5
+echo $ECHO_N "checking checking for compiler 'attribute malloc' support... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+static int __attribute__((malloc)) test(void) {}
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ATTRIBUTE_malloc 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+{ echo "$as_me:$LINENO: checking checking for compiler 'attribute const' support" >&5
+echo $ECHO_N "checking checking for compiler 'attribute const' support... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+static int __attribute__((const)) test(void) {}
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ATTRIBUTE_const 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+{ echo "$as_me:$LINENO: checking checking for compiler 'attribute unused' support" >&5
+echo $ECHO_N "checking checking for compiler 'attribute unused' support... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+static int __attribute__((unused)) test(void) {}
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ATTRIBUTE_unused 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+{ echo "$as_me:$LINENO: checking checking for compiler 'attribute always_inline' support" >&5
+echo $ECHO_N "checking checking for compiler 'attribute always_inline' support... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+static int __attribute__((always_inline)) test(void) {}
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ATTRIBUTE_always_inline 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+{ echo "$as_me:$LINENO: checking checking for -ffunction-sections support" >&5
+echo $ECHO_N "checking checking for -ffunction-sections support... $ECHO_C" >&6; }
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} -ffunction-sections"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+int x = 1;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ saved_LDFLAGS="${LDFLAGS}"
+ LDFLAGS="${LDFLAGS} -Wl,--gc-sections"
+ { echo "$as_me:$LINENO: checking checking for --gc-sections support" >&5
+echo $ECHO_N "checking checking for --gc-sections support... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+int x = 1;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
[... 2156 lines stripped ...]
More information about the svn-commits
mailing list