[asterisk-commits] oej: branch group/res_config_ldap r54101 - in /team/group/res_config_ldap: ./...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon Feb 12 12:11:27 MST 2007 

Author: oej
Date: Mon Feb 12 13:11:23 2007
New Revision: 54101

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54101
Log:
Resolve confligt, reset automerge

Added:
    team/group/res_config_ldap/build_tools/make_sample_voicemail
      - copied unchanged from r54067, trunk/build_tools/make_sample_voicemail
    team/group/res_config_ldap/codecs/codec_g722.c
      - copied unchanged from r54067, trunk/codecs/codec_g722.c
    team/group/res_config_ldap/codecs/g722/   (props changed)
      - copied from r54067, trunk/codecs/g722/
    team/group/res_config_ldap/codecs/g722/Makefile
      - copied unchanged from r54067, trunk/codecs/g722/Makefile
    team/group/res_config_ldap/codecs/g722/g722.h
      - copied unchanged from r54067, trunk/codecs/g722/g722.h
    team/group/res_config_ldap/codecs/g722/g722_decode.c
      - copied unchanged from r54067, trunk/codecs/g722/g722_decode.c
    team/group/res_config_ldap/codecs/g722/g722_encode.c
      - copied unchanged from r54067, trunk/codecs/g722/g722_encode.c
    team/group/res_config_ldap/codecs/g722_slin_ex.h
      - copied unchanged from r54067, trunk/codecs/g722_slin_ex.h
    team/group/res_config_ldap/codecs/slin_g722_ex.h
      - copied unchanged from r54067, trunk/codecs/slin_g722_ex.h
    team/group/res_config_ldap/doc/queue.txt
      - copied unchanged from r54067, trunk/doc/queue.txt
    team/group/res_config_ldap/doc/sla.txt
      - copied unchanged from r54067, trunk/doc/sla.txt
    team/group/res_config_ldap/doc/voicemail_odbc_postgresql.txt
      - copied unchanged from r54067, trunk/doc/voicemail_odbc_postgresql.txt
    team/group/res_config_ldap/funcs/func_shell.c
      - copied unchanged from r54067, trunk/funcs/func_shell.c
    team/group/res_config_ldap/include/asterisk/dial.h
      - copied unchanged from r54067, trunk/include/asterisk/dial.h
    team/group/res_config_ldap/include/asterisk/zapata.h
      - copied unchanged from r54067, trunk/include/asterisk/zapata.h
    team/group/res_config_ldap/main/dial.c
      - copied unchanged from r54067, trunk/main/dial.c
    team/group/res_config_ldap/main/threadstorage.c
      - copied unchanged from r54067, trunk/main/threadstorage.c
Removed:
    team/group/res_config_ldap/build_tools/mkdep
    team/group/res_config_ldap/main/coef_in.h
    team/group/res_config_ldap/main/coef_out.h
