[asterisk-commits] jcollie: branch jcollie/bug6082 r40755 - in /team/jcollie/bug6082: ./ apps/ b...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sun Aug 20 22:01:57 MST 2006


Author: jcollie
Date: Mon Aug 21 00:01:54 2006
New Revision: 40755

URL: http://svn.digium.com/view/asterisk?rev=40755&view=rev
Log:
Merged revisions 40722,40724-40726,40728,40751,40753 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r40722 | kpfleming | 2006-08-20 21:11:39 -0500 (Sun, 20 Aug 2006) | 8 lines

merge new_loader_completion branch, including (at least):
  - restructured build tree and makefiles to eliminate recursion problems
  - support for embedded modules
  - support for static builds
  - simpler cross-compilation support
  - simpler module/loader interface (no exported symbols)


........
r40724 | kpfleming | 2006-08-20 21:26:51 -0500 (Sun, 20 Aug 2006) | 2 lines

oops... no pattern rules for bison/flex

........
r40725 | kpfleming | 2006-08-20 21:31:01 -0500 (Sun, 20 Aug 2006) | 2 lines

main subdirectory is not dependencies for menuselect input

........
r40726 | kpfleming | 2006-08-20 21:46:47 -0500 (Sun, 20 Aug 2006) | 2 lines

could have sworn i committed this change already...

........
r40728 | kpfleming | 2006-08-20 21:54:05 -0500 (Sun, 20 Aug 2006) | 2 lines

document Makefile target changes

........
r40751 | kpfleming | 2006-08-20 22:06:41 -0500 (Sun, 20 Aug 2006) | 2 lines

don't declare these variables unless needed

........
r40753 | kpfleming | 2006-08-20 22:58:02 -0500 (Sun, 20 Aug 2006) | 2 lines

ensure that 'make' after 'svn update' that includes a configure script change won't run without making the user run configure first

........

