[svn-commits] branch oej/securertp-trunk r32989 - in
/team/oej/securertp-trunk: ./ apps/ bu...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Jun 8 01:06:21 MST 2006
Author: oej
Date: Thu Jun 8 03:06:18 2006
New Revision: 32989
URL: http://svn.digium.com/view/asterisk?rev=32989&view=rev
Log:
Update to trunk
Added:
team/oej/securertp-trunk/include/asterisk/autoconfig.h.in
- copied unchanged from r32953, trunk/include/asterisk/autoconfig.h.in
team/oej/securertp-trunk/sounds/Makefile
- copied unchanged from r32953, trunk/sounds/Makefile
team/oej/securertp-trunk/sounds/sounds.xml
- copied unchanged from r32953, trunk/sounds/sounds.xml
Removed:
team/oej/securertp-trunk/build_tools/sounds.xml
team/oej/securertp-trunk/include/autoconfig.h.in
team/oej/securertp-trunk/sounds/agent-alreadyon.gsm
team/oej/securertp-trunk/sounds/agent-incorrect.gsm
team/oej/securertp-trunk/sounds/agent-loggedoff.gsm
team/oej/securertp-trunk/sounds/agent-loginok.gsm
team/oej/securertp-trunk/sounds/agent-newlocation.gsm
team/oej/securertp-trunk/sounds/agent-pass.gsm
team/oej/securertp-trunk/sounds/agent-user.gsm
team/oej/securertp-trunk/sounds/auth-incorrect.gsm
team/oej/securertp-trunk/sounds/auth-thankyou.gsm
team/oej/securertp-trunk/sounds/beep.gsm
team/oej/securertp-trunk/sounds/beeperr.gsm
team/oej/securertp-trunk/sounds/conf-adminmenu.gsm
team/oej/securertp-trunk/sounds/conf-enteringno.gsm
team/oej/securertp-trunk/sounds/conf-errormenu.gsm
team/oej/securertp-trunk/sounds/conf-getchannel.gsm
team/oej/securertp-trunk/sounds/conf-getconfno.gsm
team/oej/securertp-trunk/sounds/conf-getpin.gsm
team/oej/securertp-trunk/sounds/conf-hasjoin.gsm
team/oej/securertp-trunk/sounds/conf-hasleft.gsm
team/oej/securertp-trunk/sounds/conf-invalid.gsm
team/oej/securertp-trunk/sounds/conf-invalidpin.gsm
team/oej/securertp-trunk/sounds/conf-kicked.gsm
team/oej/securertp-trunk/sounds/conf-leaderhasleft.gsm
team/oej/securertp-trunk/sounds/conf-locked.gsm
team/oej/securertp-trunk/sounds/conf-lockednow.gsm
team/oej/securertp-trunk/sounds/conf-muted.gsm
team/oej/securertp-trunk/sounds/conf-noempty.gsm
team/oej/securertp-trunk/sounds/conf-onlyone.gsm
team/oej/securertp-trunk/sounds/conf-onlyperson.gsm
team/oej/securertp-trunk/sounds/conf-otherinparty.gsm
team/oej/securertp-trunk/sounds/conf-placeintoconf.gsm
team/oej/securertp-trunk/sounds/conf-thereare.gsm
team/oej/securertp-trunk/sounds/conf-unlockednow.gsm
team/oej/securertp-trunk/sounds/conf-unmuted.gsm
team/oej/securertp-trunk/sounds/conf-usermenu.gsm
team/oej/securertp-trunk/sounds/conf-userswilljoin.gsm
team/oej/securertp-trunk/sounds/conf-userwilljoin.gsm
team/oej/securertp-trunk/sounds/conf-waitforleader.gsm
team/oej/securertp-trunk/sounds/demo-abouttotry.gsm
team/oej/securertp-trunk/sounds/demo-congrats.gsm
team/oej/securertp-trunk/sounds/demo-echodone.gsm
team/oej/securertp-trunk/sounds/demo-echotest.gsm
team/oej/securertp-trunk/sounds/demo-enterkeywords.gsm
team/oej/securertp-trunk/sounds/demo-instruct.gsm
team/oej/securertp-trunk/sounds/demo-moreinfo.gsm
team/oej/securertp-trunk/sounds/demo-nogo.gsm
team/oej/securertp-trunk/sounds/demo-nomatch.gsm
team/oej/securertp-trunk/sounds/demo-thanks.gsm
team/oej/securertp-trunk/sounds/dictate/
team/oej/securertp-trunk/sounds/digits/
team/oej/securertp-trunk/sounds/dir-instr.gsm
team/oej/securertp-trunk/sounds/dir-intro-fn.gsm
team/oej/securertp-trunk/sounds/dir-intro.gsm
team/oej/securertp-trunk/sounds/dir-nomatch.gsm
team/oej/securertp-trunk/sounds/dir-nomore.gsm
team/oej/securertp-trunk/sounds/fpm-calm-river.mp3
team/oej/securertp-trunk/sounds/fpm-sunshine.mp3
team/oej/securertp-trunk/sounds/fpm-world-mix.mp3
team/oej/securertp-trunk/sounds/hello-world.gsm
team/oej/securertp-trunk/sounds/hours.gsm
team/oej/securertp-trunk/sounds/invalid.gsm
team/oej/securertp-trunk/sounds/letters/
team/oej/securertp-trunk/sounds/minutes.gsm
team/oej/securertp-trunk/sounds/pbx-invalid.gsm
team/oej/securertp-trunk/sounds/pbx-invalidpark.gsm
team/oej/securertp-trunk/sounds/pbx-transfer.gsm
team/oej/securertp-trunk/sounds/phonetic/
team/oej/securertp-trunk/sounds/priv-callee-options.gsm
team/oej/securertp-trunk/sounds/priv-callpending.gsm
team/oej/securertp-trunk/sounds/priv-introsaved.gsm
team/oej/securertp-trunk/sounds/priv-recordintro.gsm
team/oej/securertp-trunk/sounds/privacy-incorrect.gsm
team/oej/securertp-trunk/sounds/privacy-prompt.gsm
team/oej/securertp-trunk/sounds/privacy-thankyou.gsm
team/oej/securertp-trunk/sounds/privacy-unident.gsm
team/oej/securertp-trunk/sounds/queue-callswaiting.gsm
team/oej/securertp-trunk/sounds/queue-holdtime.gsm
team/oej/securertp-trunk/sounds/queue-less-than.gsm
team/oej/securertp-trunk/sounds/queue-minutes.gsm
team/oej/securertp-trunk/sounds/queue-periodic-announce.gsm
team/oej/securertp-trunk/sounds/queue-reporthold.gsm
team/oej/securertp-trunk/sounds/queue-seconds.gsm
team/oej/securertp-trunk/sounds/queue-thankyou.gsm
team/oej/securertp-trunk/sounds/queue-thereare.gsm
team/oej/securertp-trunk/sounds/queue-youarenext.gsm
team/oej/securertp-trunk/sounds/screen-callee-options.gsm
team/oej/securertp-trunk/sounds/seconds.gsm
team/oej/securertp-trunk/sounds/spy-agent.gsm
team/oej/securertp-trunk/sounds/spy-h323.gsm
team/oej/securertp-trunk/sounds/spy-iax.gsm
team/oej/securertp-trunk/sounds/spy-iax2.gsm
team/oej/securertp-trunk/sounds/spy-mgcp.gsm
team/oej/securertp-trunk/sounds/spy-sip.gsm
team/oej/securertp-trunk/sounds/spy-skinny.gsm
team/oej/securertp-trunk/sounds/spy-zap.gsm
team/oej/securertp-trunk/sounds/ss-noservice.gsm
team/oej/securertp-trunk/sounds/transfer.gsm
team/oej/securertp-trunk/sounds/tt-allbusy.gsm
team/oej/securertp-trunk/sounds/tt-monkeys.gsm
team/oej/securertp-trunk/sounds/tt-monkeysintro.gsm
team/oej/securertp-trunk/sounds/tt-somethingwrong.gsm
team/oej/securertp-trunk/sounds/tt-weasels.gsm
team/oej/securertp-trunk/sounds/vm-Cust1.gsm
team/oej/securertp-trunk/sounds/vm-Cust2.gsm
team/oej/securertp-trunk/sounds/vm-Cust3.gsm
team/oej/securertp-trunk/sounds/vm-Cust4.gsm
team/oej/securertp-trunk/sounds/vm-Cust5.gsm
team/oej/securertp-trunk/sounds/vm-Family.gsm
team/oej/securertp-trunk/sounds/vm-Friends.gsm
team/oej/securertp-trunk/sounds/vm-INBOX.gsm
team/oej/securertp-trunk/sounds/vm-Old.gsm
team/oej/securertp-trunk/sounds/vm-Work.gsm
team/oej/securertp-trunk/sounds/vm-advopts.gsm
team/oej/securertp-trunk/sounds/vm-and.gsm
team/oej/securertp-trunk/sounds/vm-calldiffnum.gsm
team/oej/securertp-trunk/sounds/vm-changeto.gsm
team/oej/securertp-trunk/sounds/vm-delete.gsm
team/oej/securertp-trunk/sounds/vm-deleted.gsm
team/oej/securertp-trunk/sounds/vm-dialout.gsm
team/oej/securertp-trunk/sounds/vm-enter-num-to-call.gsm
team/oej/securertp-trunk/sounds/vm-extension.gsm
team/oej/securertp-trunk/sounds/vm-first.gsm
team/oej/securertp-trunk/sounds/vm-for.gsm
team/oej/securertp-trunk/sounds/vm-forward.gsm
team/oej/securertp-trunk/sounds/vm-forwardoptions.gsm
team/oej/securertp-trunk/sounds/vm-from-extension.gsm
team/oej/securertp-trunk/sounds/vm-from-phonenumber.gsm
team/oej/securertp-trunk/sounds/vm-from.gsm
team/oej/securertp-trunk/sounds/vm-goodbye.gsm
team/oej/securertp-trunk/sounds/vm-helpexit.gsm
team/oej/securertp-trunk/sounds/vm-incorrect-mailbox.gsm
team/oej/securertp-trunk/sounds/vm-incorrect.gsm
team/oej/securertp-trunk/sounds/vm-instructions.gsm
team/oej/securertp-trunk/sounds/vm-intro.gsm
team/oej/securertp-trunk/sounds/vm-isonphone.gsm
team/oej/securertp-trunk/sounds/vm-isunavail.gsm
team/oej/securertp-trunk/sounds/vm-last.gsm
team/oej/securertp-trunk/sounds/vm-leavemsg.gsm
team/oej/securertp-trunk/sounds/vm-login.gsm
team/oej/securertp-trunk/sounds/vm-mailboxfull.gsm
team/oej/securertp-trunk/sounds/vm-message.gsm
team/oej/securertp-trunk/sounds/vm-messages.gsm
team/oej/securertp-trunk/sounds/vm-minutes.gsm
team/oej/securertp-trunk/sounds/vm-mismatch.gsm
team/oej/securertp-trunk/sounds/vm-msginstruct.gsm
team/oej/securertp-trunk/sounds/vm-msgsaved.gsm
team/oej/securertp-trunk/sounds/vm-newpassword.gsm
team/oej/securertp-trunk/sounds/vm-newuser.gsm
team/oej/securertp-trunk/sounds/vm-next.gsm
team/oej/securertp-trunk/sounds/vm-no.gsm
team/oej/securertp-trunk/sounds/vm-nobodyavail.gsm
team/oej/securertp-trunk/sounds/vm-nobox.gsm
team/oej/securertp-trunk/sounds/vm-nomore.gsm
team/oej/securertp-trunk/sounds/vm-nonumber.gsm
team/oej/securertp-trunk/sounds/vm-num-i-have.gsm
team/oej/securertp-trunk/sounds/vm-onefor.gsm
team/oej/securertp-trunk/sounds/vm-options.gsm
team/oej/securertp-trunk/sounds/vm-opts.gsm
team/oej/securertp-trunk/sounds/vm-passchanged.gsm
team/oej/securertp-trunk/sounds/vm-password.gsm
team/oej/securertp-trunk/sounds/vm-press.gsm
team/oej/securertp-trunk/sounds/vm-prev.gsm
team/oej/securertp-trunk/sounds/vm-reachoper.gsm
team/oej/securertp-trunk/sounds/vm-rec-busy.gsm
team/oej/securertp-trunk/sounds/vm-rec-name.gsm
team/oej/securertp-trunk/sounds/vm-rec-temp.gsm
team/oej/securertp-trunk/sounds/vm-rec-unv.gsm
team/oej/securertp-trunk/sounds/vm-received.gsm
team/oej/securertp-trunk/sounds/vm-reenterpassword.gsm
team/oej/securertp-trunk/sounds/vm-repeat.gsm
team/oej/securertp-trunk/sounds/vm-review.gsm
team/oej/securertp-trunk/sounds/vm-saved.gsm
team/oej/securertp-trunk/sounds/vm-savedto.gsm
team/oej/securertp-trunk/sounds/vm-savefolder.gsm
team/oej/securertp-trunk/sounds/vm-savemessage.gsm
team/oej/securertp-trunk/sounds/vm-saveoper.gsm
team/oej/securertp-trunk/sounds/vm-sorry.gsm
team/oej/securertp-trunk/sounds/vm-star-cancel.gsm
team/oej/securertp-trunk/sounds/vm-starmain.gsm
team/oej/securertp-trunk/sounds/vm-tempgreetactive.gsm
team/oej/securertp-trunk/sounds/vm-tempgreeting.gsm
team/oej/securertp-trunk/sounds/vm-tempgreeting2.gsm
team/oej/securertp-trunk/sounds/vm-tempremoved.gsm
team/oej/securertp-trunk/sounds/vm-then-pound.gsm
team/oej/securertp-trunk/sounds/vm-theperson.gsm
team/oej/securertp-trunk/sounds/vm-tocallback.gsm
team/oej/securertp-trunk/sounds/vm-tocallnum.gsm
team/oej/securertp-trunk/sounds/vm-tocancel.gsm
team/oej/securertp-trunk/sounds/vm-tocancelmsg.gsm
team/oej/securertp-trunk/sounds/vm-toenternumber.gsm
team/oej/securertp-trunk/sounds/vm-toforward.gsm
team/oej/securertp-trunk/sounds/vm-tohearenv.gsm
team/oej/securertp-trunk/sounds/vm-tomakecall.gsm
team/oej/securertp-trunk/sounds/vm-tooshort.gsm
team/oej/securertp-trunk/sounds/vm-toreply.gsm
team/oej/securertp-trunk/sounds/vm-torerecord.gsm
team/oej/securertp-trunk/sounds/vm-undelete.gsm
team/oej/securertp-trunk/sounds/vm-undeleted.gsm
team/oej/securertp-trunk/sounds/vm-unknown-caller.gsm
team/oej/securertp-trunk/sounds/vm-whichbox.gsm
team/oej/securertp-trunk/sounds/vm-youhave.gsm
Modified:
team/oej/securertp-trunk/ (props changed)
team/oej/securertp-trunk/Makefile
team/oej/securertp-trunk/abstract_jb.c
team/oej/securertp-trunk/acl.c
team/oej/securertp-trunk/aclocal.m4
team/oej/securertp-trunk/app.c
team/oej/securertp-trunk/apps/Makefile
team/oej/securertp-trunk/apps/app_adsiprog.c
team/oej/securertp-trunk/apps/app_alarmreceiver.c
team/oej/securertp-trunk/apps/app_amd.c
team/oej/securertp-trunk/apps/app_authenticate.c
team/oej/securertp-trunk/apps/app_cdr.c
team/oej/securertp-trunk/apps/app_chanisavail.c
team/oej/securertp-trunk/apps/app_channelredirect.c
team/oej/securertp-trunk/apps/app_chanspy.c
team/oej/securertp-trunk/apps/app_controlplayback.c
team/oej/securertp-trunk/apps/app_db.c
team/oej/securertp-trunk/apps/app_dial.c
team/oej/securertp-trunk/apps/app_dictate.c
team/oej/securertp-trunk/apps/app_directed_pickup.c
team/oej/securertp-trunk/apps/app_directory.c
team/oej/securertp-trunk/apps/app_disa.c
team/oej/securertp-trunk/apps/app_dumpchan.c
team/oej/securertp-trunk/apps/app_echo.c
team/oej/securertp-trunk/apps/app_exec.c
team/oej/securertp-trunk/apps/app_externalivr.c
team/oej/securertp-trunk/apps/app_festival.c
team/oej/securertp-trunk/apps/app_flash.c
team/oej/securertp-trunk/apps/app_followme.c
team/oej/securertp-trunk/apps/app_forkcdr.c
team/oej/securertp-trunk/apps/app_getcpeid.c
team/oej/securertp-trunk/apps/app_hasnewvoicemail.c
team/oej/securertp-trunk/apps/app_ices.c
team/oej/securertp-trunk/apps/app_image.c
team/oej/securertp-trunk/apps/app_ivrdemo.c
team/oej/securertp-trunk/apps/app_lookupblacklist.c
team/oej/securertp-trunk/apps/app_lookupcidname.c
team/oej/securertp-trunk/apps/app_macro.c
team/oej/securertp-trunk/apps/app_meetme.c
team/oej/securertp-trunk/apps/app_milliwatt.c
team/oej/securertp-trunk/apps/app_mixmonitor.c
team/oej/securertp-trunk/apps/app_morsecode.c
team/oej/securertp-trunk/apps/app_mp3.c
team/oej/securertp-trunk/apps/app_nbscat.c
team/oej/securertp-trunk/apps/app_osplookup.c
team/oej/securertp-trunk/apps/app_page.c
team/oej/securertp-trunk/apps/app_parkandannounce.c
team/oej/securertp-trunk/apps/app_playback.c
team/oej/securertp-trunk/apps/app_privacy.c
team/oej/securertp-trunk/apps/app_queue.c
team/oej/securertp-trunk/apps/app_random.c
team/oej/securertp-trunk/apps/app_read.c
team/oej/securertp-trunk/apps/app_readfile.c
team/oej/securertp-trunk/apps/app_realtime.c
team/oej/securertp-trunk/apps/app_record.c
team/oej/securertp-trunk/apps/app_sayunixtime.c
team/oej/securertp-trunk/apps/app_senddtmf.c
team/oej/securertp-trunk/apps/app_sendtext.c
team/oej/securertp-trunk/apps/app_setcallerid.c
team/oej/securertp-trunk/apps/app_setcdruserfield.c
team/oej/securertp-trunk/apps/app_settransfercapability.c
team/oej/securertp-trunk/apps/app_skel.c
team/oej/securertp-trunk/apps/app_sms.c
team/oej/securertp-trunk/apps/app_softhangup.c
team/oej/securertp-trunk/apps/app_speech_utils.c
team/oej/securertp-trunk/apps/app_stack.c
team/oej/securertp-trunk/apps/app_system.c
team/oej/securertp-trunk/apps/app_talkdetect.c
team/oej/securertp-trunk/apps/app_test.c
team/oej/securertp-trunk/apps/app_transfer.c
team/oej/securertp-trunk/apps/app_url.c
team/oej/securertp-trunk/apps/app_userevent.c
team/oej/securertp-trunk/apps/app_verbose.c
team/oej/securertp-trunk/apps/app_voicemail.c
team/oej/securertp-trunk/apps/app_waitforring.c
team/oej/securertp-trunk/apps/app_waitforsilence.c
team/oej/securertp-trunk/apps/app_while.c
team/oej/securertp-trunk/apps/app_zapateller.c
team/oej/securertp-trunk/apps/app_zapbarge.c
team/oej/securertp-trunk/apps/app_zapras.c
team/oej/securertp-trunk/apps/app_zapscan.c
team/oej/securertp-trunk/ast_expr2.c
team/oej/securertp-trunk/ast_expr2.fl
team/oej/securertp-trunk/ast_expr2.y
team/oej/securertp-trunk/ast_expr2f.c
team/oej/securertp-trunk/asterisk.c
team/oej/securertp-trunk/astmm.c
team/oej/securertp-trunk/autoservice.c
team/oej/securertp-trunk/build_tools/cflags.xml
team/oej/securertp-trunk/build_tools/menuselect.c
team/oej/securertp-trunk/build_tools/menuselect_curses.c
team/oej/securertp-trunk/build_tools/prep_moduledeps
team/oej/securertp-trunk/callerid.c
team/oej/securertp-trunk/cdr.c
team/oej/securertp-trunk/cdr/Makefile
team/oej/securertp-trunk/cdr/cdr_csv.c
team/oej/securertp-trunk/cdr/cdr_custom.c
team/oej/securertp-trunk/cdr/cdr_manager.c
team/oej/securertp-trunk/cdr/cdr_odbc.c
team/oej/securertp-trunk/cdr/cdr_pgsql.c
team/oej/securertp-trunk/cdr/cdr_radius.c
team/oej/securertp-trunk/cdr/cdr_sqlite.c
team/oej/securertp-trunk/cdr/cdr_tds.c
team/oej/securertp-trunk/channel.c
team/oej/securertp-trunk/channels/Makefile
team/oej/securertp-trunk/channels/chan_agent.c
team/oej/securertp-trunk/channels/chan_alsa.c
team/oej/securertp-trunk/channels/chan_features.c
team/oej/securertp-trunk/channels/chan_h323.c
team/oej/securertp-trunk/channels/chan_iax2.c
team/oej/securertp-trunk/channels/chan_jingle.c
team/oej/securertp-trunk/channels/chan_local.c
team/oej/securertp-trunk/channels/chan_mgcp.c
team/oej/securertp-trunk/channels/chan_misdn.c
team/oej/securertp-trunk/channels/chan_nbs.c
team/oej/securertp-trunk/channels/chan_oss.c
team/oej/securertp-trunk/channels/chan_phone.c
team/oej/securertp-trunk/channels/chan_sip.c
team/oej/securertp-trunk/channels/chan_skinny.c
team/oej/securertp-trunk/channels/chan_vpb.c
team/oej/securertp-trunk/channels/chan_zap.c
team/oej/securertp-trunk/channels/iax2-parser.c
team/oej/securertp-trunk/channels/iax2-provision.c
team/oej/securertp-trunk/channels/misdn/isdn_lib.c
team/oej/securertp-trunk/channels/misdn_config.c
team/oej/securertp-trunk/chanvars.c
team/oej/securertp-trunk/cli.c
team/oej/securertp-trunk/codecs/Makefile
team/oej/securertp-trunk/codecs/codec_a_mu.c
team/oej/securertp-trunk/codecs/codec_adpcm.c
team/oej/securertp-trunk/codecs/codec_alaw.c
team/oej/securertp-trunk/codecs/codec_g723_1.c
team/oej/securertp-trunk/codecs/codec_g726.c
team/oej/securertp-trunk/codecs/codec_gsm.c
team/oej/securertp-trunk/codecs/codec_ilbc.c
team/oej/securertp-trunk/codecs/codec_lpc10.c
team/oej/securertp-trunk/codecs/codec_speex.c
team/oej/securertp-trunk/codecs/codec_ulaw.c
team/oej/securertp-trunk/config.c
team/oej/securertp-trunk/configs/jabber.conf.sample
team/oej/securertp-trunk/configs/musiconhold.conf.sample
team/oej/securertp-trunk/configure
team/oej/securertp-trunk/configure.ac
team/oej/securertp-trunk/cryptostub.c
team/oej/securertp-trunk/db.c
team/oej/securertp-trunk/devicestate.c
team/oej/securertp-trunk/dns.c
team/oej/securertp-trunk/dnsmgr.c
team/oej/securertp-trunk/doc/smdi.txt
team/oej/securertp-trunk/dsp.c
team/oej/securertp-trunk/enum.c
team/oej/securertp-trunk/file.c
team/oej/securertp-trunk/fixedjitterbuf.c
team/oej/securertp-trunk/formats/Makefile
team/oej/securertp-trunk/formats/format_g723.c
team/oej/securertp-trunk/formats/format_g726.c
team/oej/securertp-trunk/formats/format_g729.c
team/oej/securertp-trunk/formats/format_gsm.c
team/oej/securertp-trunk/formats/format_h263.c
team/oej/securertp-trunk/formats/format_h264.c
team/oej/securertp-trunk/formats/format_ilbc.c
team/oej/securertp-trunk/formats/format_jpeg.c
team/oej/securertp-trunk/formats/format_ogg_vorbis.c
team/oej/securertp-trunk/formats/format_pcm.c
team/oej/securertp-trunk/formats/format_sln.c
team/oej/securertp-trunk/formats/format_vox.c
team/oej/securertp-trunk/formats/format_wav.c
team/oej/securertp-trunk/formats/format_wav_gsm.c
team/oej/securertp-trunk/frame.c
team/oej/securertp-trunk/fskmodem.c
team/oej/securertp-trunk/funcs/Makefile
team/oej/securertp-trunk/funcs/func_base64.c
team/oej/securertp-trunk/funcs/func_callerid.c
team/oej/securertp-trunk/funcs/func_cdr.c
team/oej/securertp-trunk/funcs/func_channel.c
team/oej/securertp-trunk/funcs/func_curl.c
team/oej/securertp-trunk/funcs/func_cut.c
team/oej/securertp-trunk/funcs/func_db.c
team/oej/securertp-trunk/funcs/func_enum.c
team/oej/securertp-trunk/funcs/func_env.c
team/oej/securertp-trunk/funcs/func_global.c
team/oej/securertp-trunk/funcs/func_groupcount.c
team/oej/securertp-trunk/funcs/func_language.c
team/oej/securertp-trunk/funcs/func_logic.c
team/oej/securertp-trunk/funcs/func_math.c
team/oej/securertp-trunk/funcs/func_md5.c
team/oej/securertp-trunk/funcs/func_moh.c
team/oej/securertp-trunk/funcs/func_odbc.c
team/oej/securertp-trunk/funcs/func_rand.c
team/oej/securertp-trunk/funcs/func_realtime.c
team/oej/securertp-trunk/funcs/func_sha1.c
team/oej/securertp-trunk/funcs/func_strings.c
team/oej/securertp-trunk/funcs/func_timeout.c
team/oej/securertp-trunk/funcs/func_uri.c
team/oej/securertp-trunk/http.c
team/oej/securertp-trunk/image.c
team/oej/securertp-trunk/include/ (props changed)
team/oej/securertp-trunk/include/asterisk/ (props changed)
team/oej/securertp-trunk/include/asterisk.h
team/oej/securertp-trunk/include/asterisk/astmm.h
team/oej/securertp-trunk/include/asterisk/callerid.h
team/oej/securertp-trunk/include/asterisk/dnsmgr.h
team/oej/securertp-trunk/include/asterisk/jabber.h
team/oej/securertp-trunk/include/asterisk/rtp.h
team/oej/securertp-trunk/include/asterisk/translate.h
team/oej/securertp-trunk/indications.c
team/oej/securertp-trunk/io.c
team/oej/securertp-trunk/jitterbuf.c
team/oej/securertp-trunk/loader.c
team/oej/securertp-trunk/logger.c
team/oej/securertp-trunk/manager.c
team/oej/securertp-trunk/md5.c
team/oej/securertp-trunk/netsock.c
team/oej/securertp-trunk/pbx.c
team/oej/securertp-trunk/pbx/Makefile
team/oej/securertp-trunk/pbx/ael/ael.flex
team/oej/securertp-trunk/pbx/ael/ael.tab.c
team/oej/securertp-trunk/pbx/ael/ael.y
team/oej/securertp-trunk/pbx/ael/ael_lex.c
team/oej/securertp-trunk/pbx/dundi-parser.c
team/oej/securertp-trunk/pbx/pbx_ael.c
team/oej/securertp-trunk/pbx/pbx_config.c
team/oej/securertp-trunk/pbx/pbx_dundi.c
team/oej/securertp-trunk/pbx/pbx_gtkconsole.c
team/oej/securertp-trunk/pbx/pbx_loopback.c
team/oej/securertp-trunk/pbx/pbx_realtime.c
team/oej/securertp-trunk/pbx/pbx_spool.c
team/oej/securertp-trunk/plc.c
team/oej/securertp-trunk/privacy.c
team/oej/securertp-trunk/res/Makefile
team/oej/securertp-trunk/res/res_adsi.c
team/oej/securertp-trunk/res/res_agi.c
team/oej/securertp-trunk/res/res_clioriginate.c
team/oej/securertp-trunk/res/res_config_odbc.c
team/oej/securertp-trunk/res/res_config_pgsql.c
team/oej/securertp-trunk/res/res_convert.c
team/oej/securertp-trunk/res/res_crypto.c
team/oej/securertp-trunk/res/res_features.c
team/oej/securertp-trunk/res/res_indications.c
team/oej/securertp-trunk/res/res_jabber.c
team/oej/securertp-trunk/res/res_monitor.c
team/oej/securertp-trunk/res/res_musiconhold.c
team/oej/securertp-trunk/res/res_odbc.c
team/oej/securertp-trunk/res/res_osp.c
team/oej/securertp-trunk/res/res_smdi.c
team/oej/securertp-trunk/res/res_speech.c
team/oej/securertp-trunk/rtp.c
team/oej/securertp-trunk/say.c
team/oej/securertp-trunk/sched.c
team/oej/securertp-trunk/slinfactory.c
team/oej/securertp-trunk/sounds/ (props changed)
team/oej/securertp-trunk/srv.c
team/oej/securertp-trunk/stdtime/localtime.c
team/oej/securertp-trunk/strcompat.c
team/oej/securertp-trunk/tdd.c
team/oej/securertp-trunk/term.c
team/oej/securertp-trunk/translate.c
team/oej/securertp-trunk/udptl.c
team/oej/securertp-trunk/utils.c
team/oej/securertp-trunk/utils/ael_main.c
team/oej/securertp-trunk/utils/astman.c
team/oej/securertp-trunk/utils/smsq.c
Propchange: team/oej/securertp-trunk/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/securertp-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/securertp-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 8 03:06:18 2006
@@ -1,1 +1,1 @@
-/trunk:1-32588
+/trunk:1-32969
Modified: team/oej/securertp-trunk/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/Makefile?rev=32989&r1=32988&r2=32989&view=diff
==============================================================================
--- team/oej/securertp-trunk/Makefile (original)
+++ team/oej/securertp-trunk/Makefile Thu Jun 8 03:06:18 2006
@@ -12,6 +12,8 @@
#
.EXPORT_ALL_VARIABLES:
+
+.PHONY: sounds
# Create OPTIONS variable
OPTIONS=
@@ -127,9 +129,9 @@
include makeopts
endif
-TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
-MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
-OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+TOPDIR_CFLAGS=-Iinclude
+MOD_SUBDIR_CFLAGS=-I../include -I..
+OTHER_SUBDIR_CFLAGS=-I../include -I..
ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
@@ -194,7 +196,6 @@
endif
endif
endif
- MPG123TARG=linux
endif
GREP=grep
@@ -237,12 +238,10 @@
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
endif
- MPG123TARG=freebsd
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
- MPG123TARG=netbsd
endif
ifeq ($(OSARCH),OpenBSD)
@@ -510,19 +509,19 @@
rm -f include/asterisk/version.h
rm -f .tags-sources tags TAGS
@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
- @if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
$(MAKE) -C db1-ast clean
$(MAKE) -C stdtime clean
distclean: dist-clean
dist-clean: clean
+ $(MAKE) -C mxml clean
+ $(MAKE) -C build_tools dist-clean
+ $(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts makeopts.xml
rm -f config.log config.status
rm -f include/autoconfig.h
rm -f include/asterisk/buildopts.h
- $(MAKE) -C mxml clean
- $(MAKE) -C build_tools dist-clean
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -533,57 +532,12 @@
for x in static-http/*; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
- for x in sounds/digits/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
- for x in sounds/dictate/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
- for x in sounds/letters/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
- for x in sounds/phonetic/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
mkdir -p $(DESTDIR)$(ASTDATADIR)/images
for x in images/*.jpg; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
done
mkdir -p $(DESTDIR)$(AGI_DIR)
+ $(MAKE) -C sounds install
update:
@if [ -d .svn ]; then \
@@ -635,11 +589,11 @@
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+ $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
@@ -657,7 +611,6 @@
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
install-subdirs:
@for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
@@ -761,20 +714,6 @@
else \
echo "Skipping asterisk.conf creation"; \
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
- for x in sounds/demo-*; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
- for x in sounds/*.mp3; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
- done
- rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
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 \
@@ -828,12 +767,6 @@
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
-
-mpg123:
- @wget -V >/dev/null || (echo "You need wget" ; false )
- [ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
- [ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
- $(MAKE) -C mpg123-0.59r $(MPG123TARG)
config:
@if [ "${OSARCH}" = "Linux" ]; then \
@@ -904,6 +837,9 @@
%_env:
$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
+sounds:
+ $(MAKE) -C sounds all
+
env:
env
@@ -923,10 +859,10 @@
rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
rm -rf $(DESTDIR)$(ASTHEADERDIR)
- rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
rm -rf $(DESTDIR)$(ASTMANDIR)/man8
for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+ $(MAKE) -C sounds uninstall
uninstall: _uninstall
@echo " +--------- Asterisk Uninstall Complete -----+"
@@ -960,6 +896,6 @@
@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
$(MAKE) -C mxml libmxml.a
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml build_tools/sounds.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
@echo "Generating list of available modules ..."
@build_tools/prep_moduledeps > $@
Modified: team/oej/securertp-trunk/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/abstract_jb.c?rev=32989&r1=32988&r2=32989&view=diff
==============================================================================
--- team/oej/securertp-trunk/abstract_jb.c (original)
+++ team/oej/securertp-trunk/abstract_jb.c Thu Jun 8 03:06:18 2006
@@ -26,13 +26,13 @@
* \author Slav Klenov <slav at securax.org>
*/
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/frame.h"
#include "asterisk/channel.h"
Modified: team/oej/securertp-trunk/acl.c
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/acl.c?rev=32989&r1=32988&r2=32989&view=diff
==============================================================================
--- team/oej/securertp-trunk/acl.c (original)
+++ team/oej/securertp-trunk/acl.c Thu Jun 8 03:06:18 2006
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +62,6 @@
#define IPTOS_MINCOST IPTOS_LOWCOST
#endif
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
#include "asterisk/acl.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
@@ -69,7 +69,6 @@
#include "asterisk/utils.h"
#include "asterisk/lock.h"
#include "asterisk/srv.h"
-#include "asterisk/compat.h"
struct ast_ha {
/* Host access rule */
Modified: team/oej/securertp-trunk/aclocal.m4
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/aclocal.m4?rev=32989&r1=32988&r2=32989&view=diff
==============================================================================
--- team/oej/securertp-trunk/aclocal.m4 (original)
+++ team/oej/securertp-trunk/aclocal.m4 Thu Jun 8 03:06:18 2006
@@ -1,14 +1,922 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_include([acinclude.m4])
+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+# AST_EXT_LIB([NAME], [FUNCTION], [package header], [package symbol name], [package friendly name], [additional LIB data])
+
+AC_DEFUN([AST_EXT_LIB],
+[
+AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $5 files in PATH]),[
+case ${withval} in
+ n|no)
+ USE_$4=no
+ ;;
+ y|ye|yes)
+ $4_MANDATORY="yes"
+ ;;
+ *)
+ $4_DIR="${withval}"
+ $4_MANDATORY="yes"
+ ;;
+esac
+])
+
+PBX_LIB$4=0
+
+if test "${USE_$4}" != "no"; then
+ pbxlibdir=""
+ if test "x${$4_DIR}" != "x"; then
+ pbxlibdir="-L${$1_DIR}/lib"
+ fi
+ AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${pbxlibdir} $6)
+
+ if test "${AST_$4_FOUND}" = "yes"; then
+ $4_LIB="-l$1 $6"
+ $4_HEADER_FOUND="1"
+ if test "x${$4_DIR}" != "x"; then
+ $4_LIB="${pbxlibdir} ${$4_LIB}"
+ $4_INCLUDE="-I${$4_DIR}/include"
+ if test "x$3" != "x" ; then
+ AC_CHECK_HEADER([${$4_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ fi
+ else
+ if test "x$3" != "x" ; then
+ AC_CHECK_HEADER([$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ fi
+ fi
+ if test "x${$4_HEADER_FOUND}" = "x0" ; then
+ if test ! -z "${$4_MANDATORY}" ;
+ then
+ echo " ***"
+ echo " *** It appears that you do not have the $1 development package installed."
+ echo " *** Please install it to include $5 support, or re-run configure"
+ echo " *** without explicitly specifying --with-$1"
+ exit 1
+ fi
+ $4_LIB=""
+ $4_INCLUDE=""
+ PBX_LIB$4=0
+ else
+ PBX_LIB$4=1
+ AC_DEFINE_UNQUOTED([HAVE_$4], 1, [Define to indicate the $5 library])
+ fi
+ elif test ! -z "${$4_MANDATORY}";
+ then
+ echo "***"
+ echo "*** The $5 installation on this system appears to be broken."
+ echo "*** Either correct the installation, or run configure"
+ echo "*** without explicity specifying --with-$1"
+ exit 1
+ fi
+fi
+AC_SUBST([$4_LIB])
+AC_SUBST([$4_INCLUDE])
+AC_SUBST([PBX_LIB$4])
+])
+
+
+AC_DEFUN(
+[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
+ GNU_MAKE='Not Found' ;
+ for a in make gmake gnumake ; do
+ if test -z "$a" ; then continue ; fi ;
+ if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
+ GNU_MAKE=$a ;
+ break;
+ fi
+ done ;
+) ;
+if test "x$GNU_MAKE" = "xNot Found" ; then
+ echo " *** Please install GNU make. It is required to build Asterisk!"
+ exit 1
+fi
+AC_SUBST([GNU_MAKE])
+])
+
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_LIB_ARG_WITH([lib-prefix],
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+])
+ if test $use_additional = yes; then
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's already present in $CPPFLAGS,
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ for x in $CPPFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
[... 19186 lines stripped ...]
More information about the svn-commits
mailing list