Modified:
    team/group/res_config_ldap/   (props changed)
    team/group/res_config_ldap/.cleancount
    team/group/res_config_ldap/BUGS
    team/group/res_config_ldap/CHANGES
    team/group/res_config_ldap/Makefile
    team/group/res_config_ldap/Makefile.moddir_rules
    team/group/res_config_ldap/Makefile.rules
    team/group/res_config_ldap/UPGRADE.txt
    team/group/res_config_ldap/acinclude.m4
    team/group/res_config_ldap/agi/   (props changed)
    team/group/res_config_ldap/agi/Makefile
    team/group/res_config_ldap/agi/eagi-sphinx-test.c
    team/group/res_config_ldap/agi/eagi-test.c
    team/group/res_config_ldap/apps/   (props changed)
    team/group/res_config_ldap/apps/app_adsiprog.c
    team/group/res_config_ldap/apps/app_chanisavail.c
    team/group/res_config_ldap/apps/app_chanspy.c
    team/group/res_config_ldap/apps/app_db.c
    team/group/res_config_ldap/apps/app_dial.c
    team/group/res_config_ldap/apps/app_dictate.c
    team/group/res_config_ldap/apps/app_directed_pickup.c
    team/group/res_config_ldap/apps/app_directory.c
    team/group/res_config_ldap/apps/app_disa.c
    team/group/res_config_ldap/apps/app_dumpchan.c
    team/group/res_config_ldap/apps/app_echo.c
    team/group/res_config_ldap/apps/app_externalivr.c
    team/group/res_config_ldap/apps/app_festival.c
    team/group/res_config_ldap/apps/app_flash.c
    team/group/res_config_ldap/apps/app_followme.c
    team/group/res_config_ldap/apps/app_ices.c
    team/group/res_config_ldap/apps/app_macro.c
    team/group/res_config_ldap/apps/app_meetme.c
    team/group/res_config_ldap/apps/app_mixmonitor.c
    team/group/res_config_ldap/apps/app_mp3.c
    team/group/res_config_ldap/apps/app_nbscat.c
    team/group/res_config_ldap/apps/app_osplookup.c
    team/group/res_config_ldap/apps/app_page.c
    team/group/res_config_ldap/apps/app_playback.c
    team/group/res_config_ldap/apps/app_queue.c
    team/group/res_config_ldap/apps/app_read.c
    team/group/res_config_ldap/apps/app_record.c
    team/group/res_config_ldap/apps/app_rpt.c
    team/group/res_config_ldap/apps/app_senddtmf.c
    team/group/res_config_ldap/apps/app_setcallerid.c
    team/group/res_config_ldap/apps/app_sms.c
    team/group/res_config_ldap/apps/app_speech_utils.c
    team/group/res_config_ldap/apps/app_userevent.c
    team/group/res_config_ldap/apps/app_voicemail.c
    team/group/res_config_ldap/apps/app_while.c
    team/group/res_config_ldap/apps/app_zapbarge.c
    team/group/res_config_ldap/apps/app_zapras.c
    team/group/res_config_ldap/apps/app_zapscan.c
    team/group/res_config_ldap/build_tools/cflags.xml
    team/group/res_config_ldap/build_tools/embed_modules.xml
    team/group/res_config_ldap/build_tools/get_makeopts
    team/group/res_config_ldap/build_tools/get_moduleinfo
    team/group/res_config_ldap/build_tools/menuselect-deps.in
    team/group/res_config_ldap/build_tools/prep_tarball
    team/group/res_config_ldap/cdr/   (props changed)
    team/group/res_config_ldap/cdr/cdr_manager.c
    team/group/res_config_ldap/cdr/cdr_sqlite.c
    team/group/res_config_ldap/channels/   (props changed)
    team/group/res_config_ldap/channels/Makefile
    team/group/res_config_ldap/channels/chan_agent.c
    team/group/res_config_ldap/channels/chan_alsa.c
    team/group/res_config_ldap/channels/chan_features.c
    team/group/res_config_ldap/channels/chan_gtalk.c
    team/group/res_config_ldap/channels/chan_h323.c
    team/group/res_config_ldap/channels/chan_iax2.c
    team/group/res_config_ldap/channels/chan_jingle.c
    team/group/res_config_ldap/channels/chan_local.c
    team/group/res_config_ldap/channels/chan_mgcp.c
    team/group/res_config_ldap/channels/chan_misdn.c
    team/group/res_config_ldap/channels/chan_oss.c
    team/group/res_config_ldap/channels/chan_phone.c
    team/group/res_config_ldap/channels/chan_sip.c
    team/group/res_config_ldap/channels/chan_skinny.c
    team/group/res_config_ldap/channels/chan_zap.c
    team/group/res_config_ldap/channels/h323/ast_h323.cxx
    team/group/res_config_ldap/channels/iax2-parser.c
    team/group/res_config_ldap/channels/iax2-parser.h
    team/group/res_config_ldap/channels/iax2-provision.c
    team/group/res_config_ldap/channels/iax2.h
    team/group/res_config_ldap/channels/misdn/ie.c
    team/group/res_config_ldap/channels/misdn/isdn_lib.c
    team/group/res_config_ldap/channels/misdn/isdn_lib.h
    team/group/res_config_ldap/channels/misdn/isdn_msg_parser.c
    team/group/res_config_ldap/channels/misdn_config.c
    team/group/res_config_ldap/codecs/   (props changed)
    team/group/res_config_ldap/codecs/Makefile
    team/group/res_config_ldap/codecs/codec_gsm.c
    team/group/res_config_ldap/codecs/codec_zap.c
    team/group/res_config_ldap/codecs/gsm/   (props changed)
    team/group/res_config_ldap/codecs/gsm/Makefile
    team/group/res_config_ldap/codecs/ilbc/   (props changed)
    team/group/res_config_ldap/codecs/ilbc/Makefile
    team/group/res_config_ldap/codecs/lpc10/   (props changed)
    team/group/res_config_ldap/codecs/lpc10/Makefile
    team/group/res_config_ldap/configs/extensions.conf.sample
    team/group/res_config_ldap/configs/features.conf.sample
    team/group/res_config_ldap/configs/func_odbc.conf.sample
    team/group/res_config_ldap/configs/http.conf.sample
    team/group/res_config_ldap/configs/iax.conf.sample
    team/group/res_config_ldap/configs/manager.conf.sample
    team/group/res_config_ldap/configs/misdn.conf.sample
    team/group/res_config_ldap/configs/osp.conf.sample
    team/group/res_config_ldap/configs/phone.conf.sample
    team/group/res_config_ldap/configs/say.conf.sample
    team/group/res_config_ldap/configs/sip.conf.sample
    team/group/res_config_ldap/configs/sla.conf.sample
    team/group/res_config_ldap/configs/users.conf.sample
    team/group/res_config_ldap/configs/voicemail.conf.sample
    team/group/res_config_ldap/configs/zapata.conf.sample
    team/group/res_config_ldap/configure
    team/group/res_config_ldap/configure.ac
    team/group/res_config_ldap/contrib/asterisk-ng-doxygen
    team/group/res_config_ldap/contrib/init.d/rc.suse.asterisk
    team/group/res_config_ldap/contrib/scripts/vmdb.sql
    team/group/res_config_ldap/contrib/utils/zones2indications.c
    team/group/res_config_ldap/doc/ael.txt
    team/group/res_config_ldap/doc/asterisk-conf.txt
    team/group/res_config_ldap/doc/billing.txt
    team/group/res_config_ldap/doc/cdrdriver.txt
    team/group/res_config_ldap/doc/externalivr.txt
    team/group/res_config_ldap/doc/imapstorage.txt
    team/group/res_config_ldap/doc/manager.txt
    team/group/res_config_ldap/doc/misdn.txt
    team/group/res_config_ldap/doc/osp.txt
    team/group/res_config_ldap/doc/snmp.txt
    team/group/res_config_ldap/formats/   (props changed)
    team/group/res_config_ldap/funcs/   (props changed)
    team/group/res_config_ldap/funcs/func_base64.c
    team/group/res_config_ldap/funcs/func_blacklist.c
    team/group/res_config_ldap/funcs/func_callerid.c
    team/group/res_config_ldap/funcs/func_cdr.c
    team/group/res_config_ldap/funcs/func_channel.c
    team/group/res_config_ldap/funcs/func_curl.c
    team/group/res_config_ldap/funcs/func_cut.c
    team/group/res_config_ldap/funcs/func_db.c
    team/group/res_config_ldap/funcs/func_enum.c
    team/group/res_config_ldap/funcs/func_env.c
    team/group/res_config_ldap/funcs/func_global.c
    team/group/res_config_ldap/funcs/func_groupcount.c
    team/group/res_config_ldap/funcs/func_logic.c
    team/group/res_config_ldap/funcs/func_math.c
    team/group/res_config_ldap/funcs/func_md5.c
    team/group/res_config_ldap/funcs/func_module.c
    team/group/res_config_ldap/funcs/func_odbc.c
    team/group/res_config_ldap/funcs/func_rand.c
    team/group/res_config_ldap/funcs/func_realtime.c
    team/group/res_config_ldap/funcs/func_sha1.c
    team/group/res_config_ldap/funcs/func_strings.c
    team/group/res_config_ldap/funcs/func_timeout.c
    team/group/res_config_ldap/funcs/func_uri.c
    team/group/res_config_ldap/funcs/func_version.c
    team/group/res_config_ldap/funcs/func_vmcount.c
    team/group/res_config_ldap/include/asterisk.h
    team/group/res_config_ldap/include/asterisk/acl.h
    team/group/res_config_ldap/include/asterisk/ael_structs.h
    team/group/res_config_ldap/include/asterisk/app.h
    team/group/res_config_ldap/include/asterisk/astdb.h
    team/group/res_config_ldap/include/asterisk/astmm.h
    team/group/res_config_ldap/include/asterisk/autoconfig.h.in
    team/group/res_config_ldap/include/asterisk/causes.h
    team/group/res_config_ldap/include/asterisk/cdr.h
    team/group/res_config_ldap/include/asterisk/channel.h
    team/group/res_config_ldap/include/asterisk/cli.h
    team/group/res_config_ldap/include/asterisk/config.h
    team/group/res_config_ldap/include/asterisk/devicestate.h
    team/group/res_config_ldap/include/asterisk/doxyref.h
    team/group/res_config_ldap/include/asterisk/file.h
    team/group/res_config_ldap/include/asterisk/frame.h
    team/group/res_config_ldap/include/asterisk/fskmodem.h
    team/group/res_config_ldap/include/asterisk/http.h
    team/group/res_config_ldap/include/asterisk/indications.h
    team/group/res_config_ldap/include/asterisk/jabber.h
    team/group/res_config_ldap/include/asterisk/lock.h
    team/group/res_config_ldap/include/asterisk/manager.h
    team/group/res_config_ldap/include/asterisk/options.h
    team/group/res_config_ldap/include/asterisk/pbx.h
    team/group/res_config_ldap/include/asterisk/rtp.h
    team/group/res_config_ldap/include/asterisk/smdi.h
    team/group/res_config_ldap/include/asterisk/strings.h
    team/group/res_config_ldap/include/asterisk/tdd.h
    team/group/res_config_ldap/include/asterisk/threadstorage.h
    team/group/res_config_ldap/include/asterisk/utils.h
    team/group/res_config_ldap/include/jitterbuf.h
    team/group/res_config_ldap/main/   (props changed)
    team/group/res_config_ldap/main/Makefile
    team/group/res_config_ldap/main/abstract_jb.c
    team/group/res_config_ldap/main/acl.c
    team/group/res_config_ldap/main/alaw.c
    team/group/res_config_ldap/main/app.c
    team/group/res_config_ldap/main/ast_expr2.c
    team/group/res_config_ldap/main/ast_expr2.fl
    team/group/res_config_ldap/main/ast_expr2.y
    team/group/res_config_ldap/main/ast_expr2f.c
    team/group/res_config_ldap/main/asterisk.c
    team/group/res_config_ldap/main/astmm.c
    team/group/res_config_ldap/main/autoservice.c
    team/group/res_config_ldap/main/callerid.c
    team/group/res_config_ldap/main/cdr.c
    team/group/res_config_ldap/main/channel.c
    team/group/res_config_ldap/main/cli.c
    team/group/res_config_ldap/main/config.c
    team/group/res_config_ldap/main/db.c
    team/group/res_config_ldap/main/db1-ast/   (props changed)
    team/group/res_config_ldap/main/db1-ast/Makefile
    team/group/res_config_ldap/main/db1-ast/btree/bt_close.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_conv.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_debug.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_delete.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_get.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_open.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_overflow.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_page.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_put.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_search.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_seq.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_split.c
    team/group/res_config_ldap/main/db1-ast/btree/bt_utils.c
    team/group/res_config_ldap/main/db1-ast/db/db.c
    team/group/res_config_ldap/main/db1-ast/hash/hash.c
    team/group/res_config_ldap/main/db1-ast/hash/hash_bigkey.c
    team/group/res_config_ldap/main/db1-ast/hash/hash_buf.c
    team/group/res_config_ldap/main/db1-ast/hash/hash_func.c
    team/group/res_config_ldap/main/db1-ast/hash/hash_log2.c
    team/group/res_config_ldap/main/db1-ast/hash/hash_page.c
    team/group/res_config_ldap/main/db1-ast/hash/hsearch.c
    team/group/res_config_ldap/main/db1-ast/include/ndbm.h
    team/group/res_config_ldap/main/db1-ast/mpool/mpool.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_close.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_delete.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_get.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_open.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_put.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_search.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_seq.c
    team/group/res_config_ldap/main/db1-ast/recno/rec_utils.c
    team/group/res_config_ldap/main/devicestate.c
    team/group/res_config_ldap/main/dnsmgr.c
    team/group/res_config_ldap/main/dsp.c
    team/group/res_config_ldap/main/enum.c
    team/group/res_config_ldap/main/file.c
    team/group/res_config_ldap/main/frame.c
    team/group/res_config_ldap/main/fskmodem.c
    team/group/res_config_ldap/main/http.c
    team/group/res_config_ldap/main/image.c
    team/group/res_config_ldap/main/indications.c
    team/group/res_config_ldap/main/io.c
    team/group/res_config_ldap/main/jitterbuf.c
    team/group/res_config_ldap/main/loader.c
    team/group/res_config_ldap/main/logger.c
    team/group/res_config_ldap/main/manager.c
    team/group/res_config_ldap/main/pbx.c
    team/group/res_config_ldap/main/rtp.c
    team/group/res_config_ldap/main/say.c
    team/group/res_config_ldap/main/stdtime/localtime.c
    team/group/res_config_ldap/main/tdd.c
    team/group/res_config_ldap/main/term.c
    team/group/res_config_ldap/main/translate.c
    team/group/res_config_ldap/main/udptl.c
    team/group/res_config_ldap/main/utils.c
    team/group/res_config_ldap/makeopts.in
    team/group/res_config_ldap/pbx/   (props changed)
    team/group/res_config_ldap/pbx/ael/ael.flex
    team/group/res_config_ldap/pbx/ael/ael.tab.c
    team/group/res_config_ldap/pbx/ael/ael.tab.h
    team/group/res_config_ldap/pbx/ael/ael_lex.c
    team/group/res_config_ldap/pbx/pbx_ael.c
    team/group/res_config_ldap/pbx/pbx_config.c
    team/group/res_config_ldap/pbx/pbx_dundi.c
    team/group/res_config_ldap/pbx/pbx_spool.c
    team/group/res_config_ldap/redhat/asterisk.spec
    team/group/res_config_ldap/res/   (props changed)
    team/group/res_config_ldap/res/res_adsi.c
    team/group/res_config_ldap/res/res_agi.c
    team/group/res_config_ldap/res/res_config_odbc.c
    team/group/res_config_ldap/res/res_config_pgsql.c
    team/group/res_config_ldap/res/res_convert.c
    team/group/res_config_ldap/res/res_crypto.c
    team/group/res_config_ldap/res/res_features.c
    team/group/res_config_ldap/res/res_indications.c
    team/group/res_config_ldap/res/res_jabber.c
    team/group/res_config_ldap/res/res_limit.c
    team/group/res_config_ldap/res/res_monitor.c
    team/group/res_config_ldap/res/res_musiconhold.c
    team/group/res_config_ldap/res/res_odbc.c
    team/group/res_config_ldap/res/res_realtime.c
    team/group/res_config_ldap/res/res_smdi.c
    team/group/res_config_ldap/res/res_snmp.c
    team/group/res_config_ldap/res/snmp/agent.c
    team/group/res_config_ldap/sounds/Makefile
    team/group/res_config_ldap/utils/   (props changed)
    team/group/res_config_ldap/utils/Makefile
    team/group/res_config_ldap/utils/ael_main.c
    team/group/res_config_ldap/utils/astman.c
    team/group/res_config_ldap/utils/check_expr.c
    team/group/res_config_ldap/utils/smsq.c

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/res_config_ldap/
            ('svnmerge-blocked' removed)

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 12 13:11:23 2007
@@ -1,1 +1,1 @@
-/trunk:1-47727
+/trunk:1-54068

