[asterisk-commits] branch oej/test-this-branch r24179 - in
/team/oej/test-this-branch: ./ agi/ a...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue May 2 07:56:03 MST 2006
Author: oej
Date: Tue May 2 09:56:02 2006
New Revision: 24179
URL: http://svn.digium.com/view/asterisk?rev=24179&view=rev
Log:
It compiles again!
- Disclaimer for the bad fix to carrier enum, it's broken now. Waiting for update from coder.
Added:
team/oej/test-this-branch/acinclude.m4
- copied unchanged from r24139, trunk/acinclude.m4
team/oej/test-this-branch/bootstrap.sh
- copied unchanged from r24139, trunk/bootstrap.sh
team/oej/test-this-branch/build_tools/Makefile
- copied unchanged from r24139, trunk/build_tools/Makefile
team/oej/test-this-branch/build_tools/cflags.xml
- copied unchanged from r24139, trunk/build_tools/cflags.xml
team/oej/test-this-branch/build_tools/get_moduledeps
- copied unchanged from r24139, trunk/build_tools/get_moduledeps
team/oej/test-this-branch/build_tools/make_version
- copied unchanged from r24139, trunk/build_tools/make_version
team/oej/test-this-branch/build_tools/menuselect-deps.in
- copied unchanged from r24139, trunk/build_tools/menuselect-deps.in
team/oej/test-this-branch/build_tools/menuselect.c
- copied unchanged from r24139, trunk/build_tools/menuselect.c
team/oej/test-this-branch/build_tools/menuselect.h
- copied unchanged from r24139, trunk/build_tools/menuselect.h
team/oej/test-this-branch/build_tools/menuselect_curses.c
- copied unchanged from r24139, trunk/build_tools/menuselect_curses.c
team/oej/test-this-branch/build_tools/prep_moduledeps
- copied unchanged from r24139, trunk/build_tools/prep_moduledeps
team/oej/test-this-branch/config.guess
- copied unchanged from r24139, trunk/config.guess
team/oej/test-this-branch/config.sub
- copied unchanged from r24139, trunk/config.sub
team/oej/test-this-branch/configure.ac
- copied unchanged from r24139, trunk/configure.ac
team/oej/test-this-branch/include/asterisk/ael_structs.h
- copied unchanged from r24139, trunk/include/asterisk/ael_structs.h
team/oej/test-this-branch/makeopts.in
- copied unchanged from r24139, trunk/makeopts.in
team/oej/test-this-branch/mxml/ (props changed)
- copied from r24139, trunk/mxml/
team/oej/test-this-branch/mxml/ANNOUNCEMENT
- copied unchanged from r24139, trunk/mxml/ANNOUNCEMENT
team/oej/test-this-branch/mxml/CHANGES
- copied unchanged from r24139, trunk/mxml/CHANGES
team/oej/test-this-branch/mxml/COPYING
- copied unchanged from r24139, trunk/mxml/COPYING
team/oej/test-this-branch/mxml/Makefile.in
- copied unchanged from r24139, trunk/mxml/Makefile.in
team/oej/test-this-branch/mxml/README
- copied unchanged from r24139, trunk/mxml/README
team/oej/test-this-branch/mxml/config.h.in
- copied unchanged from r24139, trunk/mxml/config.h.in
team/oej/test-this-branch/mxml/configure
- copied unchanged from r24139, trunk/mxml/configure
team/oej/test-this-branch/mxml/install-sh
- copied unchanged from r24139, trunk/mxml/install-sh
team/oej/test-this-branch/mxml/mxml-attr.c
- copied unchanged from r24139, trunk/mxml/mxml-attr.c
team/oej/test-this-branch/mxml/mxml-entity.c
- copied unchanged from r24139, trunk/mxml/mxml-entity.c
team/oej/test-this-branch/mxml/mxml-file.c
- copied unchanged from r24139, trunk/mxml/mxml-file.c
team/oej/test-this-branch/mxml/mxml-index.c
- copied unchanged from r24139, trunk/mxml/mxml-index.c
team/oej/test-this-branch/mxml/mxml-node.c
- copied unchanged from r24139, trunk/mxml/mxml-node.c
team/oej/test-this-branch/mxml/mxml-private.c
- copied unchanged from r24139, trunk/mxml/mxml-private.c
team/oej/test-this-branch/mxml/mxml-search.c
- copied unchanged from r24139, trunk/mxml/mxml-search.c
team/oej/test-this-branch/mxml/mxml-set.c
- copied unchanged from r24139, trunk/mxml/mxml-set.c
team/oej/test-this-branch/mxml/mxml-string.c
- copied unchanged from r24139, trunk/mxml/mxml-string.c
team/oej/test-this-branch/mxml/mxml.h
- copied unchanged from r24139, trunk/mxml/mxml.h
team/oej/test-this-branch/mxml/mxml.list.in
- copied unchanged from r24139, trunk/mxml/mxml.list.in
team/oej/test-this-branch/mxml/mxml.pc
- copied unchanged from r24139, trunk/mxml/mxml.pc
team/oej/test-this-branch/mxml/mxml.pc.in
- copied unchanged from r24139, trunk/mxml/mxml.pc.in
team/oej/test-this-branch/pbx/ael/
- copied from r24139, trunk/pbx/ael/
team/oej/test-this-branch/pbx/ael/ael-test/
- copied from r24139, trunk/pbx/ael/ael-test/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test1/
- copied from r24139, trunk/pbx/ael/ael-test/ael-test1/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test1/extensions.ael
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test1/extensions.ael
team/oej/test-this-branch/pbx/ael/ael-test/ael-test2/
- copied from r24139, trunk/pbx/ael/ael-test/ael-test2/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test2/apptest.ael2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test2/apptest.ael2
team/oej/test-this-branch/pbx/ael/ael-test/ael-test2/extensions.ael
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test2/extensions.ael
team/oej/test-this-branch/pbx/ael/ael-test/ael-test3/
- copied from r24139, trunk/pbx/ael/ael-test/ael-test3/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test3/extensions.ael
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test3/extensions.ael
team/oej/test-this-branch/pbx/ael/ael-test/ael-test3/include1.ael2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test3/include1.ael2
team/oej/test-this-branch/pbx/ael/ael-test/ael-test3/include2.ael2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test3/include2.ael2
team/oej/test-this-branch/pbx/ael/ael-test/ael-test3/include3.ael2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test3/include3.ael2
team/oej/test-this-branch/pbx/ael/ael-test/ael-test3/include4.ael2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test3/include4.ael2
team/oej/test-this-branch/pbx/ael/ael-test/ael-test3/include5.ael2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test3/include5.ael2
team/oej/test-this-branch/pbx/ael/ael-test/ael-test4/
- copied from r24139, trunk/pbx/ael/ael-test/ael-test4/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test4/apptest.ael2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test4/apptest.ael2
team/oej/test-this-branch/pbx/ael/ael-test/ael-test4/extensions.ael
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test4/extensions.ael
team/oej/test-this-branch/pbx/ael/ael-test/ael-test5/
- copied from r24139, trunk/pbx/ael/ael-test/ael-test5/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test5/extensions.ael
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test5/extensions.ael
team/oej/test-this-branch/pbx/ael/ael-test/ael-test6/
- copied from r24139, trunk/pbx/ael/ael-test/ael-test6/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test6/extensions.ael
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test6/extensions.ael
team/oej/test-this-branch/pbx/ael/ael-test/ael-test7/
- copied from r24139, trunk/pbx/ael/ael-test/ael-test7/
team/oej/test-this-branch/pbx/ael/ael-test/ael-test7/extensions.ael
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ael-test7/extensions.ael
team/oej/test-this-branch/pbx/ael/ael-test/ref.ael-test1
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ref.ael-test1
team/oej/test-this-branch/pbx/ael/ael-test/ref.ael-test2
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ref.ael-test2
team/oej/test-this-branch/pbx/ael/ael-test/ref.ael-test3
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ref.ael-test3
team/oej/test-this-branch/pbx/ael/ael-test/ref.ael-test4
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ref.ael-test4
team/oej/test-this-branch/pbx/ael/ael-test/ref.ael-test5
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ref.ael-test5
team/oej/test-this-branch/pbx/ael/ael-test/ref.ael-test6
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ref.ael-test6
team/oej/test-this-branch/pbx/ael/ael-test/ref.ael-test7
- copied unchanged from r24139, trunk/pbx/ael/ael-test/ref.ael-test7
team/oej/test-this-branch/pbx/ael/ael-test/runtests
- copied unchanged from r24139, trunk/pbx/ael/ael-test/runtests
team/oej/test-this-branch/pbx/ael/ael-test/setref
- copied unchanged from r24139, trunk/pbx/ael/ael-test/setref
team/oej/test-this-branch/pbx/ael/ael.flex
- copied unchanged from r24139, trunk/pbx/ael/ael.flex
team/oej/test-this-branch/pbx/ael/ael.tab.c
- copied unchanged from r24139, trunk/pbx/ael/ael.tab.c
team/oej/test-this-branch/pbx/ael/ael.tab.h
- copied unchanged from r24139, trunk/pbx/ael/ael.tab.h
team/oej/test-this-branch/pbx/ael/ael.y
- copied unchanged from r24139, trunk/pbx/ael/ael.y
team/oej/test-this-branch/pbx/ael/ael_lex.c
- copied unchanged from r24139, trunk/pbx/ael/ael_lex.c
team/oej/test-this-branch/utils/ael_main.c
- copied unchanged from r24139, trunk/utils/ael_main.c
team/oej/test-this-branch/utils/expr2.testinput
- copied unchanged from r24139, trunk/utils/expr2.testinput
Removed:
team/oej/test-this-branch/build_tools/make_svn_branch_name
Modified:
team/oej/test-this-branch/ (props changed)
team/oej/test-this-branch/CREDITS
team/oej/test-this-branch/Makefile
team/oej/test-this-branch/UPGRADE.txt
team/oej/test-this-branch/agi/Makefile
team/oej/test-this-branch/agi/eagi-sphinx-test.c
team/oej/test-this-branch/agi/eagi-test.c
team/oej/test-this-branch/app.c
team/oej/test-this-branch/apps/Makefile
team/oej/test-this-branch/apps/app_chanspy.c
team/oej/test-this-branch/apps/app_directory.c
team/oej/test-this-branch/apps/app_externalivr.c
team/oej/test-this-branch/apps/app_festival.c
team/oej/test-this-branch/apps/app_flash.c
team/oej/test-this-branch/apps/app_ices.c
team/oej/test-this-branch/apps/app_ivrdemo.c
team/oej/test-this-branch/apps/app_meetme.c
team/oej/test-this-branch/apps/app_mp3.c
team/oej/test-this-branch/apps/app_nbscat.c
team/oej/test-this-branch/apps/app_osplookup.c
team/oej/test-this-branch/apps/app_page.c
team/oej/test-this-branch/apps/app_privacy.c
team/oej/test-this-branch/apps/app_queue.c
team/oej/test-this-branch/apps/app_rpt.c
team/oej/test-this-branch/apps/app_skel.c
team/oej/test-this-branch/apps/app_speech_utils.c
team/oej/test-this-branch/apps/app_voicemail.c
team/oej/test-this-branch/apps/app_while.c
team/oej/test-this-branch/apps/app_zapbarge.c
team/oej/test-this-branch/apps/app_zapras.c
team/oej/test-this-branch/apps/app_zapscan.c
team/oej/test-this-branch/ast_expr2.c
team/oej/test-this-branch/ast_expr2.fl
team/oej/test-this-branch/ast_expr2.h
team/oej/test-this-branch/ast_expr2.y
team/oej/test-this-branch/ast_expr2f.c
team/oej/test-this-branch/asterisk.c
team/oej/test-this-branch/build_tools/ (props changed)
team/oej/test-this-branch/cdr.c
team/oej/test-this-branch/cdr/Makefile
team/oej/test-this-branch/cdr/cdr_odbc.c
team/oej/test-this-branch/cdr/cdr_pgsql.c
team/oej/test-this-branch/cdr/cdr_sqlite.c
team/oej/test-this-branch/cdr/cdr_tds.c
team/oej/test-this-branch/channel.c
team/oej/test-this-branch/channels/Makefile
team/oej/test-this-branch/channels/chan_agent.c
team/oej/test-this-branch/channels/chan_alsa.c
team/oej/test-this-branch/channels/chan_h323.c
team/oej/test-this-branch/channels/chan_iax2.c
team/oej/test-this-branch/channels/chan_misdn.c
team/oej/test-this-branch/channels/chan_nbs.c
team/oej/test-this-branch/channels/chan_oss.c
team/oej/test-this-branch/channels/chan_phone.c
team/oej/test-this-branch/channels/chan_sip.c
team/oej/test-this-branch/channels/chan_vpb.c
team/oej/test-this-branch/channels/chan_zap.c
team/oej/test-this-branch/channels/h323/Makefile
team/oej/test-this-branch/channels/misdn/isdn_lib.c
team/oej/test-this-branch/channels/misdn/isdn_lib_intern.h
team/oej/test-this-branch/channels/misdn/isdn_msg_parser.c
team/oej/test-this-branch/channels/misdn_config.c
team/oej/test-this-branch/cli.c
team/oej/test-this-branch/codecs/Makefile
team/oej/test-this-branch/codecs/codec_gsm.c
team/oej/test-this-branch/codecs/codec_speex.c
team/oej/test-this-branch/codecs/gsm/Makefile
team/oej/test-this-branch/codecs/ilbc/Makefile
team/oej/test-this-branch/codecs/lpc10/Makefile
team/oej/test-this-branch/configs/extensions.ael.sample
team/oej/test-this-branch/configs/extensions.conf.sample
team/oej/test-this-branch/configs/mgcp.conf.sample
team/oej/test-this-branch/configs/misdn.conf.sample
team/oej/test-this-branch/configs/sip.conf.sample
team/oej/test-this-branch/configs/zapata.conf.sample
team/oej/test-this-branch/cryptostub.c
team/oej/test-this-branch/db1-ast/Makefile
team/oej/test-this-branch/db1-ast/hash/hash.c
team/oej/test-this-branch/devicestate.c
team/oej/test-this-branch/doc/ael.txt
team/oej/test-this-branch/doc/asterisk-conf.txt
team/oej/test-this-branch/doc/smdi.txt
team/oej/test-this-branch/editline/configure
team/oej/test-this-branch/editline/makelist
team/oej/test-this-branch/enum.c
team/oej/test-this-branch/file.c
team/oej/test-this-branch/formats/Makefile
team/oej/test-this-branch/formats/format_ogg_vorbis.c
team/oej/test-this-branch/funcs/Makefile
team/oej/test-this-branch/funcs/func_curl.c
team/oej/test-this-branch/funcs/func_odbc.c
team/oej/test-this-branch/http.c
team/oej/test-this-branch/include/ (props changed)
team/oej/test-this-branch/include/asterisk.h
team/oej/test-this-branch/include/asterisk/astmm.h
team/oej/test-this-branch/include/asterisk/compat.h
team/oej/test-this-branch/include/asterisk/options.h
team/oej/test-this-branch/include/asterisk/pbx.h
team/oej/test-this-branch/include/asterisk/strings.h
team/oej/test-this-branch/manager.c
team/oej/test-this-branch/pbx.c
team/oej/test-this-branch/pbx/Makefile
team/oej/test-this-branch/pbx/pbx_ael.c
team/oej/test-this-branch/pbx/pbx_dundi.c
team/oej/test-this-branch/pbx/pbx_gtkconsole.c
team/oej/test-this-branch/pbx/pbx_kdeconsole.cc
team/oej/test-this-branch/res/Makefile
team/oej/test-this-branch/res/res_agi.c
team/oej/test-this-branch/res/res_clioriginate.c
team/oej/test-this-branch/res/res_config_odbc.c
team/oej/test-this-branch/res/res_config_pgsql.c
team/oej/test-this-branch/res/res_crypto.c
team/oej/test-this-branch/res/res_features.c
team/oej/test-this-branch/res/res_monitor.c
team/oej/test-this-branch/res/res_musiconhold.c
team/oej/test-this-branch/res/res_odbc.c
team/oej/test-this-branch/res/res_osp.c
team/oej/test-this-branch/res/res_snmp.c
team/oej/test-this-branch/res/snmp/agent.c
team/oej/test-this-branch/rtp.c
team/oej/test-this-branch/strcompat.c
team/oej/test-this-branch/udptl.c
team/oej/test-this-branch/utils/ (props changed)
team/oej/test-this-branch/utils/Makefile
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 2 09:56:02 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/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 2 09:56:02 2006
@@ -1,1 +1,1 @@
-/trunk:1-22264
+/trunk:1-24166
Modified: team/oej/test-this-branch/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/CREDITS?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/CREDITS (original)
+++ team/oej/test-this-branch/CREDITS Tue May 2 09:56:02 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/test-this-branch/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/Makefile?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/Makefile (original)
+++ team/oej/test-this-branch/Makefile Tue May 2 09:56:02 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,
@@ -99,13 +99,6 @@
# Uncomment next one to enable the asterisk generic jitterbuffer
GENERIC_JB = #-DAST_JB
-
-# 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
@@ -185,32 +178,45 @@
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 -Iinclude
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+
+# *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)
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
#PROC=athlon
- OPTIONS+=-m64
endif
ifeq ($(PROC),sparc64)
@@ -231,9 +237,9 @@
OPTIONS+=-fsigned-char -mcpu=ep9312
else
ifeq ($(SUB_PROC),xscale)
- OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
+ OPTIONS+=-fsigned-char -mcpu=xscale
else
- OPTIONS+=-fsigned-char -msoft-float
+ OPTIONS+=-fsigned-char
endif
endif
endif
@@ -249,10 +255,13 @@
ID=/usr/xpg4/bin/id
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
@@ -268,14 +277,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)
@@ -303,27 +304,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
@@ -335,11 +320,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
@@ -349,11 +332,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 \
@@ -430,11 +414,11 @@
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
@@ -448,10 +432,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
@@ -461,16 +467,14 @@
all: TAGS
endif
-noclean: depend asterisk subdirs
-
editline/config.h:
- cd editline && unset CFLAGS LIBS && ./configure ; \
-
-editline/libedit.a: FORCE
- cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+ cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
+
+editline/libedit.a:
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
$(MAKE) -C editline libedit.a
-db1-ast/libdb1.a: FORCE
+db1-ast/libdb1.a:
$(MAKE) -C db1-ast libdb1.a
ifneq ($(wildcard .depend),)
@@ -513,27 +517,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 ; \
@@ -546,7 +547,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) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
+ CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
clean-depend:
for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
@@ -564,14 +567,23 @@
$(MAKE) -C db1-ast clean
$(MAKE) -C stdtime clean
+distclean: dist-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 ; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
@@ -666,7 +678,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)/
@@ -675,7 +686,6 @@
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
if [ -n "$(OLDHEADERS)" ]; then \
@@ -700,28 +710,9 @@
echo "You need to do cvs update -d not just cvs update" ; \
fi
if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
- @echo " +---- Asterisk Installation Complete -------+"
- @echo " + +"
- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
- @echo " + +"
- @echo " + Asterisk has successfully been installed. +"
- @echo " + If you would like to install the sample +"
- @echo " + configuration files (overwriting any +"
- @echo " + existing config files), run: +"
- @echo " + +"
- @echo " + $(MAKE) samples +"
- @echo " + +"
- @echo " +----------------- or ---------------------+"
- @echo " + +"
- @echo " + You can go ahead and install the asterisk +"
- @echo " + program documentation now or later run: +"
- @echo " + +"
- @echo " + $(MAKE) progdocs +"
- @echo " + +"
- @echo " + **Note** This requires that you have +"
- @echo " + doxygen installed on your local system +"
- @echo " +-------------------------------------------+"
- @$(MAKE) -s oldmodcheck
+
+install-subdirs:
+ for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
NEWMODS=$(notdir $(wildcard */*.so))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -744,10 +735,32 @@
echo " WARNING WARNING WARNING" ;\
fi
-install: all datafiles bininstall
+install: all datafiles bininstall install-subdirs
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
+ @echo " +---- Asterisk Installation Complete -------+"
+ @echo " + +"
+ @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
+ @echo " + +"
+ @echo " + Asterisk has successfully been installed. +"
+ @echo " + If you would like to install the sample +"
+ @echo " + configuration files (overwriting any +"
+ @echo " + existing config files), run: +"
+ @echo " + +"
+ @echo " + $(MAKE) samples +"
+ @echo " + +"
+ @echo " +----------------- or ---------------------+"
+ @echo " + +"
+ @echo " + You can go ahead and install the asterisk +"
+ @echo " + program documentation now or later run: +"
+ @echo " + +"
+ @echo " + $(MAKE) progdocs +"
+ @echo " + +"
+ @echo " + **Note** This requires that you have +"
+ @echo " + doxygen installed on your local system +"
+ @echo " +-------------------------------------------+"
+ @$(MAKE) -s oldmodcheck
upgrade: all bininstall
@@ -889,7 +902,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:
@@ -930,7 +943,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 \
@@ -969,3 +981,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 include/autoconfig.h strcompat.o mxml/libmxml.a
+ $(MAKE) -C build_tools menuselect
+
+mxml/libmxml.a:
+ @cd mxml && unset CFLAGS LIBS && 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/test-this-branch/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/UPGRADE.txt?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/UPGRADE.txt (original)
+++ team/oej/test-this-branch/UPGRADE.txt Tue May 2 09:56:02 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:
@@ -92,6 +124,11 @@
option in sip.conf is removed to osp.conf as authpolicy. allowguest option
in sip.conf cannot be set as osp anymore.
+The Zap channel:
+
+* Support for MFC/R2 has been removed, as it has not been functional for some time
+ and it has no maintainer.
+
Installation:
* On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf
Modified: team/oej/test-this-branch/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/agi/Makefile?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/agi/Makefile (original)
+++ team/oej/test-this-branch/agi/Makefile Tue May 2 09:56:02 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/test-this-branch/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/agi/eagi-sphinx-test.c?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/agi/eagi-sphinx-test.c (original)
+++ team/oej/test-this-branch/agi/eagi-sphinx-test.c Tue May 2 09:56:02 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/test-this-branch/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/agi/eagi-test.c?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/agi/eagi-test.c (original)
+++ team/oej/test-this-branch/agi/eagi-test.c Tue May 2 09:56:02 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/test-this-branch/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/app.c?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/app.c (original)
+++ team/oej/test-this-branch/app.c Tue May 2 09:56:02 2006
@@ -1042,7 +1042,7 @@
test = pbx_builtin_getvar_helper(chan, cat);
if (test && !strcasecmp(test, group))
count++;
- ast_mutex_unlock(&chan->lock);
+ ast_channel_unlock(chan);
}
return count;
@@ -1072,7 +1072,7 @@
test = pbx_builtin_getvar_helper(chan, cat);
if (test && !regexec(®exbuf, test, 0, NULL, 0))
count++;
- ast_mutex_unlock(&chan->lock);
+ ast_channel_unlock(chan);
}
regfree(®exbuf);
Modified: team/oej/test-this-branch/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/apps/Makefile?rev=24179&r1=24178&r2=24179&view=diff
==============================================================================
--- team/oej/test-this-branch/apps/Makefile (original)
+++ team/oej/test-this-branch/apps/Makefile Tue May 2 09:56:02 2006
[... 21044 lines stripped ...]
More information about the asterisk-commits
mailing list