[asterisk-commits] branch oej/00-labarea r22312 - in
/team/oej/00-labarea: ./ agi/ apps/ build_t...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Apr 24 13:17:25 MST 2006
Author: oej
Date: Mon Apr 24 15:17:24 2006
New Revision: 22312
URL: http://svn.digium.com/view/asterisk?rev=22312&view=rev
Log:
Update to trunk, resolve conflicts
Added:
team/oej/00-labarea/acinclude.m4
- copied unchanged from r22306, trunk/acinclude.m4
team/oej/00-labarea/bootstrap.sh
- copied unchanged from r22306, trunk/bootstrap.sh
team/oej/00-labarea/build_tools/Makefile
- copied unchanged from r22306, trunk/build_tools/Makefile
team/oej/00-labarea/build_tools/cflags.xml
- copied unchanged from r22306, trunk/build_tools/cflags.xml
team/oej/00-labarea/build_tools/get_moduledeps
- copied unchanged from r22306, trunk/build_tools/get_moduledeps
team/oej/00-labarea/build_tools/make_version
- copied unchanged from r22306, trunk/build_tools/make_version
team/oej/00-labarea/build_tools/menuselect-deps.in
- copied unchanged from r22306, trunk/build_tools/menuselect-deps.in
team/oej/00-labarea/build_tools/menuselect.c
- copied unchanged from r22306, trunk/build_tools/menuselect.c
team/oej/00-labarea/build_tools/menuselect.h
- copied unchanged from r22306, trunk/build_tools/menuselect.h
team/oej/00-labarea/build_tools/menuselect_curses.c
- copied unchanged from r22306, trunk/build_tools/menuselect_curses.c
team/oej/00-labarea/build_tools/prep_moduledeps
- copied unchanged from r22306, trunk/build_tools/prep_moduledeps
team/oej/00-labarea/config.guess
- copied unchanged from r22306, trunk/config.guess
team/oej/00-labarea/config.sub
- copied unchanged from r22306, trunk/config.sub
team/oej/00-labarea/configure.ac
- copied unchanged from r22306, trunk/configure.ac
team/oej/00-labarea/include/asterisk/ael_structs.h
- copied unchanged from r22306, trunk/include/asterisk/ael_structs.h
team/oej/00-labarea/makeopts.in
- copied unchanged from r22306, trunk/makeopts.in
team/oej/00-labarea/mxml/ (props changed)
- copied from r22306, trunk/mxml/
team/oej/00-labarea/mxml/.cvsignore
- copied unchanged from r22306, trunk/mxml/.cvsignore
team/oej/00-labarea/mxml/ANNOUNCEMENT
- copied unchanged from r22306, trunk/mxml/ANNOUNCEMENT
team/oej/00-labarea/mxml/CHANGES
- copied unchanged from r22306, trunk/mxml/CHANGES
team/oej/00-labarea/mxml/COPYING
- copied unchanged from r22306, trunk/mxml/COPYING
team/oej/00-labarea/mxml/Makefile.in
- copied unchanged from r22306, trunk/mxml/Makefile.in
team/oej/00-labarea/mxml/README
- copied unchanged from r22306, trunk/mxml/README
team/oej/00-labarea/mxml/config.h.in
- copied unchanged from r22306, trunk/mxml/config.h.in
team/oej/00-labarea/mxml/configure
- copied unchanged from r22306, trunk/mxml/configure
team/oej/00-labarea/mxml/configure.in
- copied unchanged from r22306, trunk/mxml/configure.in
team/oej/00-labarea/mxml/install-sh
- copied unchanged from r22306, trunk/mxml/install-sh
team/oej/00-labarea/mxml/mxml-attr.c
- copied unchanged from r22306, trunk/mxml/mxml-attr.c
team/oej/00-labarea/mxml/mxml-entity.c
- copied unchanged from r22306, trunk/mxml/mxml-entity.c
team/oej/00-labarea/mxml/mxml-file.c
- copied unchanged from r22306, trunk/mxml/mxml-file.c
team/oej/00-labarea/mxml/mxml-index.c
- copied unchanged from r22306, trunk/mxml/mxml-index.c
team/oej/00-labarea/mxml/mxml-node.c
- copied unchanged from r22306, trunk/mxml/mxml-node.c
team/oej/00-labarea/mxml/mxml-private.c
- copied unchanged from r22306, trunk/mxml/mxml-private.c
team/oej/00-labarea/mxml/mxml-search.c
- copied unchanged from r22306, trunk/mxml/mxml-search.c
team/oej/00-labarea/mxml/mxml-set.c
- copied unchanged from r22306, trunk/mxml/mxml-set.c
team/oej/00-labarea/mxml/mxml-string.c
- copied unchanged from r22306, trunk/mxml/mxml-string.c
team/oej/00-labarea/mxml/mxml.h
- copied unchanged from r22306, trunk/mxml/mxml.h
team/oej/00-labarea/mxml/mxml.list.in
- copied unchanged from r22306, trunk/mxml/mxml.list.in
team/oej/00-labarea/mxml/mxml.pc
- copied unchanged from r22306, trunk/mxml/mxml.pc
team/oej/00-labarea/mxml/mxml.pc.in
- copied unchanged from r22306, trunk/mxml/mxml.pc.in
team/oej/00-labarea/pbx/ael/
- copied from r22306, trunk/pbx/ael/
team/oej/00-labarea/pbx/ael/ael-test/
- copied from r22306, trunk/pbx/ael/ael-test/
team/oej/00-labarea/pbx/ael/ael-test/ael-test1/
- copied from r22306, trunk/pbx/ael/ael-test/ael-test1/
team/oej/00-labarea/pbx/ael/ael-test/ael-test1/extensions.ael
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test1/extensions.ael
team/oej/00-labarea/pbx/ael/ael-test/ael-test2/
- copied from r22306, trunk/pbx/ael/ael-test/ael-test2/
team/oej/00-labarea/pbx/ael/ael-test/ael-test2/apptest.ael2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test2/apptest.ael2
team/oej/00-labarea/pbx/ael/ael-test/ael-test2/extensions.ael
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test2/extensions.ael
team/oej/00-labarea/pbx/ael/ael-test/ael-test3/
- copied from r22306, trunk/pbx/ael/ael-test/ael-test3/
team/oej/00-labarea/pbx/ael/ael-test/ael-test3/extensions.ael
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test3/extensions.ael
team/oej/00-labarea/pbx/ael/ael-test/ael-test3/include1.ael2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test3/include1.ael2
team/oej/00-labarea/pbx/ael/ael-test/ael-test3/include2.ael2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test3/include2.ael2
team/oej/00-labarea/pbx/ael/ael-test/ael-test3/include3.ael2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test3/include3.ael2
team/oej/00-labarea/pbx/ael/ael-test/ael-test3/include4.ael2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test3/include4.ael2
team/oej/00-labarea/pbx/ael/ael-test/ael-test3/include5.ael2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test3/include5.ael2
team/oej/00-labarea/pbx/ael/ael-test/ael-test4/
- copied from r22306, trunk/pbx/ael/ael-test/ael-test4/
team/oej/00-labarea/pbx/ael/ael-test/ael-test4/apptest.ael2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test4/apptest.ael2
team/oej/00-labarea/pbx/ael/ael-test/ael-test4/extensions.ael
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test4/extensions.ael
team/oej/00-labarea/pbx/ael/ael-test/ael-test5/
- copied from r22306, trunk/pbx/ael/ael-test/ael-test5/
team/oej/00-labarea/pbx/ael/ael-test/ael-test5/extensions.ael
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test5/extensions.ael
team/oej/00-labarea/pbx/ael/ael-test/ael-test6/
- copied from r22306, trunk/pbx/ael/ael-test/ael-test6/
team/oej/00-labarea/pbx/ael/ael-test/ael-test6/extensions.ael
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test6/extensions.ael
team/oej/00-labarea/pbx/ael/ael-test/ael-test7/
- copied from r22306, trunk/pbx/ael/ael-test/ael-test7/
team/oej/00-labarea/pbx/ael/ael-test/ael-test7/extensions.ael
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ael-test7/extensions.ael
team/oej/00-labarea/pbx/ael/ael-test/ref.ael-test1
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ref.ael-test1
team/oej/00-labarea/pbx/ael/ael-test/ref.ael-test2
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ref.ael-test2
team/oej/00-labarea/pbx/ael/ael-test/ref.ael-test3
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ref.ael-test3
team/oej/00-labarea/pbx/ael/ael-test/ref.ael-test4
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ref.ael-test4
team/oej/00-labarea/pbx/ael/ael-test/ref.ael-test5
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ref.ael-test5
team/oej/00-labarea/pbx/ael/ael-test/ref.ael-test6
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ref.ael-test6
team/oej/00-labarea/pbx/ael/ael-test/ref.ael-test7
- copied unchanged from r22306, trunk/pbx/ael/ael-test/ref.ael-test7
team/oej/00-labarea/pbx/ael/ael-test/runtests
- copied unchanged from r22306, trunk/pbx/ael/ael-test/runtests
team/oej/00-labarea/pbx/ael/ael-test/setref
- copied unchanged from r22306, trunk/pbx/ael/ael-test/setref
team/oej/00-labarea/pbx/ael/ael.flex
- copied unchanged from r22306, trunk/pbx/ael/ael.flex
team/oej/00-labarea/pbx/ael/ael.tab.c
- copied unchanged from r22306, trunk/pbx/ael/ael.tab.c
team/oej/00-labarea/pbx/ael/ael.tab.h
- copied unchanged from r22306, trunk/pbx/ael/ael.tab.h
team/oej/00-labarea/pbx/ael/ael.y
- copied unchanged from r22306, trunk/pbx/ael/ael.y
team/oej/00-labarea/pbx/ael/ael_lex.c
- copied unchanged from r22306, trunk/pbx/ael/ael_lex.c
team/oej/00-labarea/utils/ael_main.c
- copied unchanged from r22306, trunk/utils/ael_main.c
team/oej/00-labarea/utils/expr2.testinput
- copied unchanged from r22306, trunk/utils/expr2.testinput
Removed:
team/oej/00-labarea/build_tools/make_svn_branch_name
Modified:
team/oej/00-labarea/ (props changed)
team/oej/00-labarea/CREDITS
team/oej/00-labarea/Makefile
team/oej/00-labarea/UPGRADE.txt
team/oej/00-labarea/agi/Makefile
team/oej/00-labarea/agi/eagi-sphinx-test.c
team/oej/00-labarea/agi/eagi-test.c
team/oej/00-labarea/apps/Makefile
team/oej/00-labarea/apps/app_flash.c
team/oej/00-labarea/apps/app_ivrdemo.c
team/oej/00-labarea/apps/app_meetme.c
team/oej/00-labarea/apps/app_osplookup.c
team/oej/00-labarea/apps/app_page.c
team/oej/00-labarea/apps/app_rpt.c
team/oej/00-labarea/apps/app_skel.c
team/oej/00-labarea/apps/app_voicemail.c
team/oej/00-labarea/apps/app_zapbarge.c
team/oej/00-labarea/apps/app_zapras.c
team/oej/00-labarea/apps/app_zapscan.c
team/oej/00-labarea/ast_expr2.c
team/oej/00-labarea/ast_expr2.fl
team/oej/00-labarea/ast_expr2.h
team/oej/00-labarea/ast_expr2.y
team/oej/00-labarea/ast_expr2f.c
team/oej/00-labarea/build_tools/ (props changed)
team/oej/00-labarea/cdr/Makefile
team/oej/00-labarea/cdr/cdr_odbc.c
team/oej/00-labarea/cdr/cdr_pgsql.c
team/oej/00-labarea/cdr/cdr_sqlite.c
team/oej/00-labarea/cdr/cdr_tds.c
team/oej/00-labarea/channel.c
team/oej/00-labarea/channels/Makefile
team/oej/00-labarea/channels/chan_agent.c
team/oej/00-labarea/channels/chan_alsa.c
team/oej/00-labarea/channels/chan_h323.c
team/oej/00-labarea/channels/chan_iax2.c
team/oej/00-labarea/channels/chan_misdn.c
team/oej/00-labarea/channels/chan_nbs.c
team/oej/00-labarea/channels/chan_oss.c
team/oej/00-labarea/channels/chan_phone.c
team/oej/00-labarea/channels/chan_sip.c
team/oej/00-labarea/channels/chan_vpb.c
team/oej/00-labarea/channels/chan_zap.c
team/oej/00-labarea/channels/h323/Makefile
team/oej/00-labarea/codecs/Makefile
team/oej/00-labarea/codecs/codec_gsm.c
team/oej/00-labarea/codecs/codec_speex.c
team/oej/00-labarea/codecs/gsm/Makefile
team/oej/00-labarea/codecs/ilbc/Makefile
team/oej/00-labarea/codecs/lpc10/Makefile
team/oej/00-labarea/configs/extensions.ael.sample
team/oej/00-labarea/configs/extensions.conf.sample
team/oej/00-labarea/cryptostub.c
team/oej/00-labarea/db1-ast/Makefile
team/oej/00-labarea/db1-ast/hash/hash.c
team/oej/00-labarea/doc/ael.txt
team/oej/00-labarea/file.c
team/oej/00-labarea/formats/Makefile
team/oej/00-labarea/formats/format_ogg_vorbis.c
team/oej/00-labarea/funcs/Makefile
team/oej/00-labarea/funcs/func_curl.c
team/oej/00-labarea/funcs/func_odbc.c
team/oej/00-labarea/include/ (props changed)
team/oej/00-labarea/include/asterisk.h
team/oej/00-labarea/include/asterisk/astmm.h
team/oej/00-labarea/include/asterisk/compat.h
team/oej/00-labarea/pbx/Makefile
team/oej/00-labarea/pbx/pbx_ael.c
team/oej/00-labarea/pbx/pbx_dundi.c
team/oej/00-labarea/pbx/pbx_gtkconsole.c
team/oej/00-labarea/pbx/pbx_kdeconsole.cc
team/oej/00-labarea/res/Makefile
team/oej/00-labarea/res/res_config_odbc.c
team/oej/00-labarea/res/res_config_pgsql.c
team/oej/00-labarea/res/res_crypto.c
team/oej/00-labarea/res/res_musiconhold.c
team/oej/00-labarea/res/res_odbc.c
team/oej/00-labarea/res/res_osp.c
team/oej/00-labarea/res/res_snmp.c
team/oej/00-labarea/strcompat.c
team/oej/00-labarea/utils/Makefile
Propchange: team/oej/00-labarea/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/00-labarea/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 24 15:17:24 2006
@@ -14,3 +14,14 @@
tags
TAGS
testexpr2
+makeopts
+menuselect.makeopts
+config.status
+config.log
+makeopts.xml
+install-sh
+configure
+mkinstalldirs
+autom4te.cache
+missing
+aclocal.m4
Propchange: team/oej/00-labarea/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 24 15:17:24 2006
@@ -1,1 +1,1 @@
-/trunk:1-22241
+/trunk:1-22306
Modified: team/oej/00-labarea/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/CREDITS?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/CREDITS (original)
+++ team/oej/00-labarea/CREDITS Mon Apr 24 15:17:24 2006
@@ -76,7 +76,7 @@
Steve Kann - new jitter buffer for IAX2
stevek at stevek.com
Constantine Filin - major contributions to the Asterisk Realtime Architecture
-Steve Murphy - privacy support
+Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
Claude Patry - bug fixes, feature enhancements, and bug marshalling
cpatry at gmail.com
Modified: team/oej/00-labarea/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/Makefile?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/Makefile (original)
+++ team/oej/00-labarea/Makefile Mon Apr 24 15:17:24 2006
@@ -49,7 +49,7 @@
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
# More GSM codec optimization
# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
# which support MMX instructions. This should be newer pentiums,
@@ -96,13 +96,6 @@
# Uncomment next one to enable ast_frame tracing (for debugging)
TRACE_FRAMES = #-DTRACE_FRAMES
-
-# Uncomment next one to enable malloc debugging
-# You can view malloc debugging with:
-# *CLI> show memory allocations [filename]
-# *CLI> show memory summary [filename]
-#
-MALLOC_DEBUG = #-include $(PWD)/include/asterisk/astmm.h
# Where to install asterisk after compiling
# Default -> leave empty
@@ -182,25 +175,38 @@
ASTCFLAGS=
-# Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
-ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
-
# Uncomment this to use the older DSP routines
#ASTCFLAGS+=-DOLD_DSP_ROUTINES
# If the file .asterisk.makeopts is present in your home directory, you can
-# include all of your favorite Makefile options so that every time you download
-# a new version of Asterisk, you don't have to edit the makefile to set them.
-# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# include all of your favorite menuselect options so that every time you download
+# a new version of Asterisk, you don't have to run menuselect to set them.
+# The file /etc/asterisk.makeopts will also be included but can be overridden
# by the file in your home directory.
-ifneq ($(wildcard /etc/asterisk.makeopts),)
- include /etc/asterisk.makeopts
-endif
-
-ifneq ($(wildcard ~/.asterisk.makeopts),)
- include ~/.asterisk.makeopts
-endif
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+
+ifneq ($(wildcard menuselect.makeopts),)
+ include menuselect.makeopts
+endif
+
+ifneq ($(wildcard makeopts),)
+ include makeopts
+endif
+
+ASTCFLAGS+=$(MENUSELECT_CFLAGS)
+TOPDIR_CFLAGS=-include include/autoconfig.h
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h
+
+# *CLI> show memory allocations [filename]
+# *CLI> show memory summary [filename]
+ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),)
+ TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
+ MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
+endif
+
+MOD_SUBDIR_CFLAGS+=-fPIC
ifeq ($(OSARCH),Linux)
ifeq ($(PROC),x86_64)
@@ -247,9 +253,13 @@
endif
INCLUDE+=-Iinclude -I../include
-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY
ASTCFLAGS+=$(OPTIMIZE)
-ASTCFLAGS+=# -Werror -Wunused
+
+ifeq ($(AST_DEVMODE),yes)
+ ASTCFLAGS+=-Werror -Wunused
+endif
+
ifeq ($(shell gcc -v 2>&1 | grep 'gcc version' | cut -f3 -d' ' | cut -f1 -d.),4)
ASTCFLAGS+= -Wno-pointer-sign
endif
@@ -265,14 +275,6 @@
ifeq ($(PROC),ppc)
ASTCFLAGS+=-fsigned-char
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
-else
- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
- endif
endif
ifeq ($(OSARCH),FreeBSD)
@@ -300,27 +302,11 @@
INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
endif
-ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
- CYGLOADER=cygwin_a
- OSARCH=CYGWIN
- ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
- ASTLINK=
- LIBS+=-lpthread -lncurses -lm -lresolv
- ASTSBINDIR=$(MODULES_DIR)
-endif
-
-ifndef WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
- ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
-endif
-
-endif # WITHOUT_ZAPTEL
-
LIBEDIT=editline/libedit.a
+ASTERISKVERSION:=$(shell build_tools/make_version .)
+
ifneq ($(wildcard .version),)
- ASTERISKVERSION:=$(shell cat .version)
ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
else
@@ -332,11 +318,9 @@
# showing the branch they are made from
ifneq ($(wildcard .svnrevision),)
ASTERISKVERSIONNUM=999999
- ASTERISKVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
else
ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
- ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
endif
endif
@@ -345,11 +329,12 @@
ASTCFLAGS+= $(MALLOC_DEBUG)
ASTCFLAGS+= $(BUSYDETECT)
ASTCFLAGS+= $(OPTIONS)
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
ASTCFLAGS+= -fomit-frame-pointer
endif
-SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
+MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
+SUBDIRS:=$(MOD_SUBDIRS) utils stdtime agi
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o pbx.o cli.o md5.o term.o \
@@ -426,19 +411,17 @@
endif
ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
- CFLAGS+=$(ASTCFLAGS)
+ CFLAGS+=$(ASTCFLAGS) $(TOPDIR_CFLAGS)
endif
# This is used when generating the doxygen documentation
-ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
+ifneq ($(DOT),:)
HAVEDOT=yes
else
HAVEDOT=no
endif
INSTALL=install
-
-CFLAGS+=-DT38_SUPPORT
_all: all
@echo " +--------- Asterisk Build Complete ---------+"
@@ -446,10 +429,32 @@
@echo " + cannot be run before being installed by +"
@echo " + running: +"
@echo " + +"
- @echo " + $(MAKE) install +"
+ @echo " + make install +"
@echo " +-------------------------------------------+"
-all: cleantest depend asterisk subdirs
+all: include/autoconfig.h menuselect.makeopts cleantest depend asterisk subdirs
+
+configure:
+ - at ./bootstrap.sh
+
+include/autoconfig.h: configure
+ @CFLAGS="" ./configure
+ @echo "****"
+ @echo "**** The configure script was just executed, so 'make' needs to be"
+ @echo "**** restarted."
+ @echo "****"
+ @exit 1
+
+makeopts: configure
+ @CFLAGS="" ./configure
+ @echo "****"
+ @echo "**** The configure script was just executed, so 'make' needs to be"
+ @echo "**** restarted."
+ @echo "****"
+ @exit 1
+
+menuselect.makeopts: build_tools/menuselect makeopts.xml
+ @build_tools/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
#ifneq ($(wildcard tags),)
ctags: tags
@@ -459,16 +464,14 @@
all: TAGS
endif
-noclean: depend asterisk subdirs
-
editline/config.h:
cd editline && unset CFLAGS LIBS && ./configure ; \
-editline/libedit.a: FORCE
+editline/libedit.a:
cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
$(MAKE) -C editline libedit.a
-db1-ast/libdb1.a: FORCE
+db1-ast/libdb1.a:
$(MAKE) -C db1-ast libdb1.a
ifneq ($(wildcard .depend),)
@@ -511,27 +514,24 @@
asterisk.txt: asterisk.sgml
docbook2txt asterisk.sgml
-defaults.h: FORCE
+defaults.h: makeopts
build_tools/make_defaults_h > $@.tmp
if cmp -s $@.tmp $@ ; then echo ; else \
mv $@.tmp $@ ; \
fi
rm -f $@.tmp
-include/asterisk/version.h: FORCE
+include/asterisk/version.h:
build_tools/make_version_h > $@.tmp
if cmp -s $@.tmp $@ ; then echo; else \
mv $@.tmp $@ ; \
fi
rm -f $@.tmp
-stdtime/libtime.a: FORCE
- $(MAKE) -C stdtime libtime.a
-
-cygwin_a:
- $(MAKE) -C cygwin all
-
-asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
+stdtime/libtime.a:
+ CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
+
+asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
build_tools/make_build_h > include/asterisk/build.h.tmp
if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
@@ -544,7 +544,9 @@
$(CC) $(AUDIO_LIBS) -o muted muted.o
subdirs:
- for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
+ for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
+ CFLAGS="$(ASTCFLAGS)" $(MAKE) -C utils
+ CFLAGS="$(ASTCFLAGS) -include ../include/autoconfig.h" $(MAKE) -C agi
clean-depend:
for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
@@ -562,11 +564,18 @@
$(MAKE) -C db1-ast clean
$(MAKE) -C stdtime clean
+dist-clean: clean
+ rm -f menuselect.makeopts makeopts makeopts.xml
+ rm -f config.log config.status
+ rm -f include/autoconfig.h
+ $(MAKE) -C mxml clean
+ $(MAKE) -C build_tools dist-clean
+
datafiles: all
if [ x`$(ID) -un` = xroot ]; then 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.
+# 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.
mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
for x in static-http/*; do \
install -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
@@ -664,7 +673,6 @@
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -887,7 +895,7 @@
depend: include/asterisk/version.h .depend defaults.h
for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
-.depend: include/asterisk/version.h
+.depend: include/asterisk/version.h defaults.h
build_tools/mkdep $(CFLAGS) $(wildcard *.c)
.tags-depend:
@@ -928,7 +936,6 @@
# If the cleancount has been changed, force a make clean.
# .cleancount is the global clean count, and .lastclean is the
# last clean count we had
-# We can avoid this by making noclean
cleantest:
if cmp -s .cleancount .lastclean ; then echo ; else \
@@ -967,3 +974,17 @@
rm -rf $(DESTDIR)$(ASTSPOOLDIR)
rm -rf $(DESTDIR)$(ASTETCDIR)
rm -rf $(DESTDIR)$(ASTLOGDIR)
+
+menuselect: build_tools/menuselect makeopts.xml
+ - at build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h mxml/libmxml.a include/autoconfig.h
+ $(MAKE) -C build_tools menuselect
+
+mxml/libmxml.a:
+ @cd mxml && unset CFLAGS && test -f config.h || ./configure
+ $(MAKE) -C mxml libmxml.a
+
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml
+ @echo "Generating list of available modules ..."
+ @build_tools/prep_moduledeps > $@
Modified: team/oej/00-labarea/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/UPGRADE.txt?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/UPGRADE.txt (original)
+++ team/oej/00-labarea/UPGRADE.txt Mon Apr 24 15:17:24 2006
@@ -1,5 +1,37 @@
Information for Upgrading From Previous Asterisk Releases
=========================================================
+
+Build Process (configure script):
+
+Asterisk now uses an autoconf-generated configuration script to learn how it
+should build itself for your system. As it is a standard script, running:
+
+$ ./configure --help
+
+will show you all the options available. This script can be used to tell the
+build process what libraries you have on your system (if it cannot find them
+automatically), which libraries you wish to have ignored even though they may
+be present, etc.
+
+You must run the configure script before Asterisk will build, although it will
+attempt to automatically run it for you with no options specified; for most users,
+that will result in a similar build to what they would have had before the
+configure script was added to the build process (except for having to run 'make'
+again after the configure script is run). Note that the configure script does NOT
+need to be re-run just to rebuild Asterisk; you only need to re-run it when your
+system configuration changes or you wish to build Asterisk with different options.
+
+Build Process (module selection):
+
+The Asterisk source tree now includes a basic module selection and build option
+selection tool called 'menuselect'. Run 'make menuselect' to make your choices.
+In this tool, you can disable building of modules that you don't care about,
+turn on/off global options for the build and see which modules will not (and cannot)
+be built because your system does not have the required external dependencies
+installed.
+
+(TODO: document where 'global' and 'per-user' menuselect input files should go
+and what they need to contain)
PBX Core:
Modified: team/oej/00-labarea/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/agi/Makefile?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/agi/Makefile (original)
+++ team/oej/00-labarea/agi/Makefile Mon Apr 24 15:17:24 2006
@@ -3,7 +3,7 @@
#
# Makefile for AGI-related stuff
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium
#
# Mark Spencer <markster at digium.com>
#
@@ -12,8 +12,6 @@
#
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
-
-CFLAGS+=-DNO_AST_MM
LIBS=
ifeq ($(OSARCH),SunOS)
@@ -30,10 +28,10 @@
for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
eagi-test: eagi-test.o
- $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS)
+ $(CC) $(CFLAGS) -include ../include/autoconfig.h -o eagi-test eagi-test.o $(LIBS)
eagi-sphinx-test: eagi-sphinx-test.o
- $(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS)
+ $(CC) $(CFLAGS) -include ../include/autoconfig.h -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS)
clean-depend:
rm -f .depend
Modified: team/oej/00-labarea/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/agi/eagi-sphinx-test.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/agi/eagi-sphinx-test.c (original)
+++ team/oej/00-labarea/agi/eagi-sphinx-test.c Mon Apr 24 15:17:24 2006
@@ -17,7 +17,10 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include <asterisk/compat.h>
+
+#include "asterisk.h"
+
+#include "asterisk/compat.h"
#define AUDIO_FILENO (STDERR_FILENO + 1)
Modified: team/oej/00-labarea/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/agi/eagi-test.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/agi/eagi-test.c (original)
+++ team/oej/00-labarea/agi/eagi-test.c Mon Apr 24 15:17:24 2006
@@ -11,7 +11,10 @@
#include <errno.h>
#include <string.h>
#include <sys/select.h>
-#include <asterisk/compat.h>
+
+#include "asterisk.h"
+
+#include "asterisk/compat.h"
#define AUDIO_FILENO (STDERR_FILENO + 1)
Modified: team/oej/00-labarea/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/Makefile?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/Makefile (original)
+++ team/oej/00-labarea/apps/Makefile Mon Apr 24 15:17:24 2006
@@ -11,37 +11,10 @@
# the GNU General Public License
#
-MODS:=$(patsubst %.c,%.so,$(wildcard app_*.c))
+MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
-#
-# Experimental things
-#
-MODS:=$(filter-out app_ivrdemo.so,$(MODS))
-MODS:=$(filter-out app_skel.so,$(MODS))
-MODS:=$(filter-out app_rpt.so,$(MODS))
-
-ifndef WITHOUT_ZAPTEL
-ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
-endif
-
-ifeq (${ZAPAVAIL},)
- MODS:=$(filter-out app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so,$(MODS))
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
- MODS:=$(filter-out app_osplookup.so,$(MODS))
-endif
-
-ifneq (${WITH_SMDI},)
+ifneq ($(WITH_SMDI),)
CFLAGS+=-DWITH_SMDI
-endif
-
-ifeq (${OSARCH},CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so
- MODS:=$(filter-out app_sms.so,$(MODS))
-else
- CFLAGS+=-fPIC
endif
# If you have UnixODBC you can use ODBC voicemail
@@ -61,11 +34,14 @@
clean: clean-depend
rm -f *.so *.o
-%.so : %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+%.so: %.o
+ $(CC) $(SOLINK) -o $@ $<
-app_rpt.so : app_rpt.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
+app_rpt.so: app_rpt.o
+ $(CC) $(SOLINK) -o $@ $< $(ZAPTEL_LIB)
+
+app_rpt.o: app_rpt.c
+ $(CC) $(SOLINK) -o $@ $< $(ZAPTEL_INCLUDE)
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
Modified: team/oej/00-labarea/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_flash.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_flash.c (original)
+++ team/oej/00-labarea/apps/app_flash.c Mon Apr 24 15:17:24 2006
@@ -25,6 +25,10 @@
* \ingroup applications
*/
+/*** MODULEINFO
+ <depend>zaptel</depend>
+ ***/
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -132,3 +136,4 @@
}
STD_MOD1;
+
Modified: team/oej/00-labarea/apps/app_ivrdemo.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_ivrdemo.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_ivrdemo.c (original)
+++ team/oej/00-labarea/apps/app_ivrdemo.c Mon Apr 24 15:17:24 2006
@@ -24,6 +24,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <defaultenabled>no</defaultenabled>
+ ***/
#include <stdio.h>
#include <stdlib.h>
@@ -137,3 +141,4 @@
}
STD_MOD1;
+
Modified: team/oej/00-labarea/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_meetme.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_meetme.c (original)
+++ team/oej/00-labarea/apps/app_meetme.c Mon Apr 24 15:17:24 2006
@@ -25,6 +25,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <depend>zaptel</depend>
+ ***/
#include <stdlib.h>
#include <stdio.h>
@@ -2469,5 +2473,6 @@
{
return ASTERISK_GPL_KEY;
}
-
+
STD_MOD(MOD_1, reload, NULL, NULL);
+
Modified: team/oej/00-labarea/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_osplookup.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_osplookup.c (original)
+++ team/oej/00-labarea/apps/app_osplookup.c Mon Apr 24 15:17:24 2006
@@ -24,6 +24,11 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <depend>libosptk</depend>
+ <depend>ssl</depend>
+ ***/
#include <stdio.h>
#include <stdlib.h>
@@ -637,3 +642,5 @@
}
STD_MOD1;
+
+
Modified: team/oej/00-labarea/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_page.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_page.c (original)
+++ team/oej/00-labarea/apps/app_page.c Mon Apr 24 15:17:24 2006
@@ -24,6 +24,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <depend>zaptel</depend>
+ ***/
#include <stdio.h>
#include <stdlib.h>
@@ -230,3 +234,4 @@
}
STD_MOD1;
+
Modified: team/oej/00-labarea/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_rpt.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_rpt.c (original)
+++ team/oej/00-labarea/apps/app_rpt.c Mon Apr 24 15:17:24 2006
@@ -94,6 +94,11 @@
*
*
*/
+
+/*** MODULEINFO
+ <depend>zaptel</depend>
+ <defaultenabled>no</defaultenabled>
+ ***/
/* The following is JUST GROSS!! There is some soft of underlying problem,
probably in channel_iax2.c, that causes an IAX2 connection to sometimes
@@ -7063,3 +7068,4 @@
}
STD_MOD1;
+
Modified: team/oej/00-labarea/apps/app_skel.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_skel.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_skel.c (original)
+++ team/oej/00-labarea/apps/app_skel.c Mon Apr 24 15:17:24 2006
@@ -25,6 +25,10 @@
* This is a skeleton for development of an Asterisk application
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <defaultenabled>no</defaultenabled>
+ ***/
#include <stdio.h>
#include <stdlib.h>
@@ -141,3 +145,4 @@
}
STD_MOD1;
+
Modified: team/oej/00-labarea/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_voicemail.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_voicemail.c (original)
+++ team/oej/00-labarea/apps/app_voicemail.c Mon Apr 24 15:17:24 2006
@@ -5577,6 +5577,7 @@
char *tmp;
struct leave_vm_options leave_options;
struct ast_flags flags = { 0 };
+ static int deprecate_warning = 0;
char *opts[OPT_ARG_ARRAY_SIZE];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(argv0);
@@ -5617,18 +5618,29 @@
}
} else {
/* old style options parsing */
+ int old = 0;
+ char *orig_argv0 = args.argv0;
while (*(args.argv0)) {
- if (*(args.argv0) == 's')
+ if (*(args.argv0) == 's') {
+ old = 1;
ast_set_flag(&leave_options, OPT_SILENT);
- else if (*(args.argv0) == 'b')
+ } else if (*(args.argv0) == 'b') {
+ old = 1;
ast_set_flag(&leave_options, OPT_BUSY_GREETING);
- else if (*(args.argv0) == 'u')
+ } else if (*(args.argv0) == 'u') {
+ old = 1;
ast_set_flag(&leave_options, OPT_UNAVAIL_GREETING);
- else if (*(args.argv0) == 'j')
+ } else if (*(args.argv0) == 'j') {
+ old = 1;
ast_set_flag(&leave_options, OPT_PRIORITY_JUMP);
- else
+ } else
break;
(args.argv0)++;
+ }
+ if (!deprecate_warning && old) {
+ deprecate_warning = 1;
+ ast_log(LOG_WARNING, "Prefixing the mailbox with an option is deprecated ('%s').\n", orig_argv0);
+ ast_log(LOG_WARNING, "Please move all leading options to the second argument.\n");
}
}
} else {
Modified: team/oej/00-labarea/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_zapbarge.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_zapbarge.c (original)
+++ team/oej/00-labarea/apps/app_zapbarge.c Mon Apr 24 15:17:24 2006
@@ -30,6 +30,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <depend>zaptel</depend>
+ ***/
#include <stdlib.h>
#include <stdio.h>
@@ -329,3 +333,4 @@
}
STD_MOD1;
+
Modified: team/oej/00-labarea/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_zapras.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_zapras.c (original)
+++ team/oej/00-labarea/apps/app_zapras.c Mon Apr 24 15:17:24 2006
@@ -24,6 +24,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <depend>zaptel</depend>
+ ***/
#include <sys/ioctl.h>
#include <sys/wait.h>
@@ -267,3 +271,4 @@
}
STD_MOD1;
+
Modified: team/oej/00-labarea/apps/app_zapscan.c
URL: http://svn.digium.com/view/asterisk/team/oej/00-labarea/apps/app_zapscan.c?rev=22312&r1=22311&r2=22312&view=diff
==============================================================================
--- team/oej/00-labarea/apps/app_zapscan.c (original)
[... 13987 lines stripped ...]
More information about the asterisk-commits
mailing list