Modified: team/group/res_config_ldap/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/.cleancount?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/.cleancount (original)
+++ team/group/res_config_ldap/.cleancount Mon Feb 12 13:11:23 2007
@@ -1,1 +1,1 @@
-25
+28

Modified: team/group/res_config_ldap/BUGS
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/BUGS?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/BUGS (original)
+++ team/group/res_config_ldap/BUGS Mon Feb 12 13:11:23 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/group/res_config_ldap/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/CHANGES?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/CHANGES (original)
+++ team/group/res_config_ldap/CHANGES Mon Feb 12 13:11:23 2007
@@ -6,11 +6,6 @@
     prompts within the Voicemail application by changing them in voicemail.conf
   * enable https support for builtin web server.
      See configs/http.conf.sample for details.
-  * add a new option, match_auth_username, to sip.conf,
-     to improve the matching of incoming requests.
-     If set, and the incoming request carries authentication info,
-     the username to match in the users list is taken from there
-     rather than from the From: field.
   * Argument support for Gosub application
   * MailboxExists converted to dialplan function
   * Ability to set process limits without restarting Asterisk
@@ -61,3 +56,27 @@
   * CID matching information is now shown when doing 'dialplan show'.
   * app_queue now has a 'loose' option which is almost exactly like 'strict' except it
      does not count paused queue members as unavailable.