Added:
    team/jcollie/bug6082/build_tools/embed_modules.xml
      - copied unchanged from r40753, trunk/build_tools/embed_modules.xml
    team/jcollie/bug6082/doc/asterisk.8
      - copied unchanged from r40753, trunk/doc/asterisk.8
    team/jcollie/bug6082/doc/asterisk.sgml
      - copied unchanged from r40753, trunk/doc/asterisk.sgml
    team/jcollie/bug6082/main/   (props changed)
      - copied from r40753, trunk/main/
    team/jcollie/bug6082/main/Makefile
      - copied unchanged from r40753, trunk/main/Makefile
    team/jcollie/bug6082/main/abstract_jb.c
      - copied unchanged from r40753, trunk/main/abstract_jb.c
    team/jcollie/bug6082/main/acl.c
      - copied unchanged from r40753, trunk/main/acl.c
    team/jcollie/bug6082/main/aescrypt.c
      - copied unchanged from r40753, trunk/main/aescrypt.c
    team/jcollie/bug6082/main/aeskey.c
      - copied unchanged from r40753, trunk/main/aeskey.c
    team/jcollie/bug6082/main/aesopt.h
      - copied unchanged from r40753, trunk/main/aesopt.h
    team/jcollie/bug6082/main/aestab.c
      - copied unchanged from r40753, trunk/main/aestab.c
    team/jcollie/bug6082/main/alaw.c
      - copied unchanged from r40753, trunk/main/alaw.c
    team/jcollie/bug6082/main/app.c
      - copied unchanged from r40753, trunk/main/app.c
    team/jcollie/bug6082/main/ast_expr2.c
      - copied unchanged from r40753, trunk/main/ast_expr2.c
    team/jcollie/bug6082/main/ast_expr2.fl
      - copied unchanged from r40753, trunk/main/ast_expr2.fl
    team/jcollie/bug6082/main/ast_expr2.h
      - copied unchanged from r40753, trunk/main/ast_expr2.h
    team/jcollie/bug6082/main/ast_expr2.y
      - copied unchanged from r40753, trunk/main/ast_expr2.y
    team/jcollie/bug6082/main/ast_expr2f.c
      - copied unchanged from r40753, trunk/main/ast_expr2f.c
    team/jcollie/bug6082/main/asterisk.c
      - copied unchanged from r40753, trunk/main/asterisk.c
    team/jcollie/bug6082/main/astmm.c
      - copied unchanged from r40753, trunk/main/astmm.c
    team/jcollie/bug6082/main/autoservice.c
      - copied unchanged from r40753, trunk/main/autoservice.c
    team/jcollie/bug6082/main/buildinfo.c
      - copied unchanged from r40753, trunk/main/buildinfo.c
    team/jcollie/bug6082/main/callerid.c
      - copied unchanged from r40753, trunk/main/callerid.c
    team/jcollie/bug6082/main/cdr.c
      - copied unchanged from r40753, trunk/main/cdr.c
    team/jcollie/bug6082/main/channel.c
      - copied unchanged from r40753, trunk/main/channel.c
    team/jcollie/bug6082/main/chanvars.c
      - copied unchanged from r40753, trunk/main/chanvars.c
    team/jcollie/bug6082/main/cli.c
      - copied unchanged from r40753, trunk/main/cli.c
    team/jcollie/bug6082/main/coef_in.h
      - copied unchanged from r40753, trunk/main/coef_in.h
    team/jcollie/bug6082/main/coef_out.h
      - copied unchanged from r40753, trunk/main/coef_out.h
    team/jcollie/bug6082/main/config.c
      - copied unchanged from r40753, trunk/main/config.c
    team/jcollie/bug6082/main/cryptostub.c
      - copied unchanged from r40753, trunk/main/cryptostub.c
    team/jcollie/bug6082/main/db.c
      - copied unchanged from r40753, trunk/main/db.c
    team/jcollie/bug6082/main/db1-ast/   (props changed)
      - copied from r40753, trunk/main/db1-ast/
    team/jcollie/bug6082/main/db1-ast/Makefile
      - copied unchanged from r40753, trunk/main/db1-ast/Makefile
    team/jcollie/bug6082/main/db1-ast/btree/
      - copied from r40753, trunk/main/db1-ast/btree/
    team/jcollie/bug6082/main/db1-ast/btree/bt_close.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_close.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_conv.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_conv.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_debug.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_debug.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_delete.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_delete.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_get.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_get.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_open.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_open.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_overflow.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_overflow.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_page.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_page.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_put.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_put.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_search.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_search.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_seq.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_seq.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_split.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_split.c
    team/jcollie/bug6082/main/db1-ast/btree/bt_utils.c
      - copied unchanged from r40753, trunk/main/db1-ast/btree/bt_utils.c
    team/jcollie/bug6082/main/db1-ast/btree/btree.h
      - copied unchanged from r40753, trunk/main/db1-ast/btree/btree.h
    team/jcollie/bug6082/main/db1-ast/btree/extern.h
      - copied unchanged from r40753, trunk/main/db1-ast/btree/extern.h
    team/jcollie/bug6082/main/db1-ast/db/
      - copied from r40753, trunk/main/db1-ast/db/
    team/jcollie/bug6082/main/db1-ast/db/db.c
      - copied unchanged from r40753, trunk/main/db1-ast/db/db.c
    team/jcollie/bug6082/main/db1-ast/hash/
      - copied from r40753, trunk/main/db1-ast/hash/
    team/jcollie/bug6082/main/db1-ast/hash/README
      - copied unchanged from r40753, trunk/main/db1-ast/hash/README
    team/jcollie/bug6082/main/db1-ast/hash/extern.h
      - copied unchanged from r40753, trunk/main/db1-ast/hash/extern.h
    team/jcollie/bug6082/main/db1-ast/hash/hash.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hash.c
    team/jcollie/bug6082/main/db1-ast/hash/hash.h
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hash.h
    team/jcollie/bug6082/main/db1-ast/hash/hash_bigkey.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hash_bigkey.c
    team/jcollie/bug6082/main/db1-ast/hash/hash_buf.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hash_buf.c
    team/jcollie/bug6082/main/db1-ast/hash/hash_func.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hash_func.c
    team/jcollie/bug6082/main/db1-ast/hash/hash_log2.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hash_log2.c
    team/jcollie/bug6082/main/db1-ast/hash/hash_page.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hash_page.c
    team/jcollie/bug6082/main/db1-ast/hash/hsearch.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/hsearch.c
    team/jcollie/bug6082/main/db1-ast/hash/ndbm.c
      - copied unchanged from r40753, trunk/main/db1-ast/hash/ndbm.c
    team/jcollie/bug6082/main/db1-ast/hash/page.h
      - copied unchanged from r40753, trunk/main/db1-ast/hash/page.h
    team/jcollie/bug6082/main/db1-ast/hash/search.h
      - copied unchanged from r40753, trunk/main/db1-ast/hash/search.h
    team/jcollie/bug6082/main/db1-ast/include/
      - copied from r40753, trunk/main/db1-ast/include/
    team/jcollie/bug6082/main/db1-ast/include/circ-queue.h
      - copied unchanged from r40753, trunk/main/db1-ast/include/circ-queue.h
    team/jcollie/bug6082/main/db1-ast/include/compat.h
      - copied unchanged from r40753, trunk/main/db1-ast/include/compat.h
    team/jcollie/bug6082/main/db1-ast/include/db.h
      - copied unchanged from r40753, trunk/main/db1-ast/include/db.h
    team/jcollie/bug6082/main/db1-ast/include/mpool.h
      - copied unchanged from r40753, trunk/main/db1-ast/include/mpool.h
    team/jcollie/bug6082/main/db1-ast/include/ndbm.h
      - copied unchanged from r40753, trunk/main/db1-ast/include/ndbm.h
    team/jcollie/bug6082/main/db1-ast/libdb.map
      - copied unchanged from r40753, trunk/main/db1-ast/libdb.map
    team/jcollie/bug6082/main/db1-ast/mpool/
      - copied from r40753, trunk/main/db1-ast/mpool/
    team/jcollie/bug6082/main/db1-ast/mpool/README
      - copied unchanged from r40753, trunk/main/db1-ast/mpool/README
    team/jcollie/bug6082/main/db1-ast/mpool/mpool.c
      - copied unchanged from r40753, trunk/main/db1-ast/mpool/mpool.c
    team/jcollie/bug6082/main/db1-ast/recno/
      - copied from r40753, trunk/main/db1-ast/recno/
    team/jcollie/bug6082/main/db1-ast/recno/extern.h
      - copied unchanged from r40753, trunk/main/db1-ast/recno/extern.h
    team/jcollie/bug6082/main/db1-ast/recno/rec_close.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_close.c
    team/jcollie/bug6082/main/db1-ast/recno/rec_delete.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_delete.c
    team/jcollie/bug6082/main/db1-ast/recno/rec_get.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_get.c
    team/jcollie/bug6082/main/db1-ast/recno/rec_open.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_open.c
    team/jcollie/bug6082/main/db1-ast/recno/rec_put.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_put.c
    team/jcollie/bug6082/main/db1-ast/recno/rec_search.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_search.c
    team/jcollie/bug6082/main/db1-ast/recno/rec_seq.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_seq.c
    team/jcollie/bug6082/main/db1-ast/recno/rec_utils.c
      - copied unchanged from r40753, trunk/main/db1-ast/recno/rec_utils.c
    team/jcollie/bug6082/main/db1-ast/recno/recno.h
      - copied unchanged from r40753, trunk/main/db1-ast/recno/recno.h
    team/jcollie/bug6082/main/devicestate.c
      - copied unchanged from r40753, trunk/main/devicestate.c
    team/jcollie/bug6082/main/dlfcn.c
      - copied unchanged from r40753, trunk/main/dlfcn.c
    team/jcollie/bug6082/main/dns.c
      - copied unchanged from r40753, trunk/main/dns.c
    team/jcollie/bug6082/main/dnsmgr.c
      - copied unchanged from r40753, trunk/main/dnsmgr.c
    team/jcollie/bug6082/main/dsp.c
      - copied unchanged from r40753, trunk/main/dsp.c
    team/jcollie/bug6082/main/ecdisa.h
      - copied unchanged from r40753, trunk/main/ecdisa.h
    team/jcollie/bug6082/main/editline/   (props changed)
      - copied from r40753, trunk/main/editline/
    team/jcollie/bug6082/main/editline/CHANGES
      - copied unchanged from r40753, trunk/main/editline/CHANGES
    team/jcollie/bug6082/main/editline/INSTALL
      - copied unchanged from r40753, trunk/main/editline/INSTALL
    team/jcollie/bug6082/main/editline/Makefile.in
      - copied unchanged from r40753, trunk/main/editline/Makefile.in
    team/jcollie/bug6082/main/editline/PLATFORMS
      - copied unchanged from r40753, trunk/main/editline/PLATFORMS
    team/jcollie/bug6082/main/editline/README
      - copied unchanged from r40753, trunk/main/editline/README
    team/jcollie/bug6082/main/editline/TEST/
      - copied from r40753, trunk/main/editline/TEST/
    team/jcollie/bug6082/main/editline/TEST/test.c
      - copied unchanged from r40753, trunk/main/editline/TEST/test.c
    team/jcollie/bug6082/main/editline/chared.c
      - copied unchanged from r40753, trunk/main/editline/chared.c
    team/jcollie/bug6082/main/editline/chared.h
      - copied unchanged from r40753, trunk/main/editline/chared.h
    team/jcollie/bug6082/main/editline/common.c
      - copied unchanged from r40753, trunk/main/editline/common.c
    team/jcollie/bug6082/main/editline/config.guess
      - copied unchanged from r40753, trunk/main/editline/config.guess
    team/jcollie/bug6082/main/editline/config.h.in
      - copied unchanged from r40753, trunk/main/editline/config.h.in
    team/jcollie/bug6082/main/editline/config.sub
      - copied unchanged from r40753, trunk/main/editline/config.sub
    team/jcollie/bug6082/main/editline/configure
      - copied unchanged from r40753, trunk/main/editline/configure
    team/jcollie/bug6082/main/editline/configure.in
      - copied unchanged from r40753, trunk/main/editline/configure.in
    team/jcollie/bug6082/main/editline/editline.3
      - copied unchanged from r40753, trunk/main/editline/editline.3
    team/jcollie/bug6082/main/editline/editrc.5
      - copied unchanged from r40753, trunk/main/editline/editrc.5
    team/jcollie/bug6082/main/editline/el.c
      - copied unchanged from r40753, trunk/main/editline/el.c
    team/jcollie/bug6082/main/editline/el.h
      - copied unchanged from r40753, trunk/main/editline/el.h
    team/jcollie/bug6082/main/editline/emacs.c
      - copied unchanged from r40753, trunk/main/editline/emacs.c
    team/jcollie/bug6082/main/editline/hist.c
      - copied unchanged from r40753, trunk/main/editline/hist.c
    team/jcollie/bug6082/main/editline/hist.h
      - copied unchanged from r40753, trunk/main/editline/hist.h
    team/jcollie/bug6082/main/editline/histedit.h
      - copied unchanged from r40753, trunk/main/editline/histedit.h
    team/jcollie/bug6082/main/editline/history.c
      - copied unchanged from r40753, trunk/main/editline/history.c
    team/jcollie/bug6082/main/editline/install-sh
      - copied unchanged from r40753, trunk/main/editline/install-sh
    team/jcollie/bug6082/main/editline/key.c
      - copied unchanged from r40753, trunk/main/editline/key.c
    team/jcollie/bug6082/main/editline/key.h
      - copied unchanged from r40753, trunk/main/editline/key.h
    team/jcollie/bug6082/main/editline/makelist
      - copied unchanged from r40753, trunk/main/editline/makelist
    team/jcollie/bug6082/main/editline/map.c
      - copied unchanged from r40753, trunk/main/editline/map.c
    team/jcollie/bug6082/main/editline/map.h
      - copied unchanged from r40753, trunk/main/editline/map.h
    team/jcollie/bug6082/main/editline/np/   (props changed)
      - copied from r40753, trunk/main/editline/np/
    team/jcollie/bug6082/main/editline/np/fgetln.c
      - copied unchanged from r40753, trunk/main/editline/np/fgetln.c
    team/jcollie/bug6082/main/editline/np/strlcat.c
      - copied unchanged from r40753, trunk/main/editline/np/strlcat.c
    team/jcollie/bug6082/main/editline/np/strlcpy.c
      - copied unchanged from r40753, trunk/main/editline/np/strlcpy.c
    team/jcollie/bug6082/main/editline/np/unvis.c
      - copied unchanged from r40753, trunk/main/editline/np/unvis.c
    team/jcollie/bug6082/main/editline/np/vis.c
      - copied unchanged from r40753, trunk/main/editline/np/vis.c
    team/jcollie/bug6082/main/editline/np/vis.h
      - copied unchanged from r40753, trunk/main/editline/np/vis.h
    team/jcollie/bug6082/main/editline/parse.c
      - copied unchanged from r40753, trunk/main/editline/parse.c
    team/jcollie/bug6082/main/editline/parse.h
      - copied unchanged from r40753, trunk/main/editline/parse.h
    team/jcollie/bug6082/main/editline/prompt.c
      - copied unchanged from r40753, trunk/main/editline/prompt.c
    team/jcollie/bug6082/main/editline/prompt.h
      - copied unchanged from r40753, trunk/main/editline/prompt.h
    team/jcollie/bug6082/main/editline/read.c
      - copied unchanged from r40753, trunk/main/editline/read.c
    team/jcollie/bug6082/main/editline/read.h
      - copied unchanged from r40753, trunk/main/editline/read.h
    team/jcollie/bug6082/main/editline/readline/
      - copied from r40753, trunk/main/editline/readline/
    team/jcollie/bug6082/main/editline/readline.c
      - copied unchanged from r40753, trunk/main/editline/readline.c
    team/jcollie/bug6082/main/editline/readline/readline.h
      - copied unchanged from r40753, trunk/main/editline/readline/readline.h
    team/jcollie/bug6082/main/editline/refresh.c
      - copied unchanged from r40753, trunk/main/editline/refresh.c
    team/jcollie/bug6082/main/editline/refresh.h
      - copied unchanged from r40753, trunk/main/editline/refresh.h
    team/jcollie/bug6082/main/editline/search.c
      - copied unchanged from r40753, trunk/main/editline/search.c
    team/jcollie/bug6082/main/editline/search.h
      - copied unchanged from r40753, trunk/main/editline/search.h
    team/jcollie/bug6082/main/editline/sig.c
      - copied unchanged from r40753, trunk/main/editline/sig.c
    team/jcollie/bug6082/main/editline/sig.h
      - copied unchanged from r40753, trunk/main/editline/sig.h
    team/jcollie/bug6082/main/editline/sys.h
      - copied unchanged from r40753, trunk/main/editline/sys.h
    team/jcollie/bug6082/main/editline/term.c
      - copied unchanged from r40753, trunk/main/editline/term.c
    team/jcollie/bug6082/main/editline/term.h
      - copied unchanged from r40753, trunk/main/editline/term.h
    team/jcollie/bug6082/main/editline/tokenizer.c
      - copied unchanged from r40753, trunk/main/editline/tokenizer.c
    team/jcollie/bug6082/main/editline/tokenizer.h
      - copied unchanged from r40753, trunk/main/editline/tokenizer.h
    team/jcollie/bug6082/main/editline/tty.c
      - copied unchanged from r40753, trunk/main/editline/tty.c
    team/jcollie/bug6082/main/editline/tty.h
      - copied unchanged from r40753, trunk/main/editline/tty.h
    team/jcollie/bug6082/main/editline/vi.c
      - copied unchanged from r40753, trunk/main/editline/vi.c
    team/jcollie/bug6082/main/enum.c
      - copied unchanged from r40753, trunk/main/enum.c
    team/jcollie/bug6082/main/file.c
      - copied unchanged from r40753, trunk/main/file.c
    team/jcollie/bug6082/main/fixedjitterbuf.c
      - copied unchanged from r40753, trunk/main/fixedjitterbuf.c
    team/jcollie/bug6082/main/fixedjitterbuf.h
      - copied unchanged from r40753, trunk/main/fixedjitterbuf.h
    team/jcollie/bug6082/main/frame.c
      - copied unchanged from r40753, trunk/main/frame.c
    team/jcollie/bug6082/main/fskmodem.c
      - copied unchanged from r40753, trunk/main/fskmodem.c
    team/jcollie/bug6082/main/http.c
      - copied unchanged from r40753, trunk/main/http.c
    team/jcollie/bug6082/main/image.c
      - copied unchanged from r40753, trunk/main/image.c
    team/jcollie/bug6082/main/indications.c
      - copied unchanged from r40753, trunk/main/indications.c
    team/jcollie/bug6082/main/io.c
      - copied unchanged from r40753, trunk/main/io.c
    team/jcollie/bug6082/main/jitterbuf.c
      - copied unchanged from r40753, trunk/main/jitterbuf.c
    team/jcollie/bug6082/main/jitterbuf.h
      - copied unchanged from r40753, trunk/main/jitterbuf.h
    team/jcollie/bug6082/main/loader.c
      - copied unchanged from r40753, trunk/main/loader.c
    team/jcollie/bug6082/main/logger.c
      - copied unchanged from r40753, trunk/main/logger.c
    team/jcollie/bug6082/main/manager.c
      - copied unchanged from r40753, trunk/main/manager.c
    team/jcollie/bug6082/main/md5.c
      - copied unchanged from r40753, trunk/main/md5.c
    team/jcollie/bug6082/main/netsock.c
      - copied unchanged from r40753, trunk/main/netsock.c
    team/jcollie/bug6082/main/pbx.c
      - copied unchanged from r40753, trunk/main/pbx.c
    team/jcollie/bug6082/main/plc.c
      - copied unchanged from r40753, trunk/main/plc.c
    team/jcollie/bug6082/main/poll.c
      - copied unchanged from r40753, trunk/main/poll.c
    team/jcollie/bug6082/main/privacy.c
      - copied unchanged from r40753, trunk/main/privacy.c
    team/jcollie/bug6082/main/rtp.c
      - copied unchanged from r40753, trunk/main/rtp.c
    team/jcollie/bug6082/main/say.c
      - copied unchanged from r40753, trunk/main/say.c
    team/jcollie/bug6082/main/sched.c
      - copied unchanged from r40753, trunk/main/sched.c
    team/jcollie/bug6082/main/sha1.c
      - copied unchanged from r40753, trunk/main/sha1.c
    team/jcollie/bug6082/main/slinfactory.c
      - copied unchanged from r40753, trunk/main/slinfactory.c
    team/jcollie/bug6082/main/srv.c
      - copied unchanged from r40753, trunk/main/srv.c
    team/jcollie/bug6082/main/stdtime/   (props changed)
      - copied from r40753, trunk/main/stdtime/
    team/jcollie/bug6082/main/stdtime/Makefile
      - copied unchanged from r40753, trunk/main/stdtime/Makefile
    team/jcollie/bug6082/main/stdtime/localtime.c
      - copied unchanged from r40753, trunk/main/stdtime/localtime.c
    team/jcollie/bug6082/main/stdtime/test.c
      - copied unchanged from r40753, trunk/main/stdtime/test.c
    team/jcollie/bug6082/main/stdtime/tzfile.h
      - copied unchanged from r40753, trunk/main/stdtime/tzfile.h
    team/jcollie/bug6082/main/strcompat.c
      - copied unchanged from r40753, trunk/main/strcompat.c
    team/jcollie/bug6082/main/tdd.c
      - copied unchanged from r40753, trunk/main/tdd.c
    team/jcollie/bug6082/main/term.c
      - copied unchanged from r40753, trunk/main/term.c
    team/jcollie/bug6082/main/translate.c
      - copied unchanged from r40753, trunk/main/translate.c
    team/jcollie/bug6082/main/udptl.c
      - copied unchanged from r40753, trunk/main/udptl.c
    team/jcollie/bug6082/main/ulaw.c
      - copied unchanged from r40753, trunk/main/ulaw.c
    team/jcollie/bug6082/main/utils.c
      - copied unchanged from r40753, trunk/main/utils.c
    team/jcollie/bug6082/utils/muted.c
      - copied unchanged from r40753, trunk/utils/muted.c
