[asterisk-commits] murf: branch murf/bug8221-1.4 r48532 - in
/team/murf/bug8221-1.4: ./ agi/ app...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Dec 16 23:51:20 MST 2006
Author: murf
Date: Sun Dec 17 00:51:19 2006
New Revision: 48532
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48532
Log:
Merged revisions 48461,48472,48478,48481,48487,48502,48504,48506,48513,48521,48525,48528 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48461 | file | 2006-12-13 20:33:30 -0700 (Wed, 13 Dec 2006) | 2 lines
Remove direct RTCP bridging. I've come to the conclusion that we should handle this through the core and not just forward it on. Should solve a few bugs.
........
r48472 | file | 2006-12-14 10:36:12 -0700 (Thu, 14 Dec 2006) | 2 lines
Payload values on the RTP structure can change AFTER a bridge has started. This comes from the packet handling of the SIP response when indication that it was answered has been sent. Therefore we need to protect this data with a lock when we read/write. (issue #8232 reported by tgrman)
........
r48478 | file | 2006-12-14 23:28:05 -0700 (Thu, 14 Dec 2006) | 2 lines
Use a wakeup variable so that we don't wait on IO indefinitely if packets need to be retransmitted.
........
r48481 | oej | 2006-12-15 03:18:04 -0700 (Fri, 15 Dec 2006) | 2 lines
Update to latest IANA spec
........
r48487 | oej | 2006-12-15 03:55:41 -0700 (Fri, 15 Dec 2006) | 2 lines
Issue #8592 - treat 504 as 503 (imported from 1.2)
........
r48502 | file | 2006-12-15 12:24:15 -0700 (Fri, 15 Dec 2006) | 2 lines
Lock network retransmission queue in all places that it is used.
........
r48504 | file | 2006-12-15 12:38:51 -0700 (Fri, 15 Dec 2006) | 2 lines
Hold call structure lock in places where a qualify or peer action can destroy it.
........
r48506 | file | 2006-12-15 12:55:28 -0700 (Fri, 15 Dec 2006) | 2 lines
Turn payload_lock into bridge_lock and make it encompass all RTP structure contents that may relate to bridge information, including who we are bridged to.
........
r48513 | kpfleming | 2006-12-15 21:25:09 -0700 (Fri, 15 Dec 2006) | 2 lines
instead of initializing the curl library every time the CURL() function is invoked, do it only once per thread (this allows multiple calls to CURL() in the dialplan for a channel to run much more quickly, and also to re-use connections to the server) (thanks to JerJer for frequently complaining about this performance problem)
........
r48521 | kpfleming | 2006-12-16 13:12:41 -0700 (Sat, 16 Dec 2006) | 2 lines
since we really, really have to have autoconfig.h included before all other headers (especially system headers), the Makefile will now force it to happen (this will fix build problems with files like ast_expr2f.c, where we can't control the inclusion order in the file itself)
........
r48525 | kpfleming | 2006-12-16 14:14:34 -0700 (Sat, 16 Dec 2006) | 2 lines
simplify dependency tracking system, using the compiler's built-in method for generating them, and only doing dependency tracking if developer mode is enabled via the configure script
........
r48528 | kpfleming | 2006-12-16 14:34:41 -0700 (Sat, 16 Dec 2006) | 2 lines
use m4 quoting for AC_MSG_NOTICE calls, to keep these calls from thinking they have multiple arguments
........
Removed:
team/murf/bug8221-1.4/build_tools/mkdep
Modified:
team/murf/bug8221-1.4/ (props changed)
team/murf/bug8221-1.4/Makefile
team/murf/bug8221-1.4/Makefile.moddir_rules
team/murf/bug8221-1.4/Makefile.rules
team/murf/bug8221-1.4/acinclude.m4
team/murf/bug8221-1.4/agi/ (props changed)
team/murf/bug8221-1.4/agi/Makefile
team/murf/bug8221-1.4/apps/ (props changed)
team/murf/bug8221-1.4/cdr/ (props changed)
team/murf/bug8221-1.4/channels/ (props changed)
team/murf/bug8221-1.4/channels/chan_iax2.c
team/murf/bug8221-1.4/channels/chan_sip.c
team/murf/bug8221-1.4/codecs/ (props changed)
team/murf/bug8221-1.4/codecs/gsm/ (props changed)
team/murf/bug8221-1.4/codecs/ilbc/ (props changed)
team/murf/bug8221-1.4/codecs/lpc10/ (props changed)
team/murf/bug8221-1.4/configure
team/murf/bug8221-1.4/configure.ac
team/murf/bug8221-1.4/formats/ (props changed)
team/murf/bug8221-1.4/funcs/ (props changed)
team/murf/bug8221-1.4/funcs/func_curl.c
team/murf/bug8221-1.4/include/asterisk.h
team/murf/bug8221-1.4/include/asterisk/autoconfig.h.in
team/murf/bug8221-1.4/include/asterisk/rtp.h
team/murf/bug8221-1.4/main/ (props changed)
team/murf/bug8221-1.4/main/Makefile
team/murf/bug8221-1.4/main/db1-ast/ (props changed)
team/murf/bug8221-1.4/main/rtp.c
team/murf/bug8221-1.4/main/stdtime/localtime.c
team/murf/bug8221-1.4/pbx/ (props changed)
team/murf/bug8221-1.4/res/ (props changed)
team/murf/bug8221-1.4/utils/ (props changed)
team/murf/bug8221-1.4/utils/Makefile
Propchange: team/murf/bug8221-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/murf/bug8221-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec 17 00:51:19 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-48446
+/branches/1.4:1-48531
Modified: team/murf/bug8221-1.4/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/Makefile?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/Makefile (original)
+++ team/murf/bug8221-1.4/Makefile Sun Dec 17 00:51:19 2006
@@ -181,6 +181,8 @@
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
+
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused
endif
@@ -237,10 +239,6 @@
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
-SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
-MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
-OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
-SUBDIRS_DEPEND:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
@@ -304,7 +302,7 @@
@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
-$(SUBDIRS): depend makeopts.embed_rules
+$(SUBDIRS): include/asterisk/version.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
# ensure that all module subdirectories are processed before 'main' during
# a parallel build, since if there are modules selected to be embedded the
@@ -339,19 +337,13 @@
fi
@rm -f $@.tmp
-$(SUBDIRS_CLEAN_DEPEND):
- @$(MAKE) --no-print-directory -C $(@:-clean-depend=) clean-depend
-
$(SUBDIRS_CLEAN):
@$(MAKE) --no-print-directory -C $(@:-clean=) clean
-clean-depend: $(SUBDIRS_CLEAN_DEPEND)
-
-clean: $(SUBDIRS_CLEAN) clean-depend
+clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
rm -f include/asterisk/build.h
rm -f include/asterisk/version.h
- rm -f .depend
@$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean
@@ -395,7 +387,6 @@
grep ^C update.out | cut -b4- ; \
fi ; \
rm -f update.out; \
- $(MAKE) clean-depend; \
else \
echo "Not under version control"; \
fi
@@ -627,14 +618,6 @@
echo "We could not install init scripts for your operating system."; \
fi
-$(MOD_SUBDIRS_DEPEND):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-$(OTHER_SUBDIRS_DEPEND):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND)
-
sounds:
$(MAKE) -C sounds all
@@ -694,4 +677,4 @@
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
-.PHONY: menuselect main sounds clean clean-depend dist-clean distclean all prereqs depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: team/murf/bug8221-1.4/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/Makefile.moddir_rules?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/Makefile.moddir_rules (original)
+++ team/murf/bug8221-1.4/Makefile.moddir_rules Sun Dec 17 00:51:19 2006
@@ -40,7 +40,7 @@
modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
-.PHONY: clean clean-depend depend uninstall _all
+.PHONY: clean uninstall _all
ifneq ($(LOADABLE_MODS),)
_all: $(LOADABLE_MODS:%=%.so)
@@ -67,11 +67,9 @@
@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
-clean-depend::
- rm -f .depend
-
-clean:: clean-depend
+clean::
rm -f *.so *.o *.oo
+ rm -f .*.o.d .*.oo.d
rm -f modules.link
install:: all
@@ -79,11 +77,6 @@
uninstall::
-ifneq ($(wildcard .depend),)
- include .depend
+ifneq ($(wildcard .*.d),)
+ include .*.d
endif
-
-depend: .depend
-
-.depend:
- ../build_tools/mkdep $(ASTCFLAGS) `ls *.c *.cc 2> /dev/null`
Modified: team/murf/bug8221-1.4/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/Makefile.rules?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/Makefile.rules (original)
+++ team/murf/bug8221-1.4/Makefile.rules Sun Dec 17 00:51:19 2006
@@ -38,11 +38,19 @@
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
+endif
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
$(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS)
+endif
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
Modified: team/murf/bug8221-1.4/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/acinclude.m4?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/acinclude.m4 (original)
+++ team/murf/bug8221-1.4/acinclude.m4 Sun Dec 17 00:51:19 2006
@@ -69,10 +69,10 @@
if test "x${$1_HEADER_FOUND}" = "x0" ; then
if test ! -z "${$1_MANDATORY}" ;
then
- AC_MSG_NOTICE( ***)
- AC_MSG_NOTICE( *** It appears that you do not have the $2 development package installed.)
- AC_MSG_NOTICE( *** Please install it to include ${$1_DESCRIP} support, or re-run configure)
- AC_MSG_NOTICE( *** without explicitly specifying --with-${$1_OPTION})
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** It appears that you do not have the $2 development package installed.])
+ AC_MSG_NOTICE([*** Please install it to include ${$1_DESCRIP} support, or re-run configure])
+ AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1
fi
$1_LIB=""
@@ -84,10 +84,10 @@
fi
elif test ! -z "${$1_MANDATORY}";
then
- AC_MSG_NOTICE(***)
- AC_MSG_NOTICE(*** The ${$1_DESCRIP} installation on this system appears to be broken.)
- AC_MSG_NOTICE(*** Either correct the installation, or run configure)
- AC_MSG_NOTICE(*** without explicitly specifying --with-${$1_OPTION})
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** The ${$1_DESCRIP} installation on this system appears to be broken.])
+ AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+ AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1
fi
fi
Propchange: team/murf/bug8221-1.4/agi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,4 +1,4 @@
eagi-test
eagi-sphinx-test
-.depend
+*.d
strcompat.c
Modified: team/murf/bug8221-1.4/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/agi/Makefile?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/agi/Makefile (original)
+++ team/murf/bug8221-1.4/agi/Makefile Sun Dec 17 00:51:19 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-.PHONY: clean clean-depend all depend uninstall
+.PHONY: clean all uninstall
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
@@ -37,18 +37,11 @@
uninstall:
for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
-clean-depend:
- rm -f .depend
-
-clean: clean-depend
+clean:
rm -f *.so *.o look eagi-test eagi-sphinx-test
+ rm -f .*.o.d .*.oo.d
rm -f strcompat.c
-ifneq ($(wildcard .depend),)
- include .depend
+ifneq ($(wildcard .*.d),)
+ include .*.d
endif
-
-depend: .depend
-
-.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
Propchange: team/murf/bug8221-1.4/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: team/murf/bug8221-1.4/cdr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: team/murf/bug8221-1.4/channels/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
*.oo
Modified: team/murf/bug8221-1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/channels/chan_iax2.c?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/channels/chan_iax2.c (original)
+++ team/murf/bug8221-1.4/channels/chan_iax2.c Sun Dec 17 00:51:19 2006
@@ -1746,11 +1746,14 @@
ast_queue_hangup(owner);
}
+ AST_LIST_LOCK(&iaxq.queue);
AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
/* Cancel any pending transmissions */
if (cur->callno == pvt->callno)
cur->retries = -1;
}
+ AST_LIST_UNLOCK(&iaxq.queue);
+
if (pvt->reg)
pvt->reg->callno = 0;
if (!owner) {
@@ -2057,8 +2060,11 @@
{
struct iax_frame *cur;
int cnt = 0, dead=0, final=0;
+
if (argc != 3)
return RESULT_SHOWUSAGE;
+
+ AST_LIST_LOCK(&iaxq.queue);
AST_LIST_TRAVERSE(&iaxq.queue, cur, list) {
if (cur->retries < 0)
dead++;
@@ -2066,6 +2072,8 @@
final++;
cnt++;
}
+ AST_LIST_UNLOCK(&iaxq.queue);
+
ast_cli(fd, " IAX Statistics\n");
ast_cli(fd, "---------------------\n");
ast_cli(fd, "Outstanding frames: %d (%d ingress, %d egress)\n", iax_get_frames(), iax_get_iframes(), iax_get_oframes());
@@ -7656,7 +7664,9 @@
* call has the pointer to IP and must be updated to the new one
*/
if (reg->dnsmgr && ast_dnsmgr_changed(reg->dnsmgr) && (reg->callno > 0)) {
+ ast_mutex_lock(&iaxsl[reg->callno]);
iax2_destroy(reg->callno);
+ ast_mutex_unlock(&iaxsl[reg->callno]);
reg->callno = 0;
}
if (!reg->addr.sin_addr.s_addr) {
@@ -7822,8 +7832,11 @@
manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: IAX2/%s\r\nPeerStatus: Unreachable\r\nTime: %d\r\n", peer->name, peer->lastms);
ast_device_state_changed("IAX2/%s", peer->name); /* Activate notification */
}
- if (peer->callno > 0)
+ if (peer->callno > 0) {
+ ast_mutex_lock(&iaxsl[peer->callno]);
iax2_destroy(peer->callno);
+ ast_mutex_unlock(&iaxsl[peer->callno]);
+ }
peer->callno = 0;
peer->lastms = -1;
/* Try again quickly */
@@ -7854,7 +7867,9 @@
}
if (peer->callno > 0) {
ast_log(LOG_NOTICE, "Still have a callno...\n");
+ ast_mutex_lock(&iaxsl[peer->callno]);
iax2_destroy(peer->callno);
+ ast_mutex_unlock(&iaxsl[peer->callno]);
}
if (heldcall)
ast_mutex_unlock(&iaxsl[heldcall]);
@@ -8009,7 +8024,7 @@
{
/* Our job is simple: Send queued messages, retrying if necessary. Read frames
from the network, and queue them for delivery to the channels */
- int res, count;
+ int res, count, wakeup;
struct iax_frame *f;
if (timingfd > -1)
@@ -8020,13 +8035,16 @@
sent, and scheduling retransmissions if appropriate */
AST_LIST_LOCK(&iaxq.queue);
count = 0;
+ wakeup = -1;
AST_LIST_TRAVERSE_SAFE_BEGIN(&iaxq.queue, f, list) {
if (f->sentyet)
continue;
/* Try to lock the pvt, if we can't... don't fret - defer it till later */
- if (ast_mutex_trylock(&iaxsl[f->callno]))
+ if (ast_mutex_trylock(&iaxsl[f->callno])) {
+ wakeup = 1;
continue;
+ }
f->sentyet++;
@@ -8057,7 +8075,7 @@
ast_log(LOG_DEBUG, "chan_iax2: Sent %d queued outbound frames all at once\n", count);
/* Now do the IO, and run scheduled tasks */
- res = ast_io_wait(io, -1);
+ res = ast_io_wait(io, wakeup);
if (res >= 0) {
if (res >= 20)
ast_log(LOG_DEBUG, "chan_iax2: ast_io_wait ran %d I/Os all at once\n", res);
@@ -8692,8 +8710,11 @@
ast_sched_del(sched, peer->expire);
if (peer->pokeexpire > -1)
ast_sched_del(sched, peer->pokeexpire);
- if (peer->callno > 0)
+ if (peer->callno > 0) {
+ ast_mutex_lock(&iaxsl[peer->callno]);
iax2_destroy(peer->callno);
+ ast_mutex_unlock(&iaxsl[peer->callno]);
+ }
register_peer_exten(peer, 0);
Modified: team/murf/bug8221-1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/channels/chan_sip.c?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/channels/chan_sip.c (original)
+++ team/murf/bug8221-1.4/channels/chan_sip.c Sun Dec 17 00:51:19 2006
@@ -450,11 +450,11 @@
{ SIP_OPT_SDP_ANAT, NOT_SUPPORTED, "sdp-anat" },
/* RFC3329: Security agreement mechanism */
{ SIP_OPT_SEC_AGREE, NOT_SUPPORTED, "sec_agree" },
- /* SIMPLE events: draft-ietf-simple-event-list-07.txt */
+ /* SIMPLE events: RFC4662 */
{ SIP_OPT_EVENTLIST, NOT_SUPPORTED, "eventlist" },
/* GRUU: Globally Routable User Agent URI's */
{ SIP_OPT_GRUU, NOT_SUPPORTED, "gruu" },
- /* Target-dialog: draft-ietf-sip-target-dialog-03.txt */
+ /* RFC4538: Target-dialog */
{ SIP_OPT_TARGET_DIALOG,NOT_SUPPORTED, "tdialog" },
/* Disable the REFER subscription, RFC 4488 */
{ SIP_OPT_NOREFERSUB, NOT_SUPPORTED, "norefersub" },
@@ -3949,6 +3949,8 @@
{ "Reject-Contact", "j" },
{ "Request-Disposition", "d" },
{ "Session-Expires", "x" },
+ { "Identity", "y" },
+ { "Identity-Info", "n" },
};
int x;
@@ -12248,6 +12250,7 @@
}
/* Fall through */
case 503: /* Service Unavailable */
+ case 504: /* Server Timeout */
if (owner)
ast_queue_control(p->owner, AST_CONTROL_CONGESTION);
break;
@@ -12378,6 +12381,7 @@
case 603: /* Decline */
case 500: /* Server error */
case 503: /* Service Unavailable */
+ case 504: /* Server timeout */
if (sipmethod == SIP_INVITE) { /* re-invite failed */
sip_cancel_destroy(p);
Propchange: team/murf/bug8221-1.4/codecs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,4 +1,4 @@
-.depend
+*.d
*.a
*.so
modules.link
Propchange: team/murf/bug8221-1.4/codecs/gsm/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,1 +1,2 @@
+*.d
lib
Propchange: team/murf/bug8221-1.4/codecs/ilbc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
*.a
*.so
Propchange: team/murf/bug8221-1.4/codecs/lpc10/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 17 00:51:19 2006
@@ -1,3 +1,3 @@
-.depend
+*.d
*.a
*.so
Modified: team/murf/bug8221-1.4/configure
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/configure?view=diff&rev=48532&r1=48531&r2=48532
==============================================================================
--- team/murf/bug8221-1.4/configure (original)
+++ team/murf/bug8221-1.4/configure Sun Dec 17 00:51:19 2006
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision: 48279 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60a.
+# Generated by GNU Autoconf 2.61.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -13,7 +13,8 @@
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -22,10 +23,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
# PATH needs CR
@@ -218,7 +222,7 @@
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -236,7 +240,6 @@
# Try only shells that exist, to save several forks.
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -245,10 +248,12 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
:
_ASEOF
@@ -256,7 +261,6 @@
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -265,10 +269,12 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
:
(as_func_return () {
@@ -515,19 +521,28 @@
as_mkdir_p=false
fi
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- as_executable_p="test -x"
-else
- as_executable_p=:
-fi
-rm -f conf$$.file
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -602,6 +617,8 @@
# include <unistd.h>
#endif"
+ac_header_list=
+ac_func_list=
ac_subst_vars='SHELL
PATH_SEPARATOR
PACKAGE_NAME
@@ -843,6 +860,7 @@
CC
CFLAGS
LDFLAGS
+LIBS
CPPFLAGS
CXX
CXXFLAGS
@@ -954,10 +972,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
@@ -973,10 +991,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1170,19 +1188,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
eval with_$ac_package=no ;;
--x)
@@ -1472,6 +1490,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
@@ -1543,7 +1562,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.60a
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1559,7 +1578,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.60a. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1831,6 +1850,10 @@
>$cache_file
fi
+ac_header_list="$ac_header_list sys/time.h"
+ac_header_list="$ac_header_list unistd.h"
+ac_func_list="$ac_func_list alarm"
+ac_header_list="$ac_header_list utime.h"
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -2111,7 +2134,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2154,7 +2177,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_UNAME="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2233,7 +2256,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2273,7 +2296,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2329,7 +2352,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="${ac_tool_prefix}g++"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2369,7 +2392,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="g++"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2425,7 +2448,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LD="${ac_tool_prefix}ld"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2465,7 +2488,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LD="ld"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2521,7 +2544,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2561,7 +2584,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2617,7 +2640,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2657,7 +2680,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2721,7 +2744,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2761,7 +2784,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2818,7 +2841,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2859,7 +2882,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -2917,7 +2940,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2961,7 +2984,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3324,27 +3347,10 @@
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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -3399,27 +3405,10 @@
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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -3454,27 +3443,10 @@
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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
@@ -3510,27 +3482,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
[... 10080 lines stripped ...]
More information about the asterisk-commits
mailing list