+  * Added maxfiles option to options section of asterisk.conf which allows you to specify
+     what Asterisk should set as the maximum number of open files when it loads.
+  * Added the jittertargetextra configuration option.
+  * Added the URI redirect option for the built-in HTTP server
+  * Added the trunkmaxsize configuration option to chan_iax2.
+  * Added G729 passthrough support to chan_phone for Sigma Designs boards.
+  * Added the parkedcalltransfers option to features.conf
+  * Added 's' option to Page application.
+  * Added the srvlookup option to iax.conf
+  * Added 'E' and 'V' commands to ExternalIVR.
+  * Added 'DBDel' and 'DBDelTree' manager commands.
+  * Added 'core show channels count' CLI command.
+
+SIP changes
+-----------
+  * The default SIP useragent= identifier now includes the Asterisk version
+  * A new option, match_auth_username in sip.conf changes the matching of incoming requests.
+    If set, and the incoming request carries authentication info,
+    the username to match in the users list is taken from the Digest header
+    rather than from the From: field. This feature is considered experimental.
+  * The "musiconhold" and "musicclass" settings in sip.conf are now removed,
+    since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
+  * The "localmask" setting was removed in version 1.2 and the reminder about it
+    being removed is now also removed.

Modified: team/group/res_config_ldap/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/Makefile?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/Makefile (original)
+++ team/group/res_config_ldap/Makefile Mon Feb 12 13:11:23 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
@@ -66,7 +77,7 @@
 # Create OPTIONS variable
 OPTIONS=
 