Removed:
    team/jcollie/bug6082/abstract_jb.c
    team/jcollie/bug6082/acl.c
    team/jcollie/bug6082/aescrypt.c
    team/jcollie/bug6082/aeskey.c
    team/jcollie/bug6082/aesopt.h
    team/jcollie/bug6082/aestab.c
    team/jcollie/bug6082/alaw.c
    team/jcollie/bug6082/app.c
    team/jcollie/bug6082/ast_expr2.c
    team/jcollie/bug6082/ast_expr2.fl
    team/jcollie/bug6082/ast_expr2.h
    team/jcollie/bug6082/ast_expr2.y
    team/jcollie/bug6082/ast_expr2f.c
    team/jcollie/bug6082/asterisk.8
    team/jcollie/bug6082/asterisk.c
    team/jcollie/bug6082/asterisk.sgml
    team/jcollie/bug6082/astmm.c
    team/jcollie/bug6082/autoservice.c
    team/jcollie/bug6082/buildinfo.c
    team/jcollie/bug6082/callerid.c
    team/jcollie/bug6082/cdr.c
    team/jcollie/bug6082/channel.c
    team/jcollie/bug6082/chanvars.c
    team/jcollie/bug6082/cli.c
    team/jcollie/bug6082/coef_in.h
    team/jcollie/bug6082/coef_out.h
    team/jcollie/bug6082/config.c
    team/jcollie/bug6082/cryptostub.c
    team/jcollie/bug6082/cygwin/
    team/jcollie/bug6082/db.c
    team/jcollie/bug6082/db1-ast/
    team/jcollie/bug6082/devicestate.c
    team/jcollie/bug6082/dlfcn.c
    team/jcollie/bug6082/dns.c
    team/jcollie/bug6082/dnsmgr.c
    team/jcollie/bug6082/dsp.c
    team/jcollie/bug6082/ecdisa.h
    team/jcollie/bug6082/editline/
    team/jcollie/bug6082/enum.c
    team/jcollie/bug6082/file.c
    team/jcollie/bug6082/fixedjitterbuf.c
    team/jcollie/bug6082/fixedjitterbuf.h
    team/jcollie/bug6082/frame.c
    team/jcollie/bug6082/fskmodem.c
    team/jcollie/bug6082/http.c
    team/jcollie/bug6082/image.c
    team/jcollie/bug6082/indications.c
    team/jcollie/bug6082/io.c
    team/jcollie/bug6082/jitterbuf.c
    team/jcollie/bug6082/jitterbuf.h
    team/jcollie/bug6082/loader.c
    team/jcollie/bug6082/logger.c
    team/jcollie/bug6082/manager.c
    team/jcollie/bug6082/md5.c
    team/jcollie/bug6082/muted.c
    team/jcollie/bug6082/netsock.c
    team/jcollie/bug6082/pbx.c
    team/jcollie/bug6082/plc.c
    team/jcollie/bug6082/poll.c
    team/jcollie/bug6082/privacy.c
    team/jcollie/bug6082/rtp.c
    team/jcollie/bug6082/say.c
    team/jcollie/bug6082/sched.c
    team/jcollie/bug6082/sha1.c
    team/jcollie/bug6082/slinfactory.c
    team/jcollie/bug6082/sounds.txt
    team/jcollie/bug6082/srv.c
    team/jcollie/bug6082/stdtime/
    team/jcollie/bug6082/strcompat.c
    team/jcollie/bug6082/tdd.c
    team/jcollie/bug6082/term.c
    team/jcollie/bug6082/translate.c
    team/jcollie/bug6082/udptl.c
    team/jcollie/bug6082/ulaw.c
    team/jcollie/bug6082/utils.c
