[svn-commits] russell: branch russell/jack r93245 - in /team/russell/jack: ./ apps/ build_t...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Dec 17 11:40:15 CST 2007
Author: russell
Date: Mon Dec 17 11:40:14 2007
New Revision: 93245
URL: http://svn.digium.com/view/asterisk?view=rev&rev=93245
Log:
resolve, reset
Removed:
team/russell/jack/build_tools/prep_moduledeps
Modified:
team/russell/jack/ (props changed)
team/russell/jack/Makefile
team/russell/jack/Makefile.moddir_rules
team/russell/jack/apps/ (props changed)
team/russell/jack/apps/Makefile
team/russell/jack/build_tools/embed_modules.xml
team/russell/jack/build_tools/make_version
team/russell/jack/build_tools/menuselect-deps.in
team/russell/jack/build_tools/prep_tarball
team/russell/jack/cdr/ (props changed)
team/russell/jack/cdr/Makefile
team/russell/jack/channels/ (props changed)
team/russell/jack/channels/Makefile
team/russell/jack/channels/chan_oss.c
team/russell/jack/channels/chan_sip.c
team/russell/jack/channels/chan_unistim.c
team/russell/jack/codecs/ (props changed)
team/russell/jack/codecs/Makefile
team/russell/jack/configure
team/russell/jack/configure.ac
team/russell/jack/formats/ (props changed)
team/russell/jack/formats/Makefile
team/russell/jack/funcs/ (props changed)
team/russell/jack/funcs/Makefile
team/russell/jack/makeopts.in
team/russell/jack/pbx/ (props changed)
team/russell/jack/pbx/Makefile
team/russell/jack/res/ (props changed)
team/russell/jack/res/Makefile
team/russell/jack/utils/ (props changed)
Propchange: team/russell/jack/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/jack/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/jack/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/jack/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 17 11:40:14 2007
@@ -1,1 +1,1 @@
-/trunk:1-93175
+/trunk:1-93244
Modified: team/russell/jack/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/Makefile?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/Makefile (original)
+++ team/russell/jack/Makefile Mon Dec 17 11:40:14 2007
@@ -79,6 +79,7 @@
export INSTALL
export STRIP
export DOWNLOAD
+export AWK
export GREP
export ID
@@ -250,10 +251,10 @@
ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
endif
-ASTERISKVERSION:=$(shell build_tools/make_version .)
+ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
ifneq ($(wildcard .version),)
- ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+ ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
else
RPMVERSION=unknown
@@ -279,6 +280,7 @@
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifneq ($(findstring darwin,$(OSARCH)),)
ASTCFLAGS+=-D__Darwin__
@@ -295,6 +297,15 @@
SOLINK=-shared -fpic -L/usr/local/ssl/lib
endif
+# comment to print directories during submakes
+#PRINT_DIR=yes
+
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE=$(MAKE) --quiet
+else
+SUBMAKE=$(MAKE) --quiet --no-print-directory
+endif
+
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)
HAVEDOT=yes
@@ -311,9 +322,6 @@
mK=" make"
endif
-# comment to print directories during submakes
-PRINT_DIR?= --no-print-directory
-
all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +"
@@ -335,13 +343,17 @@
menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
- @echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+ @echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LDFLAGS):
- @echo "EMBED_LDFLAGS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+ @echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LIBS):
- @echo "EMBED_LIBS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+ @echo "EMBED_LIBS+="`$(SUBMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_MENUSELECT_TREE):
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
makeopts.embed_rules: menuselect.makeopts
@echo "Generating embedded module rules ..."
@@ -782,7 +794,15 @@
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 configure
@echo "Generating input for menuselect ..."
- @build_tools/prep_moduledeps > $@
+ @echo "<?xml version=\"1.0\"?>" > $@
+ @echo >> $@
+ @echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
+ @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+ @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+ @cat build_tools/cflags.xml >> $@
+ @cat build_tools/embed_modules.xml >> $@
+ @cat sounds/sounds.xml >> $@
+ @echo "</menu>" >> $@
pdf: asterisk.pdf
asterisk.pdf:
Modified: team/russell/jack/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/russell/jack/Makefile.moddir_rules?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/Makefile.moddir_rules (original)
+++ team/russell/jack/Makefile.moddir_rules Mon Dec 17 11:40:14 2007
@@ -41,33 +41,19 @@
# Use MODULE_EXCLUDE to specify additional modules to exclude.
ifneq ($(MODULE_PREFIX),)
- # Compute the lowercase and uppercase directory name. The former
- # is used as a key in MENUSELECT_EMBED, the latter is part of
- # the name of the MENUSELECT_* variable containing the exclude list
- # generated by menuselect.
- A:=$(notdir $(CURDIR))
- B:=$(shell echo $A | tr "[a-z]" "[A-Z]")
- # MENUSELECT_$(L) contains the list of modules excluded by menuselect.
- # MODULE_EXCLUDE contains the locally generated exclude list
- L:=$(MENUSELECT_$(B)) $(MODULE_EXCLUDE)
- # construct the list of C and CC modules from the content of the directory
- C_MODS:=
- CC_MODS:=
- C_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.c,%,$(wildcard $(pre)*.c))))
- CC_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.cc,%,$(wildcard $(pre)*.cc))))
+ ALL_C_MODS:=$(patsubst %.c,%,$(wildcard $(MODULE_PREFIX)_*.c))
+ ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard $(MODULE_PREFIX)_*.cc))
+
+ C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+ CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
# and store in the list of embedded or loadable modules
- ifneq ($(findstring $(A),$(MENUSELECT_EMBED)),)
+ ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
else
LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
endif
endif
-# debugging
-# x:=$(shell echo 'in $(B)' >&2)
-# x:=$(shell echo 'filtered out $(L)' >&2)
-# x:=$(shell echo 'C_MODS= $(C_MODS)' >&2)
-# x:=$(shell sleep 2)
# Both C++ and C++ sources need their module name in AST_MODULE
# We also pass whatever _INCLUDE list is generated by menuselect
@@ -92,7 +78,7 @@
modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
-.PHONY: clean uninstall _all
+.PHONY: clean uninstall _all moduleinfo makeopts
ifneq ($(LOADABLE_MODS),)
_all: $(LOADABLE_MODS:%=%.so)
@@ -137,6 +123,40 @@
uninstall::
+dist-clean::
+ rm -f .*.moduleinfo .moduleinfo
+ rm -f .*.makeopts .makeopts
+
+.%.moduleinfo: %.c
+ @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@
+ $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+ echo "</member>" >> $@
+
+.%.moduleinfo: %.cc
+ @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.so\">" > $@
+ $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+ echo "</member>" >> $@
+
+.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+ @echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" remove_on_change=\"$(SUBDIR)/modules.link\">" > $@
+ @cat $^ >> $@
+ @echo "</category>" >> $@
+
+moduleinfo: .moduleinfo
+ @cat $<
+
+.%.makeopts: %.c
+ @$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.%.makeopts: %.cc
+ @$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.makeopts:: $(addsuffix .makeopts,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+ @cat $^ > $@
+
+makeopts: .makeopts
+ @cat $<
+
ifneq ($(wildcard .*.d),)
include .*.d
endif
Propchange: team/russell/jack/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 17 11:40:14 2007
@@ -1,8 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
*.i
+*.makeopts
+*.moduleinfo
*.s
-*.d
-*.a
*.so
modules.link
-*.eo
-*.eoo
Modified: team/russell/jack/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/apps/Makefile?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/apps/Makefile (original)
+++ team/russell/jack/apps/Makefile Mon Dec 17 11:40:14 2007
@@ -11,10 +11,10 @@
-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
-#interesting files in this directory start with app_
-MODULE_PREFIX=app_
+MODULE_PREFIX=app
+MENUSELECT_CATEGORY=APPS
+MENUSELECT_DESCRIPTION=Applications
-# create extra MENUSELECT_DEPENDS entries.
MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
Modified: team/russell/jack/build_tools/embed_modules.xml
URL: http://svn.digium.com/view/asterisk/team/russell/jack/build_tools/embed_modules.xml?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/build_tools/embed_modules.xml (original)
+++ team/russell/jack/build_tools/embed_modules.xml Mon Dec 17 11:40:14 2007
@@ -1,26 +1,26 @@
<category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
- <member name="apps" displayname="Applications" remove_on_change="apps/*.o">
+ <member name="APPS" displayname="Applications" remove_on_change="apps/*.o">
<depend>gnu_ld</depend>
</member>
- <member name="cdr" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
+ <member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
<depend>gnu_ld</depend>
</member>
- <member name="channels" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o">
+ <member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o">
<depend>gnu_ld</depend>
</member>
- <member name="codecs" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a codecs/g722/libg722.a">
+ <member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a codecs/g722/libg722.a">
<depend>gnu_ld</depend>
</member>
- <member name="formats" displayname="File Formats" remove_on_change="formats/*.o">
+ <member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o">
<depend>gnu_ld</depend>
</member>
- <member name="funcs" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
+ <member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
<depend>gnu_ld</depend>
</member>
- <member name="pbx" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o">
+ <member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o">
<depend>gnu_ld</depend>
</member>
- <member name="res" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o">
+ <member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o">
<depend>gnu_ld</depend>
</member>
</category>
Modified: team/russell/jack/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/russell/jack/build_tools/make_version?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/build_tools/make_version (original)
+++ team/russell/jack/build_tools/make_version Mon Dec 17 11:40:14 2007
@@ -3,7 +3,7 @@
if [ -f ${1}/.version ]; then
cat ${1}/.version
elif [ -d .svn ]; then
- PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
+ PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0
TEAM=0
TAG=0
Modified: team/russell/jack/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/jack/build_tools/menuselect-deps.in?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/build_tools/menuselect-deps.in (original)
+++ team/russell/jack/build_tools/menuselect-deps.in Mon Dec 17 11:40:14 2007
@@ -43,3 +43,4 @@
MISDN=@PBX_MISDN@
SUPPSERV=@PBX_SUPPSERV@
GNU_LD=@GNU_LD@
+WINARCH=@WINARCH@
Modified: team/russell/jack/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/team/russell/jack/build_tools/prep_tarball?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/build_tools/prep_tarball (original)
+++ team/russell/jack/build_tools/prep_tarball Mon Dec 17 11:40:14 2007
@@ -5,7 +5,8 @@
#
# It will be executed from the top-level directory of the project.
-make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget
+make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget all
+make AWK=awk GREP=grep menuselect-tree
VERSION=`cat .version`
sed -i -e "s/ASTERISKVERSION/${VERSION}/" doc/tex/asterisk.tex
Propchange: team/russell/jack/cdr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 17 11:40:14 2007
@@ -1,8 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
*.i
+*.makeopts
+*.moduleinfo
*.s
-*.d
-*.a
*.so
modules.link
-*.eo
-*.eoo
Modified: team/russell/jack/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/cdr/Makefile?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/cdr/Makefile (original)
+++ team/russell/jack/cdr/Makefile Mon Dec 17 11:40:14 2007
@@ -11,7 +11,9 @@
-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
-MODULE_PREFIX=cdr_
+MODULE_PREFIX=cdr
+MENUSELECT_CATEGORY=CDR
+MENUSELECT_DESCRIPTION=Call Detail Recording
all: _all
Propchange: team/russell/jack/channels/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 17 11:40:14 2007
@@ -1,10 +1,12 @@
+*.a
+*.d
+*.eo
+*.eoo
*.i
+*.makeopts
+*.moduleinfo
+*.oo
*.s
-*.d
-*.a
*.so
-*.oo
gentone
modules.link
-*.eo
-*.eoo
Modified: team/russell/jack/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/channels/Makefile?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/channels/Makefile (original)
+++ team/russell/jack/channels/Makefile Mon Dec 17 11:40:14 2007
@@ -11,7 +11,9 @@
-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
-MODULE_PREFIX=chan_
+MODULE_PREFIX=chan
+MENUSELECT_CATEGORY=CHANNELS
+MENUSELECT_DESCRIPTION=Channel Drivers
ifeq ($(OSARCH),OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
@@ -33,11 +35,6 @@
ifeq ($(OSARCH),NetBSD)
PTLIB=-lpt_NetBSD_x86_r
H323LIB=-lh323_NetBSD_x86_r
-endif
-
-MODULE_EXCLUDE:=
-ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
- MODULE_EXCLUDE+= chan_oss chan_unistim
endif
ifeq ($(wildcard h323/libchanh323.a),)
Modified: team/russell/jack/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/russell/jack/channels/chan_oss.c?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/channels/chan_oss.c (original)
+++ team/russell/jack/channels/chan_oss.c Mon Dec 17 11:40:14 2007
@@ -35,6 +35,7 @@
/*** MODULEINFO
<depend>ossaudio</depend>
+ <conflict>winarch</conflict>
***/
#include "asterisk.h"
Modified: team/russell/jack/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/jack/channels/chan_sip.c?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/channels/chan_sip.c (original)
+++ team/russell/jack/channels/chan_sip.c Mon Dec 17 11:40:14 2007
@@ -16921,7 +16921,7 @@
return;
/* If we have no timers set, return now */
- if (ast_rtp_get_rtpkeepalive(dialog->rtp) == 0 || (ast_rtp_get_rtptimeout(dialog->rtp) == 0 && ast_rtp_get_rtpholdtimeout(dialog->rtp) == 0))
+ if ((ast_rtp_get_rtpkeepalive(dialog->rtp) == 0) && (ast_rtp_get_rtptimeout(dialog->rtp) == 0) && (ast_rtp_get_rtpholdtimeout(dialog->rtp) == 0))
return;
/* Check AUDIO RTP keepalives */
@@ -16948,7 +16948,7 @@
if (sin.sin_addr.s_addr || (ast_rtp_get_rtpholdtimeout(dialog->rtp) &&
(t > dialog->lastrtprx + ast_rtp_get_rtpholdtimeout(dialog->rtp)))) {
/* Needs a hangup */
- if (dialog->rtptimeout) {
+ if (ast_rtp_get_rtptimeout(dialog->rtp)) {
while (dialog->owner && ast_channel_trylock(dialog->owner)) {
sip_pvt_unlock(dialog);
usleep(1);
Modified: team/russell/jack/channels/chan_unistim.c
URL: http://svn.digium.com/view/asterisk/team/russell/jack/channels/chan_unistim.c?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/channels/chan_unistim.c (original)
+++ team/russell/jack/channels/chan_unistim.c Mon Dec 17 11:40:14 2007
@@ -31,6 +31,10 @@
*
* \ingroup channel_drivers
*/
+
+/*** MODULEINFO
+ <conflict>winarch</conflict>
+ ***/
#include "asterisk.h"
@@ -4591,6 +4595,7 @@
ast_verbose(VERBOSE_PREFIX_1 "Reloading unistim.conf...\n");
reload_config();
}
+ pthread_testcancel();
}
/* Never reached */
return NULL;
@@ -4617,7 +4622,7 @@
pthread_kill(monitor_thread, SIGURG);
} else {
pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
/* Start a new monitor */
if (ast_pthread_create(&monitor_thread, &attr, do_monitor, NULL) < 0) {
ast_mutex_unlock(&monlock);
@@ -5268,10 +5273,10 @@
if (ast_strlen_zero(d->maintext1))
strcpy(d->maintext1, d->name);
if (ast_strlen_zero(d->titledefault)) {
- struct ast_tm tm;
+ struct ast_tm tm = { 0, };
struct timeval cur_time = ast_tvnow();
- if ((ast_localtime(&cur_time, &tm, 0)) == 0) {
+ if ((ast_localtime(&cur_time, &tm, 0)) == 0 || ast_strlen_zero(tm.tm_zone)) {
display_last_error("Error in ast_localtime()");
ast_copy_string(d->titledefault, "UNISTIM for*", 12);
} else {
Propchange: team/russell/jack/codecs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 17 11:40:14 2007
@@ -1,8 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
*.i
+*.makeopts
+*.moduleinfo
*.s
-*.d
-*.a
*.so
modules.link
-*.eo
-*.eoo
Modified: team/russell/jack/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/jack/codecs/Makefile?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/codecs/Makefile (original)
+++ team/russell/jack/codecs/Makefile Mon Dec 17 11:40:14 2007
@@ -13,7 +13,9 @@
-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
-MODULE_PREFIX=codec_
+MODULE_PREFIX=codec
+MENUSELECT_CATEGORY=CODECS
+MENUSELECT_DESCRIPTION=Codec Translators
LIBILBC:=ilbc/libilbc.a
LIBLPC10:=lpc10/liblpc10.a
Modified: team/russell/jack/configure
URL: http://svn.digium.com/view/asterisk/team/russell/jack/configure?view=diff&rev=93245&r1=93244&r2=93245
==============================================================================
--- team/russell/jack/configure (original)
+++ team/russell/jack/configure Mon Dec 17 11:40:14 2007
@@ -1,7 +1,9 @@
#! /bin/sh
-# From configure.ac Revision: 92486 .
+# From configure.ac Revision: 93146 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.61 for asterisk 1.4.
+#
+# Report bugs to <www.asterisk.org>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -573,13 +575,12 @@
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="asterisk"
+PACKAGE_NAME='asterisk'
+PACKAGE_TARNAME='asterisk'
+PACKAGE_VERSION='1.4'
+PACKAGE_STRING='asterisk 1.4'
+PACKAGE_BUGREPORT='www.asterisk.org'
+
ac_unique_file="main/asterisk.c"
# Factoring default headers for most tests.
ac_includes_default="\
@@ -683,6 +684,7 @@
HOST_VENDOR
HOST_OS
OSARCH
+WINARCH
UNAME
PBX_OSREV
CXX
@@ -1010,7 +1012,7 @@
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1474,7 +1476,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures asterisk 1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1522,7 +1524,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/asterisk]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1538,7 +1540,9 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of asterisk 1.4:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -1623,6 +1627,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to <www.asterisk.org>.
_ACEOF
ac_status=$?
fi
@@ -1683,7 +1688,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-configure
+asterisk configure 1.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1699,7 +1704,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by asterisk $as_me 1.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2041,6 +2046,14 @@
+
+
+
+
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3877,7 +3890,12 @@
echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
@@ -4033,6 +4051,8 @@
+
+WINARCH=0
case "${host_os}" in
freebsd*)
@@ -4047,10 +4067,19 @@
solaris*)
OSARCH=SunOS
;;
+ mingw32)
+ OSARCH=mingw32
+ WINARCH=1
+ ;;
+ cygwin)
+ OSARCH=cygwin
+ WINARCH=1
+ ;;
*)
OSARCH=${host_os}
;;
esac
+
@@ -6732,6 +6761,47 @@
fi
+# Extract the first word of "awk", so it can be a program name with args.
+set dummy awk; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $AWK in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_AWK="$AWK" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_AWK" && ac_cv_path_AWK=":"
+ ;;
+esac
+fi
+AWK=$ac_cv_path_AWK
+if test -n "$AWK"; then
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
# 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
@@ -10100,7 +10170,12 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -10242,7 +10317,12 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -11734,7 +11814,12 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -12089,7 +12174,12 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -12846,7 +12936,12 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -13352,7 +13447,12 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -13773,7 +13873,12 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -15520,7 +15625,12 @@
echo "$as_me: WARNING: sys/poll.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sys/poll.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sys/poll.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for sys/poll.h" >&5
@@ -16100,7 +16210,12 @@
echo "$as_me: WARNING: byteswap.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: byteswap.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: byteswap.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for byteswap.h" >&5
@@ -17497,7 +17612,12 @@
echo "$as_me: WARNING: libkern/OSAtomic.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libkern/OSAtomic.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for libkern/OSAtomic.h" >&5
@@ -18139,7 +18259,12 @@
echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
@@ -18396,7 +18521,12 @@
echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for curses.h" >&5
@@ -18654,7 +18784,12 @@
echo "$as_me: WARNING: sys/capability.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for sys/capability.h" >&5
@@ -18913,7 +19048,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -19169,7 +19309,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -19425,7 +19570,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -19681,7 +19831,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -19937,7 +20092,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -20193,7 +20353,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -20449,7 +20614,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -20705,7 +20875,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for " >&5
@@ -20961,7 +21136,12 @@
echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## ------------------------------- ##
[... 1704 lines stripped ...]
More information about the svn-commits
mailing list