-ASTTOPDIR:=$(shell pwd)
+ASTTOPDIR:=$(CURDIR)
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -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/build.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
@@ -340,19 +349,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
 
@@ -396,7 +399,6 @@
 			grep ^C update.out | cut -b4- ; \
 		fi ; \
 		rm -f update.out; \
-		$(MAKE) clean-depend; \
 	else \
 		echo "Not under version control";  \
 	fi
@@ -536,27 +538,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 )
@@ -628,14 +624,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 include/asterisk/build.h defaults.h $(SUBDIRS_DEPEND)
-
 sounds:
 	$(MAKE) -C sounds all
 
@@ -689,10 +677,10 @@
 	- 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/group/res_config_ldap/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/Makefile.moddir_rules?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/Makefile.moddir_rules (original)
+++ team/group/res_config_ldap/Makefile.moddir_rules Mon Feb 12 13:11:23 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/group/res_config_ldap/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/Makefile.rules?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/Makefile.rules (original)
+++ team/group/res_config_ldap/Makefile.rules Mon Feb 12 13:11:23 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/group/res_config_ldap/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/UPGRADE.txt?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/UPGRADE.txt (original)
+++ team/group/res_config_ldap/UPGRADE.txt Mon Feb 12 13:11:23 2007
@@ -6,3 +6,33 @@
 * The CallerID fields across Manager events have now been made more
   consistent. CallerID Number will be sent as CallerIDNum and CallerID
   Name will be sent as CallerIDName wherever used.