Modified:
    team/jcollie/bug6082/   (props changed)
    team/jcollie/bug6082/.cleancount
    team/jcollie/bug6082/Makefile
    team/jcollie/bug6082/Makefile.moddir_rules
    team/jcollie/bug6082/Makefile.rules
    team/jcollie/bug6082/UPGRADE.txt
    team/jcollie/bug6082/acinclude.m4
    team/jcollie/bug6082/apps/   (props changed)
    team/jcollie/bug6082/apps/Makefile
    team/jcollie/bug6082/apps/app_adsiprog.c
    team/jcollie/bug6082/apps/app_alarmreceiver.c
    team/jcollie/bug6082/apps/app_amd.c
    team/jcollie/bug6082/apps/app_authenticate.c
    team/jcollie/bug6082/apps/app_cdr.c
    team/jcollie/bug6082/apps/app_chanisavail.c
    team/jcollie/bug6082/apps/app_channelredirect.c
    team/jcollie/bug6082/apps/app_chanspy.c
    team/jcollie/bug6082/apps/app_controlplayback.c
    team/jcollie/bug6082/apps/app_db.c
    team/jcollie/bug6082/apps/app_dial.c
    team/jcollie/bug6082/apps/app_dictate.c
    team/jcollie/bug6082/apps/app_directed_pickup.c
    team/jcollie/bug6082/apps/app_directory.c
    team/jcollie/bug6082/apps/app_disa.c
    team/jcollie/bug6082/apps/app_dumpchan.c
    team/jcollie/bug6082/apps/app_echo.c
    team/jcollie/bug6082/apps/app_exec.c
    team/jcollie/bug6082/apps/app_externalivr.c
    team/jcollie/bug6082/apps/app_festival.c
    team/jcollie/bug6082/apps/app_flash.c
    team/jcollie/bug6082/apps/app_followme.c
    team/jcollie/bug6082/apps/app_forkcdr.c
    team/jcollie/bug6082/apps/app_getcpeid.c
    team/jcollie/bug6082/apps/app_hasnewvoicemail.c
    team/jcollie/bug6082/apps/app_ices.c
    team/jcollie/bug6082/apps/app_image.c
    team/jcollie/bug6082/apps/app_ivrdemo.c
    team/jcollie/bug6082/apps/app_lookupblacklist.c
    team/jcollie/bug6082/apps/app_lookupcidname.c
    team/jcollie/bug6082/apps/app_macro.c
    team/jcollie/bug6082/apps/app_meetme.c
    team/jcollie/bug6082/apps/app_milliwatt.c
    team/jcollie/bug6082/apps/app_mixmonitor.c
    team/jcollie/bug6082/apps/app_morsecode.c
    team/jcollie/bug6082/apps/app_mp3.c
    team/jcollie/bug6082/apps/app_nbscat.c
    team/jcollie/bug6082/apps/app_osplookup.c
    team/jcollie/bug6082/apps/app_page.c
    team/jcollie/bug6082/apps/app_parkandannounce.c
    team/jcollie/bug6082/apps/app_playback.c
    team/jcollie/bug6082/apps/app_privacy.c
    team/jcollie/bug6082/apps/app_queue.c
    team/jcollie/bug6082/apps/app_random.c
    team/jcollie/bug6082/apps/app_read.c
    team/jcollie/bug6082/apps/app_readfile.c
    team/jcollie/bug6082/apps/app_realtime.c
    team/jcollie/bug6082/apps/app_record.c
    team/jcollie/bug6082/apps/app_rpt.c
    team/jcollie/bug6082/apps/app_sayunixtime.c
    team/jcollie/bug6082/apps/app_senddtmf.c
    team/jcollie/bug6082/apps/app_sendtext.c
    team/jcollie/bug6082/apps/app_setcallerid.c
    team/jcollie/bug6082/apps/app_setcdruserfield.c
    team/jcollie/bug6082/apps/app_settransfercapability.c
    team/jcollie/bug6082/apps/app_skel.c
    team/jcollie/bug6082/apps/app_sms.c
    team/jcollie/bug6082/apps/app_softhangup.c
    team/jcollie/bug6082/apps/app_speech_utils.c
    team/jcollie/bug6082/apps/app_stack.c
    team/jcollie/bug6082/apps/app_system.c
    team/jcollie/bug6082/apps/app_talkdetect.c
    team/jcollie/bug6082/apps/app_test.c
    team/jcollie/bug6082/apps/app_transfer.c
    team/jcollie/bug6082/apps/app_url.c
    team/jcollie/bug6082/apps/app_userevent.c
    team/jcollie/bug6082/apps/app_verbose.c
    team/jcollie/bug6082/apps/app_voicemail.c
    team/jcollie/bug6082/apps/app_waitforring.c
    team/jcollie/bug6082/apps/app_waitforsilence.c
    team/jcollie/bug6082/apps/app_while.c
    team/jcollie/bug6082/apps/app_zapateller.c
    team/jcollie/bug6082/apps/app_zapbarge.c
    team/jcollie/bug6082/apps/app_zapras.c
    team/jcollie/bug6082/apps/app_zapscan.c
    team/jcollie/bug6082/build_tools/cflags.xml
    team/jcollie/bug6082/build_tools/menuselect-deps.in
    team/jcollie/bug6082/build_tools/prep_moduledeps
    team/jcollie/bug6082/cdr/   (props changed)
    team/jcollie/bug6082/cdr/Makefile
    team/jcollie/bug6082/cdr/cdr_csv.c
    team/jcollie/bug6082/cdr/cdr_custom.c
    team/jcollie/bug6082/cdr/cdr_manager.c
    team/jcollie/bug6082/cdr/cdr_odbc.c
    team/jcollie/bug6082/cdr/cdr_pgsql.c
    team/jcollie/bug6082/cdr/cdr_radius.c
    team/jcollie/bug6082/cdr/cdr_sqlite.c
    team/jcollie/bug6082/cdr/cdr_tds.c
    team/jcollie/bug6082/channels/   (props changed)
    team/jcollie/bug6082/channels/Makefile
    team/jcollie/bug6082/channels/chan_agent.c
    team/jcollie/bug6082/channels/chan_alsa.c
    team/jcollie/bug6082/channels/chan_features.c
    team/jcollie/bug6082/channels/chan_h323.c
    team/jcollie/bug6082/channels/chan_iax2.c
    team/jcollie/bug6082/channels/chan_jingle.c
    team/jcollie/bug6082/channels/chan_local.c
    team/jcollie/bug6082/channels/chan_mgcp.c
    team/jcollie/bug6082/channels/chan_misdn.c
    team/jcollie/bug6082/channels/chan_nbs.c
    team/jcollie/bug6082/channels/chan_oss.c
    team/jcollie/bug6082/channels/chan_phone.c
    team/jcollie/bug6082/channels/chan_sip.c
    team/jcollie/bug6082/channels/chan_skinny.c
    team/jcollie/bug6082/channels/chan_zap.c
    team/jcollie/bug6082/channels/h323/Makefile
    team/jcollie/bug6082/channels/misdn/Makefile
    team/jcollie/bug6082/channels/misdn/ie.c
    team/jcollie/bug6082/channels/misdn/isdn_lib.c
    team/jcollie/bug6082/channels/misdn/isdn_lib.h
    team/jcollie/bug6082/channels/misdn/isdn_lib_intern.h
    team/jcollie/bug6082/channels/misdn/isdn_msg_parser.c
    team/jcollie/bug6082/codecs/   (props changed)
    team/jcollie/bug6082/codecs/Makefile
    team/jcollie/bug6082/codecs/codec_a_mu.c
    team/jcollie/bug6082/codecs/codec_adpcm.c
    team/jcollie/bug6082/codecs/codec_alaw.c
    team/jcollie/bug6082/codecs/codec_g726.c
    team/jcollie/bug6082/codecs/codec_gsm.c
    team/jcollie/bug6082/codecs/codec_ilbc.c
    team/jcollie/bug6082/codecs/codec_lpc10.c
    team/jcollie/bug6082/codecs/codec_speex.c
    team/jcollie/bug6082/codecs/codec_ulaw.c
    team/jcollie/bug6082/codecs/codec_zap.c
    team/jcollie/bug6082/codecs/gsm/Makefile
    team/jcollie/bug6082/configure
    team/jcollie/bug6082/configure.ac
    team/jcollie/bug6082/formats/   (props changed)
    team/jcollie/bug6082/formats/Makefile
    team/jcollie/bug6082/formats/format_g723.c
    team/jcollie/bug6082/formats/format_g726.c
    team/jcollie/bug6082/formats/format_g729.c
    team/jcollie/bug6082/formats/format_gsm.c
    team/jcollie/bug6082/formats/format_h263.c
    team/jcollie/bug6082/formats/format_h264.c
    team/jcollie/bug6082/formats/format_ilbc.c
    team/jcollie/bug6082/formats/format_jpeg.c
    team/jcollie/bug6082/formats/format_ogg_vorbis.c
    team/jcollie/bug6082/formats/format_pcm.c
    team/jcollie/bug6082/formats/format_sln.c
    team/jcollie/bug6082/formats/format_vox.c
    team/jcollie/bug6082/formats/format_wav.c
    team/jcollie/bug6082/formats/format_wav_gsm.c
    team/jcollie/bug6082/funcs/   (props changed)
    team/jcollie/bug6082/funcs/Makefile
    team/jcollie/bug6082/funcs/func_base64.c
    team/jcollie/bug6082/funcs/func_callerid.c
    team/jcollie/bug6082/funcs/func_cdr.c
    team/jcollie/bug6082/funcs/func_channel.c
    team/jcollie/bug6082/funcs/func_curl.c
    team/jcollie/bug6082/funcs/func_cut.c
    team/jcollie/bug6082/funcs/func_db.c
    team/jcollie/bug6082/funcs/func_enum.c
    team/jcollie/bug6082/funcs/func_env.c
    team/jcollie/bug6082/funcs/func_global.c
    team/jcollie/bug6082/funcs/func_groupcount.c
    team/jcollie/bug6082/funcs/func_language.c
    team/jcollie/bug6082/funcs/func_logic.c
    team/jcollie/bug6082/funcs/func_math.c
    team/jcollie/bug6082/funcs/func_md5.c
    team/jcollie/bug6082/funcs/func_moh.c
    team/jcollie/bug6082/funcs/func_odbc.c
    team/jcollie/bug6082/funcs/func_rand.c
    team/jcollie/bug6082/funcs/func_realtime.c
    team/jcollie/bug6082/funcs/func_sha1.c
    team/jcollie/bug6082/funcs/func_strings.c
    team/jcollie/bug6082/funcs/func_timeout.c
    team/jcollie/bug6082/funcs/func_uri.c
    team/jcollie/bug6082/include/asterisk.h
    team/jcollie/bug6082/include/asterisk/abstract_jb.h
    team/jcollie/bug6082/include/asterisk/autoconfig.h.in
    team/jcollie/bug6082/include/asterisk/cdr.h
    team/jcollie/bug6082/include/asterisk/compiler.h
    team/jcollie/bug6082/include/asterisk/dns.h
    team/jcollie/bug6082/include/asterisk/file.h
    team/jcollie/bug6082/include/asterisk/indications.h
    team/jcollie/bug6082/include/asterisk/linkedlists.h
    team/jcollie/bug6082/include/asterisk/lock.h
    team/jcollie/bug6082/include/asterisk/module.h
    team/jcollie/bug6082/include/asterisk/monitor.h
    team/jcollie/bug6082/include/asterisk/srv.h
    team/jcollie/bug6082/include/asterisk/translate.h
    team/jcollie/bug6082/include/asterisk/utils.h
    team/jcollie/bug6082/makeopts.in
    team/jcollie/bug6082/pbx/   (props changed)
    team/jcollie/bug6082/pbx/Makefile
    team/jcollie/bug6082/pbx/pbx_ael.c
    team/jcollie/bug6082/pbx/pbx_config.c
    team/jcollie/bug6082/pbx/pbx_dundi.c
    team/jcollie/bug6082/pbx/pbx_loopback.c
    team/jcollie/bug6082/pbx/pbx_realtime.c
    team/jcollie/bug6082/pbx/pbx_spool.c
    team/jcollie/bug6082/res/   (props changed)
    team/jcollie/bug6082/res/Makefile
    team/jcollie/bug6082/res/res_adsi.c
    team/jcollie/bug6082/res/res_agi.c
    team/jcollie/bug6082/res/res_clioriginate.c
    team/jcollie/bug6082/res/res_config_odbc.c
    team/jcollie/bug6082/res/res_config_pgsql.c
    team/jcollie/bug6082/res/res_convert.c
    team/jcollie/bug6082/res/res_crypto.c
    team/jcollie/bug6082/res/res_features.c
    team/jcollie/bug6082/res/res_indications.c
    team/jcollie/bug6082/res/res_jabber.c
    team/jcollie/bug6082/res/res_monitor.c
    team/jcollie/bug6082/res/res_musiconhold.c
    team/jcollie/bug6082/res/res_odbc.c
    team/jcollie/bug6082/res/res_smdi.c
    team/jcollie/bug6082/res/res_snmp.c
    team/jcollie/bug6082/res/res_speech.c
    team/jcollie/bug6082/sounds/Makefile
    team/jcollie/bug6082/utils/Makefile
    team/jcollie/bug6082/utils/ael_main.c

