[asterisk-commits] oej: branch oej/codecnegotiation r40388 - in
/team/oej/codecnegotiation: ./ a...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Aug 18 09:32:14 MST 2006
Author: oej
Date: Fri Aug 18 11:32:12 2006
New Revision: 40388
URL: http://svn.digium.com/view/asterisk?rev=40388&view=rev
Log:
Committing with unresolved conflicts
C channels/chan_sip.c
C channels/chan_agent.c
C apps/app_chanspy.c
C include/asterisk/channel.h
/O
Added:
team/oej/codecnegotiation/Makefile.moddir_rules
- copied unchanged from r40360, trunk/Makefile.moddir_rules
team/oej/codecnegotiation/channels/chan_vpb.cc
- copied unchanged from r40360, trunk/channels/chan_vpb.cc
team/oej/codecnegotiation/configs/sla.conf.sample
- copied unchanged from r40360, trunk/configs/sla.conf.sample
team/oej/codecnegotiation/doc/imapstorage.txt
- copied unchanged from r40360, trunk/doc/imapstorage.txt
team/oej/codecnegotiation/doc/macroexclusive.txt
- copied unchanged from r40360, trunk/doc/macroexclusive.txt
team/oej/codecnegotiation/doc/osp.txt
- copied unchanged from r40360, trunk/doc/osp.txt
team/oej/codecnegotiation/doc/queues-with-callback-members.txt
- copied unchanged from r40360, trunk/doc/queues-with-callback-members.txt
team/oej/codecnegotiation/include/asterisk/threadstorage.h
- copied unchanged from r40360, trunk/include/asterisk/threadstorage.h
team/oej/codecnegotiation/pbx/ael/ael-test/ael-ntest10/
- copied from r40360, trunk/pbx/ael/ael-test/ael-ntest10/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-ntest10/extensions.ael
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-ntest10/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-ntest12/
- copied from r40360, trunk/pbx/ael/ael-test/ael-ntest12/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-ntest12/extensions.ael
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-ntest12/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-ntest9/
- copied from r40360, trunk/pbx/ael/ael-test/ael-ntest9/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-ntest9/extensions.ael
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-ntest9/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test11/
- copied from r40360, trunk/pbx/ael/ael-test/ael-test11/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test11/extensions.ael
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-test11/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/
- copied from r40360, trunk/pbx/ael/ael-test/ael-vtest13/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/extensions.ael
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/include1.ael2
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include1.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/include2.ael2
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include2.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/include3.ael2
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include3.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/include4.ael2
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include4.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/include5.ael2
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include5.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-ntest10
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-ntest10
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-ntest12
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-ntest12
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-ntest9
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-ntest9
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test11
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-test11
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-vtest13
- copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-vtest13
team/oej/codecnegotiation/pbx/kdeconsole_main.cc
- copied unchanged from r40360, trunk/pbx/kdeconsole_main.cc
Removed:
team/oej/codecnegotiation/channels/chan_vpb.c
team/oej/codecnegotiation/channels/misdn/fac.c
team/oej/codecnegotiation/channels/misdn/fac.h
team/oej/codecnegotiation/codecs/codec_g723_1.c
team/oej/codecnegotiation/codecs/g723_slin_ex.h
team/oej/codecnegotiation/codecs/slin_g723_ex.h
team/oej/codecnegotiation/pbx/pbx_kdeconsole_main.cc
team/oej/codecnegotiation/res/res_osp.c
Modified:
team/oej/codecnegotiation/ (props changed)
team/oej/codecnegotiation/.cleancount
team/oej/codecnegotiation/CREDITS
team/oej/codecnegotiation/Makefile
team/oej/codecnegotiation/Makefile.rules
team/oej/codecnegotiation/UPGRADE.txt
team/oej/codecnegotiation/acinclude.m4
team/oej/codecnegotiation/acl.c
team/oej/codecnegotiation/agi/Makefile
team/oej/codecnegotiation/app.c
team/oej/codecnegotiation/apps/Makefile
team/oej/codecnegotiation/apps/app_chanspy.c
team/oej/codecnegotiation/apps/app_dial.c
team/oej/codecnegotiation/apps/app_directed_pickup.c
team/oej/codecnegotiation/apps/app_directory.c
team/oej/codecnegotiation/apps/app_disa.c
team/oej/codecnegotiation/apps/app_dumpchan.c
team/oej/codecnegotiation/apps/app_flash.c
team/oej/codecnegotiation/apps/app_followme.c
team/oej/codecnegotiation/apps/app_forkcdr.c
team/oej/codecnegotiation/apps/app_macro.c
team/oej/codecnegotiation/apps/app_meetme.c
team/oej/codecnegotiation/apps/app_osplookup.c
team/oej/codecnegotiation/apps/app_queue.c
team/oej/codecnegotiation/apps/app_rpt.c
team/oej/codecnegotiation/apps/app_sms.c
team/oej/codecnegotiation/apps/app_speech_utils.c
team/oej/codecnegotiation/apps/app_voicemail.c
team/oej/codecnegotiation/apps/app_zapbarge.c
team/oej/codecnegotiation/apps/app_zapras.c
team/oej/codecnegotiation/apps/app_zapscan.c
team/oej/codecnegotiation/ast_expr2f.c
team/oej/codecnegotiation/asterisk.c
team/oej/codecnegotiation/autoservice.c
team/oej/codecnegotiation/build_tools/menuselect-deps.in
team/oej/codecnegotiation/build_tools/prep_moduledeps
team/oej/codecnegotiation/cdr.c
team/oej/codecnegotiation/cdr/Makefile
team/oej/codecnegotiation/cdr/cdr_radius.c
team/oej/codecnegotiation/channel.c
team/oej/codecnegotiation/channels/ (props changed)
team/oej/codecnegotiation/channels/Makefile
team/oej/codecnegotiation/channels/chan_agent.c
team/oej/codecnegotiation/channels/chan_alsa.c
team/oej/codecnegotiation/channels/chan_h323.c
team/oej/codecnegotiation/channels/chan_iax2.c
team/oej/codecnegotiation/channels/chan_jingle.c
team/oej/codecnegotiation/channels/chan_mgcp.c
team/oej/codecnegotiation/channels/chan_misdn.c
team/oej/codecnegotiation/channels/chan_nbs.c
team/oej/codecnegotiation/channels/chan_oss.c
team/oej/codecnegotiation/channels/chan_phone.c
team/oej/codecnegotiation/channels/chan_sip.c
team/oej/codecnegotiation/channels/chan_skinny.c
team/oej/codecnegotiation/channels/chan_zap.c
team/oej/codecnegotiation/channels/iax2-parser.c
team/oej/codecnegotiation/channels/iax2-provision.c
team/oej/codecnegotiation/channels/misdn/Makefile
team/oej/codecnegotiation/channels/misdn/chan_misdn_config.h
team/oej/codecnegotiation/channels/misdn/ie.c
team/oej/codecnegotiation/channels/misdn/isdn_lib.c
team/oej/codecnegotiation/channels/misdn/isdn_lib.h
team/oej/codecnegotiation/channels/misdn/isdn_lib_intern.h
team/oej/codecnegotiation/channels/misdn/isdn_msg_parser.c
team/oej/codecnegotiation/channels/misdn_config.c
team/oej/codecnegotiation/cli.c
team/oej/codecnegotiation/codecs/Makefile
team/oej/codecnegotiation/codecs/codec_g726.c
team/oej/codecnegotiation/codecs/codec_gsm.c
team/oej/codecnegotiation/codecs/codec_ilbc.c
team/oej/codecnegotiation/codecs/codec_lpc10.c
team/oej/codecnegotiation/codecs/codec_speex.c
team/oej/codecnegotiation/codecs/codec_zap.c
team/oej/codecnegotiation/codecs/gsm/Makefile
team/oej/codecnegotiation/codecs/gsm/src/preprocess.c
team/oej/codecnegotiation/codecs/ilbc/Makefile
team/oej/codecnegotiation/codecs/lpc10/Makefile
team/oej/codecnegotiation/config.c
team/oej/codecnegotiation/configs/alsa.conf.sample
team/oej/codecnegotiation/configs/extconfig.conf.sample
team/oej/codecnegotiation/configs/features.conf.sample
team/oej/codecnegotiation/configs/followme.conf.sample
team/oej/codecnegotiation/configs/func_odbc.conf.sample
team/oej/codecnegotiation/configs/iax.conf.sample
team/oej/codecnegotiation/configs/manager.conf.sample
team/oej/codecnegotiation/configs/misdn.conf.sample
team/oej/codecnegotiation/configs/modules.conf.sample
team/oej/codecnegotiation/configs/phone.conf.sample
team/oej/codecnegotiation/configs/queues.conf.sample
team/oej/codecnegotiation/configs/sip.conf.sample
team/oej/codecnegotiation/configs/skinny.conf.sample
team/oej/codecnegotiation/configs/voicemail.conf.sample
team/oej/codecnegotiation/configs/zapata.conf.sample
team/oej/codecnegotiation/configure
team/oej/codecnegotiation/configure.ac
team/oej/codecnegotiation/contrib/init.d/rc.mandrake.zaptel
team/oej/codecnegotiation/contrib/scripts/safe_asterisk
team/oej/codecnegotiation/contrib/utils/zones2indications.c
team/oej/codecnegotiation/db1-ast/Makefile
team/oej/codecnegotiation/devicestate.c
team/oej/codecnegotiation/dns.c
team/oej/codecnegotiation/dnsmgr.c
team/oej/codecnegotiation/doc/CODING-GUIDELINES
team/oej/codecnegotiation/doc/asterisk-conf.txt
team/oej/codecnegotiation/doc/channelvariables.txt
team/oej/codecnegotiation/doc/enum.txt
team/oej/codecnegotiation/doc/extconfig.txt
team/oej/codecnegotiation/doc/misdn.txt
team/oej/codecnegotiation/doc/odbcstorage.txt
team/oej/codecnegotiation/doc/realtime.txt
team/oej/codecnegotiation/doc/smdi.txt
team/oej/codecnegotiation/doc/speechrec.txt
team/oej/codecnegotiation/dsp.c
team/oej/codecnegotiation/enum.c
team/oej/codecnegotiation/formats/Makefile
team/oej/codecnegotiation/formats/format_h263.c
team/oej/codecnegotiation/formats/format_ogg_vorbis.c
team/oej/codecnegotiation/formats/format_wav_gsm.c
team/oej/codecnegotiation/frame.c
team/oej/codecnegotiation/funcs/Makefile
team/oej/codecnegotiation/funcs/func_cdr.c
team/oej/codecnegotiation/funcs/func_db.c
team/oej/codecnegotiation/funcs/func_strings.c
team/oej/codecnegotiation/http.c
team/oej/codecnegotiation/include/asterisk/abstract_jb.h
team/oej/codecnegotiation/include/asterisk/ael_structs.h
team/oej/codecnegotiation/include/asterisk/app.h
team/oej/codecnegotiation/include/asterisk/astosp.h
team/oej/codecnegotiation/include/asterisk/autoconfig.h.in
team/oej/codecnegotiation/include/asterisk/channel.h
team/oej/codecnegotiation/include/asterisk/compiler.h
team/oej/codecnegotiation/include/asterisk/config.h
team/oej/codecnegotiation/include/asterisk/devicestate.h
team/oej/codecnegotiation/include/asterisk/dns.h
team/oej/codecnegotiation/include/asterisk/frame.h
team/oej/codecnegotiation/include/asterisk/lock.h
team/oej/codecnegotiation/include/asterisk/logger.h
team/oej/codecnegotiation/include/asterisk/manager.h
team/oej/codecnegotiation/include/asterisk/musiconhold.h
team/oej/codecnegotiation/include/asterisk/options.h
team/oej/codecnegotiation/include/asterisk/pbx.h
team/oej/codecnegotiation/include/asterisk/rtp.h
team/oej/codecnegotiation/include/asterisk/slinfactory.h
team/oej/codecnegotiation/include/asterisk/speech.h
team/oej/codecnegotiation/include/asterisk/stringfields.h
team/oej/codecnegotiation/include/asterisk/utils.h
team/oej/codecnegotiation/logger.c
team/oej/codecnegotiation/makeopts.in
team/oej/codecnegotiation/manager.c
team/oej/codecnegotiation/netsock.c
team/oej/codecnegotiation/pbx.c
team/oej/codecnegotiation/pbx/Makefile
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test1/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test1
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test2
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test3
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test4
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test5
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test6
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test7
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test8
team/oej/codecnegotiation/pbx/ael/ael-test/runtests
team/oej/codecnegotiation/pbx/ael/ael.flex
team/oej/codecnegotiation/pbx/ael/ael.tab.c
team/oej/codecnegotiation/pbx/ael/ael.tab.h
team/oej/codecnegotiation/pbx/ael/ael.y
team/oej/codecnegotiation/pbx/ael/ael_lex.c
team/oej/codecnegotiation/pbx/dundi-parser.c
team/oej/codecnegotiation/pbx/pbx_ael.c
team/oej/codecnegotiation/pbx/pbx_config.c
team/oej/codecnegotiation/pbx/pbx_dundi.c
team/oej/codecnegotiation/pbx/pbx_gtkconsole.c
team/oej/codecnegotiation/pbx/pbx_kdeconsole.cc
team/oej/codecnegotiation/plc.c
team/oej/codecnegotiation/res/Makefile
team/oej/codecnegotiation/res/res_adsi.c
team/oej/codecnegotiation/res/res_agi.c
team/oej/codecnegotiation/res/res_config_odbc.c
team/oej/codecnegotiation/res/res_config_pgsql.c
team/oej/codecnegotiation/res/res_features.c
team/oej/codecnegotiation/res/res_jabber.c
team/oej/codecnegotiation/res/res_monitor.c
team/oej/codecnegotiation/res/res_musiconhold.c
team/oej/codecnegotiation/res/res_snmp.c
team/oej/codecnegotiation/res/res_speech.c
team/oej/codecnegotiation/rtp.c
team/oej/codecnegotiation/say.c
team/oej/codecnegotiation/sched.c
team/oej/codecnegotiation/sha1.c
team/oej/codecnegotiation/slinfactory.c
team/oej/codecnegotiation/sounds/Makefile
team/oej/codecnegotiation/srv.c
team/oej/codecnegotiation/tdd.c
team/oej/codecnegotiation/translate.c
team/oej/codecnegotiation/udptl.c
team/oej/codecnegotiation/ulaw.c
team/oej/codecnegotiation/utils.c
team/oej/codecnegotiation/utils/Makefile
team/oej/codecnegotiation/utils/ael_main.c
team/oej/codecnegotiation/utils/smsq.c
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 18 11:32:12 2006
@@ -21,3 +21,4 @@
config.log
makeopts.xml
autom4te.cache
+muted
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 18 11:32:12 2006
@@ -1,1 +1,1 @@
-/trunk:1-36158
+/trunk:1-40384
Modified: team/oej/codecnegotiation/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/.cleancount?rev=40388&r1=40387&r2=40388&view=diff
==============================================================================
--- team/oej/codecnegotiation/.cleancount (original)
+++ team/oej/codecnegotiation/.cleancount Fri Aug 18 11:32:12 2006
@@ -1,1 +1,1 @@
-19
+20
Modified: team/oej/codecnegotiation/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/CREDITS?rev=40388&r1=40387&r2=40388&view=diff
==============================================================================
--- team/oej/codecnegotiation/CREDITS (original)
+++ team/oej/codecnegotiation/CREDITS Fri Aug 18 11:32:12 2006
@@ -41,6 +41,39 @@
russelb at clemson.edu
Anthony Minessale II - Countless big and small fixes, and relentless forward push
+also:
+app_chanspy
+app_forkcdr
+app_controlplayback
+app_while
+app_dumpchan
+app_dictate
+app_realtime
+app_macroif
+app_execif
+app_execiftime
+res_odbc
+res_config_odbc
+format_slin
+app_retrydial
+cdr_custom
+res_muxmon (now MixMonitor)
+res_sqlite
+format_mp3
+Several Features in app_dial including L(), G() and enhancements to M() and D()
+The concept design and initial implementation of dialplan functions with several examples.
+Several CDR enhancements including CDR variables.
+Attended Transfer
+One Touch Record
+Native Music On Hold
+Pluggable config backend (res_config)
+Realtime Caching options and SIP/IAX clusterability
+IAX codec preferences
+Modifications to the manager API to disable events.
+command line '-t' flag to allow recording/voicemail on nfs shares.
+#exec parser in config files.
+setvar from iax and sip peers.
+mulit-line comments in config files.
anthmct at yahoo.com http://www.asterlink.com
James Golovich - Innumerable contributions
@@ -131,6 +164,16 @@
John Martin, Aupix - Improved video support in the SIP channel
Steve Underwood - Provided T.38 pass through support.
+
+George Konstantoulakis - Support for Greek in voicemail added by InAccess Networks (work funded by HOL, www.hol.gr) gkon at inaccessnetworks.com
+
+Daniel Nylander - Support for Swedish and Norwegian languages in voicemail. http://www.danielnylander.se/
+
+Stojan Sljivic - An option for maximum number of messsages per mailbox in voicemail. Also an issue with voicemail synchronization has been fixed. GDS Partners www.gdspartners.com . stojan.sljivic at gdspartners.com
+
+Bartosz Supczinski - Support for Polish added by DIR (www.dir.pl) Bartosz.Supczinski at dir.pl
+
+James Rothenberger - Support for IMAP storage integration added by OneBizTone LLC Work funded by University of Pennsylvania jar at onebiztone.com
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Modified: team/oej/codecnegotiation/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/Makefile?rev=40388&r1=40387&r2=40388&view=diff
==============================================================================
--- team/oej/codecnegotiation/Makefile (original)
+++ team/oej/codecnegotiation/Makefile Fri Aug 18 11:32:12 2006
@@ -11,7 +11,19 @@
# the GNU General Public License
#
+# All Makefiles use the following variables:
+#
+# LDFLAGS - linker flags (not libraries), used for all links
+# LIBS - additional libraries, at top-level for all links,
+# on a single object just for that object
+# SOLINK - linker flags used only for creating shared objects (.so files),
+# used for all .so links
+#
+
.EXPORT_ALL_VARIABLES:
+
+#Uncomment this to see all build commands instead of 'quiet' output
+#NOISY_BUILD=yes
# Create OPTIONS variable
OPTIONS=
@@ -25,14 +37,14 @@
#SUB_PROC=xscale # or maverick
ifeq ($(CROSS_COMPILE),)
- OSARCH=$(shell uname -s)
- PROC?=$(shell uname -m)
+ OSARCH:=$(shell uname -s)
+ PROC?:=$(shell uname -m)
else
OSARCH=$(CROSS_ARCH)
PROC=$(CROSS_PROC)
endif
-PWD=$(shell pwd)
+ASTTOPDIR:=$(shell pwd)
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
@@ -66,16 +78,16 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
ifeq ($(OSARCH),SunOS)
- ASTETCDIR=/etc/opt/asterisk
+ ASTETCDIR=/var/etc/asterisk
ASTLIBDIR=/opt/asterisk/lib
- ASTVARLIBDIR=/var/opt/asterisk/lib
- ASTSPOOLDIR=/var/opt/asterisk/spool
- ASTLOGDIR=/var/opt/asterisk/log
- ASTHEADERDIR=/opt/asterisk/usr/include/asterisk
- ASTBINDIR=/opt/asterisk/usr/bin
- ASTSBINDIR=/opt/asterisk/usr/sbin
- ASTVARRUNDIR=/var/opt/asterisk/run
- ASTMANDIR=/opt/asterisk/usr/share/man
+ ASTVARLIBDIR=/var/opt/asterisk
+ ASTSPOOLDIR=/var/spool/asterisk
+ ASTLOGDIR=/var/log/asterisk
+ ASTHEADERDIR=/opt/asterisk/include
+ ASTBINDIR=/opt/asterisk/bin
+ ASTSBINDIR=/opt/asterisk/sbin
+ ASTVARRUNDIR=/var/run/asterisk
+ ASTMANDIR=/opt/asterisk/man
else
ASTETCDIR=$(sysconfdir)/asterisk
ASTLIBDIR=$(libdir)/asterisk
@@ -119,20 +131,34 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-ifneq ($(wildcard menuselect.makeopts),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard menuselect.makeopts),)
include menuselect.makeopts
include menuselect.makedeps
-endif
-
-ifneq ($(wildcard makeopts),)
+ endif
+endif
+
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard makeopts),)
include makeopts
+ endif
endif
TOPDIR_CFLAGS=-Iinclude
MOD_SUBDIR_CFLAGS=-I../include -I..
OTHER_SUBDIR_CFLAGS=-I../include -I..
-ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),)
+ifeq ($(origin MENUSELECT_CFLAGS),undefined)
+ MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .)
+ ifeq ($(MENUSELECT_CFLAGS),)
+ MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
+ endif
+ ifneq ($(MENUSELECT_CFLAGS),)
+ MENUSELECT_CFLAGS:=$(shell echo $(MENUSELECT_CFLAGS) | cut -f2 -d'=')
+ endif
+endif
+
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)))
# More GSM codec optimization
# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
# which support MMX instructions. This should be newer pentiums,
@@ -208,9 +234,6 @@
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
ASTOBJ=-o asterisk
ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -228,7 +251,7 @@
ifeq ($(OSARCH),FreeBSD)
BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+ AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
@@ -240,7 +263,7 @@
endif
ifeq ($(OSARCH),SunOS)
- ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
+ ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
endif
LIBEDIT=editline/libedit.a
@@ -301,13 +324,13 @@
endif
ifeq ($(OSARCH),Linux)
- LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv #-lnjamd
+ AST_LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv #-lnjamd
else
- LIBS+=$(EDITLINE_LIB) -lm
+ AST_LIBS+=$(EDITLINE_LIB) -lm
endif
ifeq ($(OSARCH),Darwin)
- LIBS+=-lresolv
+ AST_LIBS+=-lresolv
ASTCFLAGS+=-D__Darwin__
AUDIO_LIBS=-framework CoreAudio
ASTLINK=-Wl,-dynamic
@@ -322,26 +345,25 @@
ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
ifeq ($(findstring BSD,$(OSARCH)),BSD)
- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+ LDFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
endif
ifeq ($(OSARCH),FreeBSD)
- LIBS+=-lcrypto
+ AST_LIBS+=-lcrypto
endif
ifeq ($(OSARCH),NetBSD)
- LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIB)
+ AST_LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIB)
endif
ifeq ($(OSARCH),OpenBSD)
- LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
+ AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
endif
ifeq ($(OSARCH),SunOS)
- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
+ AST_LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
OBJS+=strcompat.o
- MENUSELECT_OBJS+=strcompat.o
ASTLINK=
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
endif
@@ -357,6 +379,8 @@
HAVEDOT=no
endif
+include Makefile.rules
+
_all: all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, but +"
@@ -366,7 +390,7 @@
@echo " + make install +"
@echo " +-------------------------------------------+"
-all: cleantest config.status menuselect.makeopts depend asterisk $(SUBDIRS)
+all: cleantest config.status menuselect.makeopts depend $(SUBDIRS) asterisk
$(MOD_SUBDIRS):
@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
@@ -390,11 +414,8 @@
@echo "****"
@exit 1
-menuselect.makeopts: menuselect/menuselect makeopts.xml
- @menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
-
-menuselect.makedeps: menuselect/menuselect makeopts.xml
- @menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
+menuselect.makeopts menuselect.makedeps: menuselect/menuselect makeopts.xml
+ menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
#ifneq ($(wildcard tags),)
ctags: tags
@@ -405,21 +426,25 @@
endif
editline/config.h:
- cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
+ cd editline && unset CFLAGS AST_LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
editline/libedit.a:
- cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
+ cd editline && unset CFLAGS AST_LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a:
$(MAKE) -C db1-ast libdb1.a
-ifneq ($(wildcard .depend),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .depend),)
include .depend
-endif
-
-ifneq ($(wildcard .tags-depend),)
+ endif
+endif
+
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .tags-depend),)
include .tags-depend
+ endif
endif
ast_expr2.c ast_expr2.h:
@@ -478,16 +503,17 @@
channel.o: CFLAGS+=$(ZAPTEL_INCLUDE)
asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.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 \
+ @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 ; \
fi
- rm -f include/asterisk/build.h.tmp
- $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(LIBS)
+ @rm -f include/asterisk/build.h.tmp
+ @$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+ @echo " [LD] $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.1 $(AST_LIBS) -> $@"
+ @$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(AST_LIBS)
muted: muted.o
- $(CC) $(AUDIO_LIBS) -o muted muted.o
+muted: LIBS+=$(AUDIO_LIBS)
$(SUBDIRS_CLEAN_DEPEND):
@$(MAKE) -C $(@:-clean-depend=) clean-depend
@@ -509,18 +535,19 @@
@$(MAKE) -C stdtime clean
@$(MAKE) -C menuselect clean
-distclean: dist-clean
-
-dist-clean: clean
+dist-clean: distclean
+
+distclean: clean
@$(MAKE) -C mxml clean
@$(MAKE) -C menuselect dist-clean
@$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts makeopts.xml menuselect.makedeps
rm -f config.log config.status
rm -rf autom4te.cache
- rm -f include/autoconfig.h
+ rm -f include/asterisk/autoconfig.h
rm -f include/asterisk/buildopts.h
rm -rf doc/api
+ rm -f build_tools/menuselect-deps
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -876,16 +903,16 @@
rm -rf $(DESTDIR)$(ASTLOGDIR)
menuselect: menuselect/menuselect makeopts.xml
- - at menuselect/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a $(MENUSELECT_OBJS)
- @CFLAGS="-include ../include/asterisk/autoconfig.h" $(MAKE) -C menuselect menuselect
+ - at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a
+ @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect menuselect
mxml/libmxml.a:
- @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
+ @cd mxml && unset CFLAGS AST_LIBS && test -f config.h || ./configure
$(MAKE) -C mxml libmxml.a
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml
@echo "Generating list of available modules ..."
@build_tools/prep_moduledeps > $@
Modified: team/oej/codecnegotiation/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/Makefile.rules?rev=40388&r1=40387&r2=40388&view=diff
==============================================================================
--- team/oej/codecnegotiation/Makefile.rules (original)
+++ team/oej/codecnegotiation/Makefile.rules Fri Aug 18 11:32:12 2006
@@ -11,43 +11,83 @@
# the GNU General Public License
#
-define module_o_template
-$(1).o: $(1).c
- $$(CC) -c -o $$@ $$< $$(CFLAGS) $$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE))
+# Each command is preceded by a short comment on what to do.
+# Prefixing one or the other with @\# or @ or nothing makes the desired
+# behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
+
+ifeq ($(NOISY_BUILD),)
+ ECHO_PREFIX=@
+ CMD_PREFIX=@
+else
+ ECHO_PREFIX=@\#
+ CMD_PREFIX=
+endif
+
+define ast_make_o_c
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [CC] $$< -> $$@"
+ $(CMD_PREFIX) $$(CC) -o $$@ -c $$< $$(CFLAGS)
endef
-define module_so_template
-$(1).so: $(1).o
- $$(CC) $$(SOLINK) -o $$@ $$^ $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+define ast_make_oo_cc
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [CXX] $$< -> $$@"
+ $(CMD_PREFIX) $$(CXX) -o $$@ -c $$< $$(CFLAGS)
endef
-%.o: %.c
- $(CC) -c -o $@ $< $(CFLAGS)
+define ast_make_c_y
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [BISON] $$< -> $$@"
+ $(CMD_PREFIX) bison -o $$@ -d --name-prefix=ast_yy $$<
+endef
-$(foreach mod,$(SELECTED_MODS),$(eval $(call module_o_template,$(mod))))
+define ast_make_c_fl
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [FLEX] $$< -> $$@"
+ $(CMD_PREFIX) flex -o $$@ --full $$<
+endef
-$(foreach mod,$(SELECTED_MODS),$(eval $(call module_so_template,$(mod))))
+define ast_make_so_o
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
+ $(CMD_PREFIX) $$(CC) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS)
+endef
-.PHONY: clean clean-depend depend uninstall _all
+define ast_make_so_oo
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [LDXX] $$^ -> $$@"
+ $(CMD_PREFIX) $$(CXX) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS)
+endef
-_all: $(SELECTED_MODS:%=%.so)
+define ast_make_a_o
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [AR] $$^ -> $$@"
+ $(CMD_PREFIX) $$(AR) cr $$@ $$^
+ $(CMD_PREFIX) $$(RANLIB) $$@
+endef
-clean-depend::
- rm -f .depend
+define ast_make_final
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
+ $(CMD_PREFIX) $$(CC) -o $$@ $$(LDFLAGS) $$^ $$(LIBS)
+endef
-clean:: clean-depend
- rm -f *.so *.o
+define ast_make_final_host
+$(1): $(2)
+ $(ECHO_PREFIX) echo " [LD] $$^ -> $$@"
+ $(CMD_PREFIX) $$(HOST_CC) -o $$@ $$(CFLAGS) $$(LDFLAGS) $$^ $$(LIBS)
+endef
-install:: all
- for x in $(SELECTED_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+$(eval $(call ast_make_o_c,%.o,%.c))
-uninstall::
+$(eval $(call ast_make_oo_cc,%.oo,%.cc))
-ifneq ($(wildcard .depend),)
- include .depend
-endif
+$(eval $(call ast_make_so_o,%.so,%.o))
-depend: .depend
+$(eval $(call ast_make_so_oo,%.so,%.oo))
-.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+$(eval $(call ast_make_final,%,%.o))
+
+$(eval $(call ast_make_c_y,%.c,%.y))
+
+$(eval $(call ast_make_c_fl,%.c,%.fl))
Modified: team/oej/codecnegotiation/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/UPGRADE.txt?rev=40388&r1=40387&r2=40388&view=diff
==============================================================================
--- team/oej/codecnegotiation/UPGRADE.txt (original)
+++ team/oej/codecnegotiation/UPGRADE.txt Fri Aug 18 11:32:12 2006
@@ -197,6 +197,10 @@
exit code, the AGISTATUS variable will be set to "FAILURE" as opposed to
"SUCCESS".
+* app_voicemail: The ODBC_STORAGE capability now requires the extended table format
+ previously used only by EXTENDED_ODBC_STORAGE. This means that you will need to update
+ your table format using the schema provided in doc/odbcstorage.txt
+
Manager:
* After executing the 'status' manager action, the "Status" manager events
@@ -240,6 +244,10 @@
* Builtin transfer functionality sets the variable ${TRANSFERERNAME} in the new
created channel. This variables holds the channel name of the transferer.
+* The dial plan variable PRI_CAUSE will be removed from future versions
+ of Asterisk.
+ It is replaced by adding a cause value to the hangup() application.
+
Functions:
* The function ${CHECK_MD5()} has been deprecated in favor of using an
@@ -284,6 +292,23 @@
* Support for MFC/R2 has been removed, as it has not been functional for some
time and it has no maintainer.
+
+The G726-32 codec:
+
+* It has been determined that previous versions of Asterisk used the wrong codeword
+ packing order for G726-32 data. This version supports both available packing orders,
+ and can transcode between them. It also now selects the proper order when
+ negotiating with a SIP peer based on the codec name supplied in the SDP. However,
+ there are existing devices that improperly request one order and then use another;
+ Sipura and Grandstream ATAs are known to do this, and there may be others. To
+ be able to continue to use these devices with this version of Asterisk and the
+ G726-32 codec, a configuration parameter called 'g726nonstandard' has been added
+ to sip.conf, so that Asterisk can use the packing order expected by the device (even
+ though it requested a different order). In addition, the internal format number for
+ G726-32 has been changed, and the old number is now assigned to AAL2-G726-32. The
+ result of this is that this version of Asterisk will be able to interoperate over
+ IAX2 with older versions of Asterisk, as long as this version is told to allow
+ 'g726aal2' instead of 'g726' as the codec for the call.
Installation:
@@ -298,3 +323,42 @@
ASTETCDIR /usr/local/etc/asterisk
ASTBINDIR /usr/local/bin/asterisk
ASTSBINDIR /usr/local/sbin/asterisk
+
+Music on Hold:
+
+* The music on hold handling has been changed in some significant ways in hopes
+ to make it work in a way that is much less confusing to users. Behavior will
+ not change if the same configuration is used from older versions of Asterisk.
+ However, there are some new configuration options that will make things work
+ in a way that makes more sense.
+
+ Previously, many of the channel drivers had an option called "musicclass" or
+ something similar. This option set what music on hold class this channel
+ would *hear* when put on hold. Some people expected (with good reason) that
+ this option was to configure what music on hold class to play when putting
+ the bridged channel on hold. This option has now been deprecated.
+
+ Two new music on hold related configuration options for channel drivers have
+ been introduced. Some channel drivers support both options, some just one,
+ and some support neither of them. Check the sample configuration files to see
+ which options apply to which channel driver.
+
+ The "mohsuggest" option specifies which music on hold class to suggest to the
+ bridged channel when putting them on hold. The only way that this class can
+ be overridden is if the bridged channel has a specific music class set that
+ was done in the dialplan using Set(CHANNEL(musicclass)=something).
+
+ The "mohinterpret" option is similar to the old "musicclass" option. It
+ specifies which music on hold class this channel would like to listen to when
+ put on hold. This music class is only effective if this channel has no music
+ class set on it from the dialplan and the bridged channel putting this one on
+ hold had no "mohsuggest" setting.
+
+ The IAX2 and Zap channel drivers have an additional feature for the
+ "mohinterpret" option. If this option is set to "passthrough", then these
+ channel drivers will pass through the HOLD message in signalling instead of
+ starting music on hold on the channel. An example for how this would be
+ useful is in an enterprise network of Asterisk servers. When one phone on one
+ server puts a phone on a different server on hold, the remote server will be
+ responsibile for playing the hold music to its local phone that was put on
+ hold instead of the far end server across the network playing the music.
Modified: team/oej/codecnegotiation/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/acinclude.m4?rev=40388&r1=40387&r2=40388&view=diff
==============================================================================
--- team/oej/codecnegotiation/acinclude.m4 (original)
+++ team/oej/codecnegotiation/acinclude.m4 Fri Aug 18 11:32:12 2006
@@ -1,89 +1,103 @@
-# AST_EXT_LIB([NAME], [FUNCTION], [package header], [package symbol name], [package friendly name], [additional LIB data])
+# AST_EXT_LIB_SETUP([package symbol name], [package friendly name], [package option name], [additional help text])
-AC_DEFUN([AST_EXT_LIB],
+AC_DEFUN([AST_EXT_LIB_SETUP],
[
-AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $5 files in PATH]),[
+$1_DESCRIP="$2"
+$1_OPTION="$3"
+AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),[
case ${withval} in
n|no)
- USE_$4=no
+ USE_$1=no
;;
y|ye|yes)
- $4_MANDATORY="yes"
+ $1_MANDATORY="yes"
;;
*)
- $4_DIR="${withval}"
- $4_MANDATORY="yes"
+ $1_DIR="${withval}"
+ $1_MANDATORY="yes"
;;
esac
])
+PBX_$1=0
+AC_SUBST([$1_LIB])
+AC_SUBST([$1_INCLUDE])
+AC_SUBST([PBX_$1])
+])
-PBX_LIB$4=0
+# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data])
-if test "${USE_$4}" != "no"; then
+AC_DEFUN([AST_EXT_LIB_CHECK],
+[
+if test "${USE_$1}" != "no"; then
pbxlibdir=""
[... 75099 lines stripped ...]
More information about the asterisk-commits
mailing list