+
+AEL:
+
+* Macros are now implemented underneath with the Gosub() application.
+  Heaven Help You if you wrote code depending on any aspect of this!
+  Previous to 1.6, macros were implemented with the Macro() app, which
+  provided a nice feature of auto-returning. The compiler will do its
+  best to insert a Return() app call at the end of your macro if you did
+  not include it, but really, you should make sure that all execution
+  paths within your macros end in "return;".
+
+Core:
+
+* The 'languageprefix' option in asterisk.conf is now deprecated, and
+  the default sound file layout for non-English sounds is the 'new
+  style' layout introduced in Asterisk 1.4 (and used by the automatic
+  sound file installer in the Makefile).
+
+Applications:
+
+* The voicemail configuration values 'maxmessage' and 'minmessage' have
+  been changed to 'maxsecs' and 'minsecs' to clarify their purpose and
+  to make them more distinguishable from 'maxmsgs', which sets folder
+  size.  The old variables will continue to work in this version, albeit
+  with a deprecation warning.
+* ChanIsAvail() now has a 't' option, which allows the specified device
+  to be queried for state without consulting the channel drivers. This
+  performs mostly a 'ChanExists' sort of function.
+* SetCallerPres() has been replaced with the CALLERPRES() dialplan function
+  and is now deprecated.