Propchange: team/jcollie/bug6082/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/jcollie/bug6082/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Mon Aug 21 00:01:54 2006
@@ -1,1 +1,1 @@
-jeff at ocjtech.us
+kpfleming at digium.com

Propchange: team/jcollie/bug6082/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 21 00:01:54 2006
@@ -19,6 +19,7 @@
 menuselect.makedeps
 config.status
 config.log
-makeopts.xml
+menuselect-tree
 autom4te.cache
 muted
+makeopts.embed_rules

Propchange: team/jcollie/bug6082/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 21 00:01:54 2006
@@ -1,1 +1,1 @@
-/trunk:1-40700
+/trunk:1-40754

Modified: team/jcollie/bug6082/.cleancount
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/.cleancount?rev=40755&r1=40754&r2=40755&view=diff
==============================================================================
--- team/jcollie/bug6082/.cleancount (original)
+++ team/jcollie/bug6082/.cleancount Mon Aug 21 00:01:54 2006
@@ -1,1 +1,1 @@
-21
+22

Modified: team/jcollie/bug6082/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug6082/Makefile?rev=40755&r1=40754&r2=40755&view=diff
==============================================================================
--- team/jcollie/bug6082/Makefile (original)
+++ team/jcollie/bug6082/Makefile Mon Aug 21 00:01:54 2006
@@ -22,32 +22,15 @@
 
 .EXPORT_ALL_VARIABLES:
 
