[asterisk-commits] oej: branch oej/iaxtrunkfix-1.4 r56618 - in
/team/oej/iaxtrunkfix-1.4: ./ agi...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Feb 24 10:09:37 MST 2007
Author: oej
Date: Sat Feb 24 11:09:33 2007
New Revision: 56618
URL: http://svn.digium.com/view/asterisk?view=rev&rev=56618
Log:
Reset automerge
Added:
team/oej/iaxtrunkfix-1.4/build_tools/make_sample_voicemail
- copied unchanged from r56569, branches/1.4/build_tools/make_sample_voicemail
team/oej/iaxtrunkfix-1.4/doc/sla.txt
- copied unchanged from r56569, branches/1.4/doc/sla.txt
team/oej/iaxtrunkfix-1.4/doc/voicemail_odbc_postgresql.txt
- copied unchanged from r56569, branches/1.4/doc/voicemail_odbc_postgresql.txt
team/oej/iaxtrunkfix-1.4/include/asterisk/dial.h
- copied unchanged from r56569, branches/1.4/include/asterisk/dial.h
team/oej/iaxtrunkfix-1.4/main/dial.c
- copied unchanged from r56569, branches/1.4/main/dial.c
team/oej/iaxtrunkfix-1.4/main/threadstorage.c
- copied unchanged from r56569, branches/1.4/main/threadstorage.c
Removed:
team/oej/iaxtrunkfix-1.4/aclocal.m4
team/oej/iaxtrunkfix-1.4/build_tools/mkdep
Modified:
team/oej/iaxtrunkfix-1.4/ (props changed)
team/oej/iaxtrunkfix-1.4/.cleancount
team/oej/iaxtrunkfix-1.4/BUGS
team/oej/iaxtrunkfix-1.4/CHANGES
team/oej/iaxtrunkfix-1.4/Makefile
team/oej/iaxtrunkfix-1.4/Makefile.moddir_rules
team/oej/iaxtrunkfix-1.4/Makefile.rules
team/oej/iaxtrunkfix-1.4/UPGRADE.txt
team/oej/iaxtrunkfix-1.4/acinclude.m4
team/oej/iaxtrunkfix-1.4/agi/ (props changed)
team/oej/iaxtrunkfix-1.4/agi/Makefile
team/oej/iaxtrunkfix-1.4/apps/ (props changed)
team/oej/iaxtrunkfix-1.4/apps/app_adsiprog.c
team/oej/iaxtrunkfix-1.4/apps/app_amd.c
team/oej/iaxtrunkfix-1.4/apps/app_chanspy.c
team/oej/iaxtrunkfix-1.4/apps/app_db.c
team/oej/iaxtrunkfix-1.4/apps/app_dial.c
team/oej/iaxtrunkfix-1.4/apps/app_dictate.c
team/oej/iaxtrunkfix-1.4/apps/app_directed_pickup.c
team/oej/iaxtrunkfix-1.4/apps/app_echo.c
team/oej/iaxtrunkfix-1.4/apps/app_externalivr.c
team/oej/iaxtrunkfix-1.4/apps/app_festival.c
team/oej/iaxtrunkfix-1.4/apps/app_ices.c
team/oej/iaxtrunkfix-1.4/apps/app_macro.c
team/oej/iaxtrunkfix-1.4/apps/app_meetme.c
team/oej/iaxtrunkfix-1.4/apps/app_mixmonitor.c
team/oej/iaxtrunkfix-1.4/apps/app_mp3.c
team/oej/iaxtrunkfix-1.4/apps/app_nbscat.c
team/oej/iaxtrunkfix-1.4/apps/app_page.c
team/oej/iaxtrunkfix-1.4/apps/app_playback.c
team/oej/iaxtrunkfix-1.4/apps/app_queue.c
team/oej/iaxtrunkfix-1.4/apps/app_record.c
team/oej/iaxtrunkfix-1.4/apps/app_rpt.c
team/oej/iaxtrunkfix-1.4/apps/app_senddtmf.c
team/oej/iaxtrunkfix-1.4/apps/app_setcdruserfield.c
team/oej/iaxtrunkfix-1.4/apps/app_sms.c
team/oej/iaxtrunkfix-1.4/apps/app_speech_utils.c
team/oej/iaxtrunkfix-1.4/apps/app_userevent.c
team/oej/iaxtrunkfix-1.4/apps/app_voicemail.c
team/oej/iaxtrunkfix-1.4/apps/app_while.c
team/oej/iaxtrunkfix-1.4/apps/app_zapras.c
team/oej/iaxtrunkfix-1.4/build_tools/cflags.xml
team/oej/iaxtrunkfix-1.4/build_tools/get_makeopts
team/oej/iaxtrunkfix-1.4/build_tools/get_moduleinfo
team/oej/iaxtrunkfix-1.4/build_tools/make_version
team/oej/iaxtrunkfix-1.4/build_tools/make_version_h
team/oej/iaxtrunkfix-1.4/build_tools/menuselect-deps.in
team/oej/iaxtrunkfix-1.4/build_tools/prep_moduledeps
team/oej/iaxtrunkfix-1.4/build_tools/prep_tarball
team/oej/iaxtrunkfix-1.4/cdr/ (props changed)
team/oej/iaxtrunkfix-1.4/cdr/cdr_manager.c
team/oej/iaxtrunkfix-1.4/cdr/cdr_pgsql.c
team/oej/iaxtrunkfix-1.4/channels/ (props changed)
team/oej/iaxtrunkfix-1.4/channels/Makefile
team/oej/iaxtrunkfix-1.4/channels/chan_agent.c
team/oej/iaxtrunkfix-1.4/channels/chan_alsa.c
team/oej/iaxtrunkfix-1.4/channels/chan_features.c
team/oej/iaxtrunkfix-1.4/channels/chan_gtalk.c
team/oej/iaxtrunkfix-1.4/channels/chan_h323.c
team/oej/iaxtrunkfix-1.4/channels/chan_iax2.c
team/oej/iaxtrunkfix-1.4/channels/chan_local.c
team/oej/iaxtrunkfix-1.4/channels/chan_mgcp.c
team/oej/iaxtrunkfix-1.4/channels/chan_misdn.c
team/oej/iaxtrunkfix-1.4/channels/chan_nbs.c
team/oej/iaxtrunkfix-1.4/channels/chan_oss.c
team/oej/iaxtrunkfix-1.4/channels/chan_phone.c
team/oej/iaxtrunkfix-1.4/channels/chan_sip.c
team/oej/iaxtrunkfix-1.4/channels/chan_skinny.c
team/oej/iaxtrunkfix-1.4/channels/chan_vpb.cc
team/oej/iaxtrunkfix-1.4/channels/chan_zap.c
team/oej/iaxtrunkfix-1.4/channels/h323/ast_h323.cxx
team/oej/iaxtrunkfix-1.4/channels/iax2-parser.c
team/oej/iaxtrunkfix-1.4/channels/iax2-parser.h
team/oej/iaxtrunkfix-1.4/channels/misdn/ie.c
team/oej/iaxtrunkfix-1.4/channels/misdn/isdn_lib.c
team/oej/iaxtrunkfix-1.4/channels/misdn/isdn_lib.h
team/oej/iaxtrunkfix-1.4/channels/misdn/isdn_msg_parser.c
team/oej/iaxtrunkfix-1.4/channels/misdn_config.c
team/oej/iaxtrunkfix-1.4/codecs/ (props changed)
team/oej/iaxtrunkfix-1.4/codecs/Makefile
team/oej/iaxtrunkfix-1.4/codecs/codec_gsm.c
team/oej/iaxtrunkfix-1.4/codecs/codec_zap.c
team/oej/iaxtrunkfix-1.4/codecs/gsm/ (props changed)
team/oej/iaxtrunkfix-1.4/codecs/gsm/Makefile
team/oej/iaxtrunkfix-1.4/codecs/ilbc/ (props changed)
team/oej/iaxtrunkfix-1.4/codecs/ilbc/Makefile
team/oej/iaxtrunkfix-1.4/codecs/lpc10/ (props changed)
team/oej/iaxtrunkfix-1.4/codecs/lpc10/Makefile
team/oej/iaxtrunkfix-1.4/configs/extensions.conf.sample
team/oej/iaxtrunkfix-1.4/configs/features.conf.sample
team/oej/iaxtrunkfix-1.4/configs/iax.conf.sample
team/oej/iaxtrunkfix-1.4/configs/meetme.conf.sample
team/oej/iaxtrunkfix-1.4/configs/misdn.conf.sample
team/oej/iaxtrunkfix-1.4/configs/musiconhold.conf.sample
team/oej/iaxtrunkfix-1.4/configs/say.conf.sample
team/oej/iaxtrunkfix-1.4/configs/sip.conf.sample
team/oej/iaxtrunkfix-1.4/configs/sla.conf.sample
team/oej/iaxtrunkfix-1.4/configs/users.conf.sample
team/oej/iaxtrunkfix-1.4/configs/voicemail.conf.sample
team/oej/iaxtrunkfix-1.4/configure
team/oej/iaxtrunkfix-1.4/configure.ac
team/oej/iaxtrunkfix-1.4/contrib/init.d/rc.suse.asterisk
team/oej/iaxtrunkfix-1.4/contrib/scripts/vmdb.sql
team/oej/iaxtrunkfix-1.4/doc/billing.txt
team/oej/iaxtrunkfix-1.4/doc/cdrdriver.txt
team/oej/iaxtrunkfix-1.4/doc/imapstorage.txt
team/oej/iaxtrunkfix-1.4/doc/manager.txt
team/oej/iaxtrunkfix-1.4/doc/misdn.txt
team/oej/iaxtrunkfix-1.4/doc/osp.txt
team/oej/iaxtrunkfix-1.4/doc/snmp.txt
team/oej/iaxtrunkfix-1.4/formats/ (props changed)
team/oej/iaxtrunkfix-1.4/funcs/ (props changed)
team/oej/iaxtrunkfix-1.4/funcs/func_cdr.c
team/oej/iaxtrunkfix-1.4/funcs/func_curl.c
team/oej/iaxtrunkfix-1.4/funcs/func_math.c
team/oej/iaxtrunkfix-1.4/funcs/func_odbc.c
team/oej/iaxtrunkfix-1.4/funcs/func_realtime.c
team/oej/iaxtrunkfix-1.4/funcs/func_strings.c
team/oej/iaxtrunkfix-1.4/funcs/func_uri.c
team/oej/iaxtrunkfix-1.4/include/asterisk.h
team/oej/iaxtrunkfix-1.4/include/asterisk/ael_structs.h
team/oej/iaxtrunkfix-1.4/include/asterisk/app.h
team/oej/iaxtrunkfix-1.4/include/asterisk/astmm.h
team/oej/iaxtrunkfix-1.4/include/asterisk/autoconfig.h.in
team/oej/iaxtrunkfix-1.4/include/asterisk/channel.h
team/oej/iaxtrunkfix-1.4/include/asterisk/devicestate.h
team/oej/iaxtrunkfix-1.4/include/asterisk/jabber.h
team/oej/iaxtrunkfix-1.4/include/asterisk/linkedlists.h
team/oej/iaxtrunkfix-1.4/include/asterisk/lock.h
team/oej/iaxtrunkfix-1.4/include/asterisk/manager.h
team/oej/iaxtrunkfix-1.4/include/asterisk/options.h
team/oej/iaxtrunkfix-1.4/include/asterisk/rtp.h
team/oej/iaxtrunkfix-1.4/include/asterisk/stringfields.h
team/oej/iaxtrunkfix-1.4/include/asterisk/term.h
team/oej/iaxtrunkfix-1.4/include/asterisk/threadstorage.h
team/oej/iaxtrunkfix-1.4/include/asterisk/utils.h
team/oej/iaxtrunkfix-1.4/include/jitterbuf.h
team/oej/iaxtrunkfix-1.4/main/ (props changed)
team/oej/iaxtrunkfix-1.4/main/Makefile
team/oej/iaxtrunkfix-1.4/main/acl.c
team/oej/iaxtrunkfix-1.4/main/app.c
team/oej/iaxtrunkfix-1.4/main/ast_expr2.c
team/oej/iaxtrunkfix-1.4/main/ast_expr2.fl
team/oej/iaxtrunkfix-1.4/main/ast_expr2.y
team/oej/iaxtrunkfix-1.4/main/ast_expr2f.c
team/oej/iaxtrunkfix-1.4/main/asterisk.c
team/oej/iaxtrunkfix-1.4/main/astmm.c
team/oej/iaxtrunkfix-1.4/main/callerid.c
team/oej/iaxtrunkfix-1.4/main/cdr.c
team/oej/iaxtrunkfix-1.4/main/channel.c
team/oej/iaxtrunkfix-1.4/main/cli.c
team/oej/iaxtrunkfix-1.4/main/config.c
team/oej/iaxtrunkfix-1.4/main/db.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/ (props changed)
team/oej/iaxtrunkfix-1.4/main/db1-ast/Makefile
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_close.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_conv.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_debug.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_delete.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_get.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_open.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_overflow.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_page.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_put.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_search.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_seq.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_split.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/btree/bt_utils.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/db/db.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/hash/hash.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/hash/hash_bigkey.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/hash/hash_buf.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/hash/hash_func.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/hash/hash_log2.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/hash/hash_page.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/hash/hsearch.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/include/ndbm.h
team/oej/iaxtrunkfix-1.4/main/db1-ast/mpool/mpool.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_close.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_delete.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_get.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_open.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_put.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_search.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_seq.c
team/oej/iaxtrunkfix-1.4/main/db1-ast/recno/rec_utils.c
team/oej/iaxtrunkfix-1.4/main/dnsmgr.c
team/oej/iaxtrunkfix-1.4/main/enum.c
team/oej/iaxtrunkfix-1.4/main/file.c
team/oej/iaxtrunkfix-1.4/main/frame.c
team/oej/iaxtrunkfix-1.4/main/http.c
team/oej/iaxtrunkfix-1.4/main/jitterbuf.c
team/oej/iaxtrunkfix-1.4/main/loader.c
team/oej/iaxtrunkfix-1.4/main/logger.c
team/oej/iaxtrunkfix-1.4/main/manager.c
team/oej/iaxtrunkfix-1.4/main/pbx.c
team/oej/iaxtrunkfix-1.4/main/rtp.c
team/oej/iaxtrunkfix-1.4/main/say.c
team/oej/iaxtrunkfix-1.4/main/sched.c
team/oej/iaxtrunkfix-1.4/main/stdtime/localtime.c
team/oej/iaxtrunkfix-1.4/main/term.c
team/oej/iaxtrunkfix-1.4/main/translate.c
team/oej/iaxtrunkfix-1.4/main/udptl.c
team/oej/iaxtrunkfix-1.4/main/utils.c
team/oej/iaxtrunkfix-1.4/makeopts.in
team/oej/iaxtrunkfix-1.4/pbx/ (props changed)
team/oej/iaxtrunkfix-1.4/pbx/ael/ael-test/ref.ael-test3
team/oej/iaxtrunkfix-1.4/pbx/ael/ael.flex
team/oej/iaxtrunkfix-1.4/pbx/ael/ael.tab.c
team/oej/iaxtrunkfix-1.4/pbx/ael/ael.tab.h
team/oej/iaxtrunkfix-1.4/pbx/ael/ael_lex.c
team/oej/iaxtrunkfix-1.4/pbx/pbx_ael.c
team/oej/iaxtrunkfix-1.4/pbx/pbx_config.c
team/oej/iaxtrunkfix-1.4/pbx/pbx_dundi.c
team/oej/iaxtrunkfix-1.4/pbx/pbx_spool.c
team/oej/iaxtrunkfix-1.4/redhat/asterisk.spec
team/oej/iaxtrunkfix-1.4/res/ (props changed)
team/oej/iaxtrunkfix-1.4/res/res_adsi.c
team/oej/iaxtrunkfix-1.4/res/res_agi.c
team/oej/iaxtrunkfix-1.4/res/res_config_odbc.c
team/oej/iaxtrunkfix-1.4/res/res_features.c
team/oej/iaxtrunkfix-1.4/res/res_jabber.c
team/oej/iaxtrunkfix-1.4/res/res_monitor.c
team/oej/iaxtrunkfix-1.4/res/res_musiconhold.c
team/oej/iaxtrunkfix-1.4/res/res_odbc.c
team/oej/iaxtrunkfix-1.4/res/res_snmp.c
team/oej/iaxtrunkfix-1.4/sample.call
team/oej/iaxtrunkfix-1.4/sounds/Makefile
team/oej/iaxtrunkfix-1.4/utils/ (props changed)
team/oej/iaxtrunkfix-1.4/utils/Makefile
team/oej/iaxtrunkfix-1.4/utils/ael_main.c
team/oej/iaxtrunkfix-1.4/utils/astman.c
team/oej/iaxtrunkfix-1.4/utils/check_expr.c
team/oej/iaxtrunkfix-1.4/utils/smsq.c
team/oej/iaxtrunkfix-1.4/utils/streamplayer.c
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Sat Feb 24 11:09:33 2007
@@ -1,1 +1,1 @@
-menuselect http://svn.digium.com/svn/menuselect/branches/1.0
+menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 24 11:09:33 2007
@@ -22,3 +22,4 @@
menuselect-tree
autom4te.cache
makeopts.embed_rules
+aclocal.m4
Propchange: team/oej/iaxtrunkfix-1.4/
('svnmerge-blocked' removed)
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 24 11:09:33 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-47190
+/branches/1.4:1-56615
Modified: team/oej/iaxtrunkfix-1.4/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/.cleancount?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/.cleancount (original)
+++ team/oej/iaxtrunkfix-1.4/.cleancount Sat Feb 24 11:09:33 2007
@@ -1,1 +1,1 @@
-25
+27
Modified: team/oej/iaxtrunkfix-1.4/BUGS
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/BUGS?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/BUGS (original)
+++ team/oej/iaxtrunkfix-1.4/BUGS Sat Feb 24 11:09:33 2007
@@ -10,7 +10,7 @@
learn how you can contribute by acting as a bug marshall
please see:
- http://www.digium.com/index.php?menu=bugguidelines
+ http://www.asterisk.org/developers/bug-guidelines
If you would like to submit a feature request, please
resist the temptation to post it to the bug tracker.
Modified: team/oej/iaxtrunkfix-1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/CHANGES?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/CHANGES (original)
+++ team/oej/iaxtrunkfix-1.4/CHANGES Sat Feb 24 11:09:33 2007
@@ -337,3 +337,5 @@
2. chan_modem_* and related modules are gone because the kernel support for those interfaces is old, buggy and unsupported
* New Utils:
1. aelparse -- compile .ael files outside of asterisk
+ * New manager events:
+ 1. OriginateResponse event comes to replace OriginateSuccess and OriginateFailure
Modified: team/oej/iaxtrunkfix-1.4/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/Makefile?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/Makefile (original)
+++ team/oej/iaxtrunkfix-1.4/Makefile Sat Feb 24 11:09:33 2007
@@ -37,6 +37,11 @@
export ASTVARLIBDIR
export ASTDATADIR
export ASTLOGDIR
+export ASTLIBDIR
+export ASTMANDIR
+export ASTHEADERDIR
+export ASTBINDIR
+export ASTSBINDIR
export AGI_DIR
export ASTCONFPATH
export NOISY_BUILD
@@ -52,6 +57,12 @@
export PROC
export SOLINK
export STRIP
+export DOWNLOAD
+export OSARCH
+export CURSES_DIR
+export NCURSES_DIR
+export TERMCAP_DIR
+export TINFO_DIR
# even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -175,6 +186,8 @@
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
+
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused
endif
@@ -214,7 +227,7 @@
ASTERISKVERSION:=$(shell build_tools/make_version .)
ifneq ($(wildcard .version),)
- ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
+ ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
else
RPMVERSION=unknown
@@ -231,10 +244,6 @@
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
-SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
-MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
-OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
-SUBDIRS_DEPEND:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
@@ -268,14 +277,14 @@
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@echo " + +"
- @echo " + make install +"
+ @echo " + $(MAKE) install +"
@echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS)
makeopts: configure
@echo "****"
- @echo "**** The configure script must be executed before running 'make'."
+ @echo "**** The configure script must be executed before running '$(MAKE)'."
@echo "****"
@exit 1
@@ -298,7 +307,7 @@
@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
-$(SUBDIRS): depend makeopts.embed_rules
+$(SUBDIRS): include/asterisk/version.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
# ensure that all module subdirectories are processed before 'main' during
# a parallel build, since if there are modules selected to be embedded the
@@ -307,10 +316,10 @@
main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -333,19 +342,13 @@
fi
@rm -f $@.tmp
-$(SUBDIRS_CLEAN_DEPEND):
- @$(MAKE) --no-print-directory -C $(@:-clean-depend=) clean-depend
-
$(SUBDIRS_CLEAN):
@$(MAKE) --no-print-directory -C $(@:-clean=) clean
-clean-depend: $(SUBDIRS_CLEAN_DEPEND)
-
-clean: $(SUBDIRS_CLEAN) clean-depend
+clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
rm -f include/asterisk/build.h
rm -f include/asterisk/version.h
- rm -f .depend
@$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean
@@ -389,7 +392,6 @@
grep ^C update.out | cut -b4- ; \
fi ; \
rm -f update.out; \
- $(MAKE) clean-depend; \
else \
echo "Not under version control"; \
fi
@@ -529,27 +531,21 @@
echo "astrundir => $(ASTVARRUNDIR)" ; \
echo "astlogdir => $(ASTLOGDIR)" ; \
echo "" ; \
+ echo ";[options]" ; \
+ echo ";internal_timing = yes" ; \
+ echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
echo ";astctlpermissions = 0660" ; \
echo ";astctlowner = root" ; \
echo ";astctlgroup = apache" ; \
echo ";astctl = asterisk.ctl" ; \
- echo ";[options]" ; \
- echo ";internal_timing = yes" ; \
) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
fi
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
- done
- :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
- for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
- cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
- done
+ build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
webvmail:
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@@ -621,14 +617,6 @@
echo "We could not install init scripts for your operating system."; \
fi
-$(MOD_SUBDIRS_DEPEND):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-$(OTHER_SUBDIRS_DEPEND):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND)
-
sounds:
$(MAKE) -C sounds all
@@ -676,14 +664,16 @@
rm -rf $(DESTDIR)$(ASTETCDIR)
rm -rf $(DESTDIR)$(ASTLOGDIR)
+menuconfig: menuselect
+
menuselect: menuselect/menuselect menuselect-tree
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
- @unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ @CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@
-.PHONY: menuselect main sounds clean clean-depend dist-clean distclean all prereqs depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Modified: team/oej/iaxtrunkfix-1.4/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/Makefile.moddir_rules?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/Makefile.moddir_rules (original)
+++ team/oej/iaxtrunkfix-1.4/Makefile.moddir_rules Sat Feb 24 11:09:33 2007
@@ -40,7 +40,7 @@
modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
-.PHONY: clean clean-depend depend uninstall _all
+.PHONY: clean uninstall _all
ifneq ($(LOADABLE_MODS),)
_all: $(LOADABLE_MODS:%=%.so)
@@ -67,11 +67,9 @@
@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
-clean-depend::
- rm -f .depend
-
-clean:: clean-depend
+clean::
rm -f *.so *.o *.oo
+ rm -f .*.o.d .*.oo.d
rm -f modules.link
install:: all
@@ -79,11 +77,6 @@
uninstall::
-ifneq ($(wildcard .depend),)
- include .depend
+ifneq ($(wildcard .*.d),)
+ include .*.d
endif
-
-depend: .depend
-
-.depend:
- ../build_tools/mkdep $(ASTCFLAGS) `ls *.c *.cc 2> /dev/null`
Modified: team/oej/iaxtrunkfix-1.4/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/Makefile.rules?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/Makefile.rules (original)
+++ team/oej/iaxtrunkfix-1.4/Makefile.rules Sat Feb 24 11:09:33 2007
@@ -38,11 +38,27 @@
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
+endif
+
+%.o: %.s
+ $(ECHO_PREFIX) echo " [AS] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
+endif
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS)
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS))
+endif
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
@@ -54,12 +70,12 @@
%.so: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
-%.soo: %.oo
+%.so: %.oo
$(ECHO_PREFIX) echo " [LDXX] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
%: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $^ $(LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
Modified: team/oej/iaxtrunkfix-1.4/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/UPGRADE.txt?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/UPGRADE.txt (original)
+++ team/oej/iaxtrunkfix-1.4/UPGRADE.txt Sat Feb 24 11:09:33 2007
@@ -163,6 +163,23 @@
option, it will default to "no" to keep backward compatability with the old
behavior.
+* Queues depend on the channel driver reporting the proper state
+ for each member of the queue. To get proper signalling on
+ queue members that use the SIP channel driver, you need to
+ enable a call limit (could be set to a high value so it
+ is not put into action) and also make sure that both inbound
+ and outbound calls are accounted for.
+
+ Example:
+
+ [general]
+ limitonpeer = yes
+
+ [peername]
+ type=friend
+ call-limit=10
+
+
* The app_queue application now has the ability to use MixMonitor to
record conversations queue members are having with queue callers. Please
see configs/queues.conf.sample for more information on this option.
@@ -247,6 +264,10 @@
also been deprecated in favor of the already existing MeetmeTalking event
with a "Status" of "on" or "off" added.
+* OriginateFailure and OriginateSuccess events were replaced by event
+ OriginateResponse with a header named "Response" to indicate success or
+ failure
+
Variables:
* The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
@@ -322,6 +343,12 @@
* The ALERT_INFO dialplan variable is deprecated and will be removed
in coming versions of Asterisk. Please use the dialplan application
sipaddheader() to add the "Alert-Info" header to the outbound invite.
+
+* The "canreinvite" option has changed. canreinvite=yes used to disable
+ re-invites if you had NAT=yes. In 1.4, you need to set canreinvite=nonat
+ to disable re-invites when NAT=yes. This is propably what you want.
+ The settings are now: "yes", "no", "nonat", "update". Please consult
+ sip.conf.sample for detailed information.
The Zap channel:
Modified: team/oej/iaxtrunkfix-1.4/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/acinclude.m4?view=diff&rev=56618&r1=56617&r2=56618
==============================================================================
--- team/oej/iaxtrunkfix-1.4/acinclude.m4 (original)
+++ team/oej/iaxtrunkfix-1.4/acinclude.m4 Sat Feb 24 11:09:33 2007
@@ -34,6 +34,7 @@
PBX_$1=0
AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
AC_SUBST([PBX_$1])
])
@@ -58,21 +59,24 @@
if test "x${$1_DIR}" != "x"; then
$1_LIB="${pbxlibdir} ${$1_LIB}"
$1_INCLUDE="-I${$1_DIR}/include"
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${$1_DIR}/include"
if test "x$4" != "x" ; then
- AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0] )
+ AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
fi
+ CPPFLAGS="${saved_cppflags}"
else
if test "x$4" != "x" ; then
- AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0] )
+ AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
fi
fi
if test "x${$1_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${$1_MANDATORY}" ;
+ if test -n "${$1_MANDATORY}" ;
then
- AC_MSG_NOTICE( ***)
- AC_MSG_NOTICE( *** It appears that you do not have the $2 development package installed.)
- AC_MSG_NOTICE( *** Please install it to include ${$1_DESCRIP} support, or re-run configure)
- AC_MSG_NOTICE( *** without explicitly specifying --with-${$1_OPTION})
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** It appears that you do not have the $2 development package installed.])
+ AC_MSG_NOTICE([*** Please install it to include ${$1_DESCRIP} support, or re-run configure])
+ AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1
fi
$1_LIB=""
@@ -82,12 +86,12 @@
PBX_$1=1
AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to indicate the ${$1_DESCRIP} library])
fi
- elif test ! -z "${$1_MANDATORY}";
+ elif test -n "${$1_MANDATORY}";
then
- AC_MSG_NOTICE(***)
- AC_MSG_NOTICE(*** The ${$1_DESCRIP} installation on this system appears to be broken.)
- AC_MSG_NOTICE(*** Either correct the installation, or run configure)
- AC_MSG_NOTICE(*** without explicitly specifying --with-${$1_OPTION})
+ AC_MSG_NOTICE([***])
+ AC_MSG_NOTICE([*** The ${$1_DESCRIP} installation on this system appears to be broken.])
+ AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+ AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1
fi
fi
@@ -142,13 +146,31 @@
AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/share/pwlib/make)
fi
PWLIB_INCDIR="/usr/local/include"
- PWLIB_LIBDIR="/usr/local/lib"
+ PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir`
+ if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
+ if test "x$LIB64" != "x"; then
+ PWLIB_LIBDIR="/usr/local/lib64"
+ else
+ PWLIB_LIBDIR="/usr/local/lib"
+ fi
+ fi
+ PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
+ PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
else
AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PWLIB=1, )
if test "${HAS_PWLIB:-unset}" != "unset" ; then
AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make)
PWLIB_INCDIR="/usr/include"
- PWLIB_LIBDIR="/usr/lib"
+ PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir`
+ if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
+ if test "x$LIB64" != "x"; then
+ PWLIB_LIBDIR="/usr/lib64"
+ else
+ PWLIB_LIBDIR="/usr/lib"
+ fi
+ fi
+ PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
+ PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
fi
fi
fi
@@ -173,12 +195,20 @@
if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/share/pwlib"
PWLIB_INCDIR="/usr/include"
- PWLIB_LIBDIR="/usr/lib"
+ if test "x$LIB64" != "x"; then
+ PWLIB_LIBDIR="/usr/lib64"
+ else
+ PWLIB_LIBDIR="/usr/lib"
+ fi
fi
if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
PWLIBDIR="/usr/local/share/pwlib"
PWLIB_INCDIR="/usr/local/include"
- PWLIB_LIBDIR="/usr/local/lib"
+ if test "x$LIB64" != "x"; then
+ PWLIB_LIBDIR="/usr/local/lib64"
+ else
+ PWLIB_LIBDIR="/usr/local/lib"
+ fi
fi
if test "${PWLIB_INCDIR:-unset}" = "unset"; then
@@ -303,13 +333,21 @@
if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="/usr/local/share/openh323"
OPENH323_INCDIR="/usr/local/include/openh323"
- OPENH323_LIBDIR="/usr/local/lib"
+ if test "x$LIB64" != "x"; then
+ OPENH323_LIBDIR="/usr/local/lib64"
+ else
+ OPENH323_LIBDIR="/usr/local/lib"
+ fi
else
AC_CHECK_FILE(/usr/include/openh323/h323.h, HAS_OPENH323=1, )
if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="/usr/share/openh323"
OPENH323_INCDIR="/usr/include/openh323"
- OPENH323_LIBDIR="/usr/lib"
+ if test "x$LIB64" != "x"; then
+ OPENH323_LIBDIR="/usr/lib64"
+ else
+ OPENH323_LIBDIR="/usr/lib"
+ fi
fi
fi
fi
@@ -323,6 +361,10 @@
if test "${OPENH323_LIBDIR:-unset}" = "unset"; then
OPENH323_LIBDIR="${OPENH323DIR}/lib"
fi
+
+ OPENH323_LIBDIR="`cd ${OPENH323_LIBDIR}; pwd`"
+ OPENH323_INCDIR="`cd ${OPENH323_INCDIR}; pwd`"
+ OPENH323DIR="`cd ${OPENH323DIR}; pwd`"
AC_SUBST([OPENH323DIR])
AC_SUBST([OPENH323_INCDIR])
@@ -359,7 +401,11 @@
saved_cppflags="${CPPFLAGS}"
saved_libs="${LIBS}"
- LIBS="${LIBS} -L${$2_LIBDIR} -l${PLATFORM_$2} $7"
+ if test "${$2_LIB:-unset}" != "unset"; then
+ LIBS="${LIBS} ${$2_LIB} $7"
+ else
+ LIBS="${LIBS} -L${$2_LIBDIR} -l${PLATFORM_$2} $7"
+ fi
CPPFLAGS="${CPPFLAGS} -I${$2_INCDIR} $6"
AC_LANG_PUSH([C++])
@@ -380,10 +426,12 @@
CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_lib_$2}" = "yes"; then
- if test "${$2_LIBDIR}" != "" -a "${$2_LIBDIR}" != "/usr/lib"; then
- $2_LIB="-L${$2_LIBDIR} -l${PLATFORM_$2}"
- else
- $2_LIB="-l${PLATFORM_$2}"
+ if test "${$2_LIB:-undef}" = "undef"; then
+ if test "${$2_LIBDIR}" != "" -a "${$2_LIBDIR}" != "/usr/lib"; then
+ $2_LIB="-L${$2_LIBDIR} -l${PLATFORM_$2}"
+ else
+ $2_LIB="-l${PLATFORM_$2}"
+ fi
fi
if test "${$2_INCDIR}" != "" -a "${$2_INCDIR}" != "/usr/include"; then
$2_INCLUDE="-I${$2_INCDIR}"
@@ -399,18 +447,25 @@
if test "${HAS_OPENH323:-unset}" != "unset"; then
AC_MSG_CHECKING(OpenH323 build option)
OPENH323_SUFFIX=
- files=`ls -l ${OPENH323_LIBDIR}/libh323_${PWLIB_PLATFORM}_*.so*`
- libfile=
- if test -n "$files"; then
- for f in $files; do
- if test -f $f -a ! -L $f; then
- libfile=`basename $f`
- break;
- fi
- done
- fi
+ prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323"
+ for pfx in $prefixes; do
+ files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null`
+ libfile=
+ if test -n "$files"; then
+ for f in $files; do
+ if test -f $f -a ! -L $f; then
+ libfile=`basename $f`
+ break;
+ fi
+ done
+ fi
+ if test -n "$libfile"; then
+ OPENH323_PREFIX=$pfx
+ break;
+ fi
+ done
if test "${libfile:-unset}" != "unset"; then
- OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/libh323_${PWLIB_PLATFORM}_\(@<:@^.@:>@*\)\..*/\1/'"`
+ OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/lib${OPENH323_PREFIX}\(@<:@^.@:>@*\)\..*/\1/'"`
fi
case "${OPENH323_SUFFIX}" in
n)
@@ -420,7 +475,21 @@
d)
OPENH323_BUILD="debug";;
*)
- OPENH323_BUILD="notrace";;
+ if test "${OPENH323_PREFIX:-undef}" = "openh323"; then
+ notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/@<:@A-Z0-9_@:>@*@<:@ @:>@*=@<:@ @:>@*//'"`
+ if test "x$notrace" = "x"; then
+ notrace="0"
+ fi
+ if test "$notrace" -ne 0; then
+ OPENH323_BUILD="notrace"
+ else
+ OPENH323_BUILD="opt"
+ fi
+ OPENH323_LIB="-l${OPENH323_PREFIX}"
+ else
+ OPENH323_BUILD="notrace"
+ fi
+ ;;
esac
AC_MSG_RESULT(${OPENH323_BUILD})
@@ -489,3 +558,382 @@
[ac_cv_func_fork_works=no],
[ac_cv_func_fork_works=cross])])]
)# _AST_FUNC_FORK
+
+# AST_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AST_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+ [AC_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])
+AC_REQUIRE([AST_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by $CC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]]* | ?:[[\\/]]*)
+ re_direlt='/[[^/]][[^/]]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
[... 42967 lines stripped ...]
More information about the asterisk-commits
mailing list