Modified: team/group/res_config_ldap/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/acinclude.m4?view=diff&rev=54101&r1=54100&r2=54101
==============================================================================
--- team/group/res_config_ldap/acinclude.m4 (original)
+++ team/group/res_config_ldap/acinclude.m4 Mon Feb 12 13:11:23 2007
@@ -34,6 +34,7 @@
 PBX_$1=0
 AC_SUBST([$1_LIB])
 AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
 AC_SUBST([PBX_$1])
 ])
 
@@ -50,10 +51,10 @@
 		if test ${err} = "0" ; then AC_MSG_RESULT(fail) ; fi
 		AC_MSG_RESULT()
 		eval "a=\${${i}_OPTION}"
-		AC_MSG_NOTICE(***)
-		AC_MSG_NOTICE(*** The $i installation appears to be missing or broken.)
-		AC_MSG_NOTICE(*** Either correct the installation, or run configure)
-		AC_MSG_NOTICE(*** including --without-${a}.)
+		AC_MSG_NOTICE([***])
+		AC_MSG_NOTICE([*** The $i installation appears to be missing or broken.])
+		AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+		AC_MSG_NOTICE([*** including --without-${a}.])
 		err=1
 	done
 	if test $err = 1 ; then exit 1; fi
@@ -123,12 +124,15 @@
       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
@@ -196,21 +200,31 @@
           AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/share/pwlib/make)
         fi
         PWLIB_INCDIR="/usr/local/include"
-        if test "x$LIB64" != "x"; then
-          PWLIB_LIBDIR="/usr/local/lib64"
-        else
-          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"
-          if test "x$LIB64" != "x"; then
-          	PWLIB_LIBDIR="/usr/lib64"
-          else
-	        PWLIB_LIBDIR="/usr/lib"
-	      fi
+          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
@@ -402,6 +416,10 @@
     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])
   AC_SUBST([OPENH323_LIBDIR])
@@ -437,7 +455,11 @@
 
 	   saved_cppflags="${CPPFLAGS}"
 	   saved_libs="${LIBS}"

[... 59746 lines stripped ...]

More information about the asterisk-commits mailing list