+include makeopts
+
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
 
 # Create OPTIONS variable
 OPTIONS=
 
-# If cross compiling, define these to suit
-#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
-#CROSS_ARCH=Linux
-#CROSS_PROC=arm
-#SUB_PROC=xscale # or maverick
-
-ifeq ($(CROSS_COMPILE),)
-  OSARCH:=$(shell uname -s)
-  PROC?:=$(shell uname -m)
-else
-  OSARCH=$(CROSS_ARCH)
-  PROC=$(CROSS_PROC)
-endif
-
 ASTTOPDIR:=$(shell pwd)
-
-# Remember the MAKELEVEL at the top
-MAKETOPLEVEL?=$(MAKELEVEL)
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -60,20 +43,7 @@
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
 # !!! Watch out, put no spaces or comments after the value !!!
-DESTDIR?=
 #DESTDIR?=/tmp/asterisk
-
-# Original busydetect routine
-#BUSYDETECT = -DBUSYDETECT
-
-# Improved busydetect routine, comment the previous one if you use this one
-#BUSYDETECT+= -DBUSYDETECT_MARTIN 
-# Detect the busy signal looking only at tone lengths
-# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
-#BUSYDETECT+= -DBUSYDETECT_TONEONLY
-# Enforce the detection of busy signal (get rid of false hangups)
-# Don't use together with -DBUSYDETECT_TONEONLY
-#BUSYDETECT+= -DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
 # Define standard directories for various platforms
 # These apply if they are not redefined in asterisk.conf 
@@ -131,59 +101,10 @@
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
-  include menuselect.makeopts
-  include menuselect.makedeps
- 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 ($(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
-

[... 21576 lines stripped ...]


More information about the asterisk-commits mailing list