[asterisk-commits] branch jcollie/bug7021 r33032 - in
/team/jcollie/bug7021: ./ apps/ build_tool...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Jun 8 06:58:46 MST 2006
Author: jcollie
Date: Thu Jun 8 08:58:43 2006
New Revision: 33032
URL: http://svn.digium.com/view/asterisk?rev=33032&view=rev
Log:
Merged revisions 32845-32846,32860,32864,32867-32868,32878,32884-32886,32901,32916-32919,32935,32953,32970-32971,32990-32992,33011 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r32845 | russell | 2006-06-07 13:28:29 -0500 (Wed, 07 Jun 2006) | 2 lines
remove the WITH_SMDI define
........
r32846 | kpfleming | 2006-06-07 13:54:56 -0500 (Wed, 07 Jun 2006) | 2 lines
simplify autoconfig include mechanism (make tholo happy he can use lint again :-)
........
r32860 | kpfleming | 2006-06-07 14:05:35 -0500 (Wed, 07 Jun 2006) | 3 lines
move autoconfig.h to the include/asterisk directory so it will get installed
install asterisk.h include the system's default include directory
........
r32864 | kpfleming | 2006-06-07 14:06:30 -0500 (Wed, 07 Jun 2006) | 2 lines
put the proper filename into the ignore property
........
r32867 | russell | 2006-06-07 14:42:37 -0500 (Wed, 07 Jun 2006) | 4 lines
fix an incorrect usage of scanf, where it should be using sscanf, instead,
which was causing asterisk to hang when loading this module
(reported by blitzrage on IRC)
........
r32868 | russell | 2006-06-07 14:53:03 -0500 (Wed, 07 Jun 2006) | 2 lines
fix the build with astmm enabled
........
r32878 | russell | 2006-06-07 15:02:07 -0500 (Wed, 07 Jun 2006) | 3 lines
simplify the loop that iterates through the categories in followme.conf and
don't try to read the general section as a followme profile
........
r32884 | russell | 2006-06-07 15:08:29 -0500 (Wed, 07 Jun 2006) | 2 lines
fix a typo in an option name in config parsing
........
r32885 | kpfleming | 2006-06-07 15:19:40 -0500 (Wed, 07 Jun 2006) | 2 lines
prepare for using sound files from out of the source tree
........
r32886 | kpfleming | 2006-06-07 15:54:30 -0500 (Wed, 07 Jun 2006) | 2 lines
woo-hoo, now it knows how to download the sound packages... doesn't install them yet though
........
r32901 | kpfleming | 2006-06-07 16:05:05 -0500 (Wed, 07 Jun 2006) | 4 lines
don't force the sounds to download... only when needed
fix a few buglets i caused in menuselect
remove downloaded sounds on 'dist-clean'
........
r32916 | kpfleming | 2006-06-07 17:03:02 -0500 (Wed, 07 Jun 2006) | 2 lines
ok, now it knows how to auto-download and install
........
r32917 | kpfleming | 2006-06-07 17:37:31 -0500 (Wed, 07 Jun 2006) | 5 lines
moh files will now be distributed in native format, not mp3, so...
update sounds/Makefile to download/unpack the proper files
remove all evidence of mpg123 from the main Makefile
change the sample musiconhold.conf file to use native mode instead of mp3
........
r32918 | mogorman | 2006-06-07 17:43:20 -0500 (Wed, 07 Jun 2006) | 4 lines
solves some bugs with memory allocation, and adds
a message stack.
........
r32919 | kpfleming | 2006-06-07 17:55:46 -0500 (Wed, 07 Jun 2006) | 2 lines
ok, new sounds/moh handling stuff should be done... bring on the bug reports!
........
r32935 | russell | 2006-06-07 18:09:41 -0500 (Wed, 07 Jun 2006) | 3 lines
move the common wget arguments to a variable and remove --no-verbose so
users will see download progress
........
r32953 | markster | 2006-06-08 00:24:50 -0500 (Thu, 08 Jun 2006) | 2 lines
Cleanup formatting a little...
........
r32970 | oej | 2006-06-08 02:26:05 -0500 (Thu, 08 Jun 2006) | 2 lines
Enable doxygen
........
r32971 | oej | 2006-06-08 02:29:46 -0500 (Thu, 08 Jun 2006) | 2 lines
Doxygen formatting
........
r32990 | oej | 2006-06-08 03:10:58 -0500 (Thu, 08 Jun 2006) | 2 lines
Doxygen update
........
r32991 | oej | 2006-06-08 03:13:32 -0500 (Thu, 08 Jun 2006) | 2 lines
Add video.txt to doxygen
........
r32992 | oej | 2006-06-08 03:15:43 -0500 (Thu, 08 Jun 2006) | 2 lines
Update doxygen for video formats
........
r33011 | crichter | 2006-06-08 04:51:13 -0500 (Thu, 08 Jun 2006) | 1 line
Fixed detection of dtmfs with bridged channels.
........
Added:
team/jcollie/bug7021/include/asterisk/autoconfig.h.in
- copied unchanged from r33011, trunk/include/asterisk/autoconfig.h.in
team/jcollie/bug7021/sounds/Makefile
- copied unchanged from r33011, trunk/sounds/Makefile
team/jcollie/bug7021/sounds/sounds.xml
- copied unchanged from r33011, trunk/sounds/sounds.xml
Removed:
team/jcollie/bug7021/build_tools/sounds.xml
team/jcollie/bug7021/include/autoconfig.h.in
team/jcollie/bug7021/sounds/agent-alreadyon.gsm
team/jcollie/bug7021/sounds/agent-incorrect.gsm
team/jcollie/bug7021/sounds/agent-loggedoff.gsm
team/jcollie/bug7021/sounds/agent-loginok.gsm
team/jcollie/bug7021/sounds/agent-newlocation.gsm
team/jcollie/bug7021/sounds/agent-pass.gsm
team/jcollie/bug7021/sounds/agent-user.gsm
team/jcollie/bug7021/sounds/auth-incorrect.gsm
team/jcollie/bug7021/sounds/auth-thankyou.gsm
team/jcollie/bug7021/sounds/beep.gsm
team/jcollie/bug7021/sounds/beeperr.gsm
team/jcollie/bug7021/sounds/conf-adminmenu.gsm
team/jcollie/bug7021/sounds/conf-enteringno.gsm
team/jcollie/bug7021/sounds/conf-errormenu.gsm
team/jcollie/bug7021/sounds/conf-getchannel.gsm
team/jcollie/bug7021/sounds/conf-getconfno.gsm
team/jcollie/bug7021/sounds/conf-getpin.gsm
team/jcollie/bug7021/sounds/conf-hasjoin.gsm
team/jcollie/bug7021/sounds/conf-hasleft.gsm
team/jcollie/bug7021/sounds/conf-invalid.gsm
team/jcollie/bug7021/sounds/conf-invalidpin.gsm
team/jcollie/bug7021/sounds/conf-kicked.gsm
team/jcollie/bug7021/sounds/conf-leaderhasleft.gsm
team/jcollie/bug7021/sounds/conf-locked.gsm
team/jcollie/bug7021/sounds/conf-lockednow.gsm
team/jcollie/bug7021/sounds/conf-muted.gsm
team/jcollie/bug7021/sounds/conf-noempty.gsm
team/jcollie/bug7021/sounds/conf-onlyone.gsm
team/jcollie/bug7021/sounds/conf-onlyperson.gsm
team/jcollie/bug7021/sounds/conf-otherinparty.gsm
team/jcollie/bug7021/sounds/conf-placeintoconf.gsm
team/jcollie/bug7021/sounds/conf-thereare.gsm
team/jcollie/bug7021/sounds/conf-unlockednow.gsm
team/jcollie/bug7021/sounds/conf-unmuted.gsm
team/jcollie/bug7021/sounds/conf-usermenu.gsm
team/jcollie/bug7021/sounds/conf-userswilljoin.gsm
team/jcollie/bug7021/sounds/conf-userwilljoin.gsm
team/jcollie/bug7021/sounds/conf-waitforleader.gsm
team/jcollie/bug7021/sounds/demo-abouttotry.gsm
team/jcollie/bug7021/sounds/demo-congrats.gsm
team/jcollie/bug7021/sounds/demo-echodone.gsm
team/jcollie/bug7021/sounds/demo-echotest.gsm
team/jcollie/bug7021/sounds/demo-enterkeywords.gsm
team/jcollie/bug7021/sounds/demo-instruct.gsm
team/jcollie/bug7021/sounds/demo-moreinfo.gsm
team/jcollie/bug7021/sounds/demo-nogo.gsm
team/jcollie/bug7021/sounds/demo-nomatch.gsm
team/jcollie/bug7021/sounds/demo-thanks.gsm
team/jcollie/bug7021/sounds/dictate/
team/jcollie/bug7021/sounds/digits/
team/jcollie/bug7021/sounds/dir-instr.gsm
team/jcollie/bug7021/sounds/dir-intro-fn.gsm
team/jcollie/bug7021/sounds/dir-intro.gsm
team/jcollie/bug7021/sounds/dir-nomatch.gsm
team/jcollie/bug7021/sounds/dir-nomore.gsm
team/jcollie/bug7021/sounds/fpm-calm-river.mp3
team/jcollie/bug7021/sounds/fpm-sunshine.mp3
team/jcollie/bug7021/sounds/fpm-world-mix.mp3
team/jcollie/bug7021/sounds/hello-world.gsm
team/jcollie/bug7021/sounds/hours.gsm
team/jcollie/bug7021/sounds/invalid.gsm
team/jcollie/bug7021/sounds/letters/
team/jcollie/bug7021/sounds/minutes.gsm
team/jcollie/bug7021/sounds/pbx-invalid.gsm
team/jcollie/bug7021/sounds/pbx-invalidpark.gsm
team/jcollie/bug7021/sounds/pbx-transfer.gsm
team/jcollie/bug7021/sounds/phonetic/
team/jcollie/bug7021/sounds/priv-callee-options.gsm
team/jcollie/bug7021/sounds/priv-callpending.gsm
team/jcollie/bug7021/sounds/priv-introsaved.gsm
team/jcollie/bug7021/sounds/priv-recordintro.gsm
team/jcollie/bug7021/sounds/privacy-incorrect.gsm
team/jcollie/bug7021/sounds/privacy-prompt.gsm
team/jcollie/bug7021/sounds/privacy-thankyou.gsm
team/jcollie/bug7021/sounds/privacy-unident.gsm
team/jcollie/bug7021/sounds/queue-callswaiting.gsm
team/jcollie/bug7021/sounds/queue-holdtime.gsm
team/jcollie/bug7021/sounds/queue-less-than.gsm
team/jcollie/bug7021/sounds/queue-minutes.gsm
team/jcollie/bug7021/sounds/queue-periodic-announce.gsm
team/jcollie/bug7021/sounds/queue-reporthold.gsm
team/jcollie/bug7021/sounds/queue-seconds.gsm
team/jcollie/bug7021/sounds/queue-thankyou.gsm
team/jcollie/bug7021/sounds/queue-thereare.gsm
team/jcollie/bug7021/sounds/queue-youarenext.gsm
team/jcollie/bug7021/sounds/screen-callee-options.gsm
team/jcollie/bug7021/sounds/seconds.gsm
team/jcollie/bug7021/sounds/spy-agent.gsm
team/jcollie/bug7021/sounds/spy-h323.gsm
team/jcollie/bug7021/sounds/spy-iax.gsm
team/jcollie/bug7021/sounds/spy-iax2.gsm
team/jcollie/bug7021/sounds/spy-mgcp.gsm
team/jcollie/bug7021/sounds/spy-sip.gsm
team/jcollie/bug7021/sounds/spy-skinny.gsm
team/jcollie/bug7021/sounds/spy-zap.gsm
team/jcollie/bug7021/sounds/ss-noservice.gsm
team/jcollie/bug7021/sounds/transfer.gsm
team/jcollie/bug7021/sounds/tt-allbusy.gsm
team/jcollie/bug7021/sounds/tt-monkeys.gsm
team/jcollie/bug7021/sounds/tt-monkeysintro.gsm
team/jcollie/bug7021/sounds/tt-somethingwrong.gsm
team/jcollie/bug7021/sounds/tt-weasels.gsm
team/jcollie/bug7021/sounds/vm-Cust1.gsm
team/jcollie/bug7021/sounds/vm-Cust2.gsm
team/jcollie/bug7021/sounds/vm-Cust3.gsm
team/jcollie/bug7021/sounds/vm-Cust4.gsm
team/jcollie/bug7021/sounds/vm-Cust5.gsm
team/jcollie/bug7021/sounds/vm-Family.gsm
team/jcollie/bug7021/sounds/vm-Friends.gsm
team/jcollie/bug7021/sounds/vm-INBOX.gsm
team/jcollie/bug7021/sounds/vm-Old.gsm
team/jcollie/bug7021/sounds/vm-Work.gsm
team/jcollie/bug7021/sounds/vm-advopts.gsm
team/jcollie/bug7021/sounds/vm-and.gsm
team/jcollie/bug7021/sounds/vm-calldiffnum.gsm
team/jcollie/bug7021/sounds/vm-changeto.gsm
team/jcollie/bug7021/sounds/vm-delete.gsm
team/jcollie/bug7021/sounds/vm-deleted.gsm
team/jcollie/bug7021/sounds/vm-dialout.gsm
team/jcollie/bug7021/sounds/vm-enter-num-to-call.gsm
team/jcollie/bug7021/sounds/vm-extension.gsm
team/jcollie/bug7021/sounds/vm-first.gsm
team/jcollie/bug7021/sounds/vm-for.gsm
team/jcollie/bug7021/sounds/vm-forward.gsm
team/jcollie/bug7021/sounds/vm-forwardoptions.gsm
team/jcollie/bug7021/sounds/vm-from-extension.gsm
team/jcollie/bug7021/sounds/vm-from-phonenumber.gsm
team/jcollie/bug7021/sounds/vm-from.gsm
team/jcollie/bug7021/sounds/vm-goodbye.gsm
team/jcollie/bug7021/sounds/vm-helpexit.gsm
team/jcollie/bug7021/sounds/vm-incorrect-mailbox.gsm
team/jcollie/bug7021/sounds/vm-incorrect.gsm
team/jcollie/bug7021/sounds/vm-instructions.gsm
team/jcollie/bug7021/sounds/vm-intro.gsm
team/jcollie/bug7021/sounds/vm-isonphone.gsm
team/jcollie/bug7021/sounds/vm-isunavail.gsm
team/jcollie/bug7021/sounds/vm-last.gsm
team/jcollie/bug7021/sounds/vm-leavemsg.gsm
team/jcollie/bug7021/sounds/vm-login.gsm
team/jcollie/bug7021/sounds/vm-mailboxfull.gsm
team/jcollie/bug7021/sounds/vm-message.gsm
team/jcollie/bug7021/sounds/vm-messages.gsm
team/jcollie/bug7021/sounds/vm-minutes.gsm
team/jcollie/bug7021/sounds/vm-mismatch.gsm
team/jcollie/bug7021/sounds/vm-msginstruct.gsm
team/jcollie/bug7021/sounds/vm-msgsaved.gsm
team/jcollie/bug7021/sounds/vm-newpassword.gsm
team/jcollie/bug7021/sounds/vm-newuser.gsm
team/jcollie/bug7021/sounds/vm-next.gsm
team/jcollie/bug7021/sounds/vm-no.gsm
team/jcollie/bug7021/sounds/vm-nobodyavail.gsm
team/jcollie/bug7021/sounds/vm-nobox.gsm
team/jcollie/bug7021/sounds/vm-nomore.gsm
team/jcollie/bug7021/sounds/vm-nonumber.gsm
team/jcollie/bug7021/sounds/vm-num-i-have.gsm
team/jcollie/bug7021/sounds/vm-onefor.gsm
team/jcollie/bug7021/sounds/vm-options.gsm
team/jcollie/bug7021/sounds/vm-opts.gsm
team/jcollie/bug7021/sounds/vm-passchanged.gsm
team/jcollie/bug7021/sounds/vm-password.gsm
team/jcollie/bug7021/sounds/vm-press.gsm
team/jcollie/bug7021/sounds/vm-prev.gsm
team/jcollie/bug7021/sounds/vm-reachoper.gsm
team/jcollie/bug7021/sounds/vm-rec-busy.gsm
team/jcollie/bug7021/sounds/vm-rec-name.gsm
team/jcollie/bug7021/sounds/vm-rec-temp.gsm
team/jcollie/bug7021/sounds/vm-rec-unv.gsm
team/jcollie/bug7021/sounds/vm-received.gsm
team/jcollie/bug7021/sounds/vm-reenterpassword.gsm
team/jcollie/bug7021/sounds/vm-repeat.gsm
team/jcollie/bug7021/sounds/vm-review.gsm
team/jcollie/bug7021/sounds/vm-saved.gsm
team/jcollie/bug7021/sounds/vm-savedto.gsm
team/jcollie/bug7021/sounds/vm-savefolder.gsm
team/jcollie/bug7021/sounds/vm-savemessage.gsm
team/jcollie/bug7021/sounds/vm-saveoper.gsm
team/jcollie/bug7021/sounds/vm-sorry.gsm
team/jcollie/bug7021/sounds/vm-star-cancel.gsm
team/jcollie/bug7021/sounds/vm-starmain.gsm
team/jcollie/bug7021/sounds/vm-tempgreetactive.gsm
team/jcollie/bug7021/sounds/vm-tempgreeting.gsm
team/jcollie/bug7021/sounds/vm-tempgreeting2.gsm
team/jcollie/bug7021/sounds/vm-tempremoved.gsm
team/jcollie/bug7021/sounds/vm-then-pound.gsm
team/jcollie/bug7021/sounds/vm-theperson.gsm
team/jcollie/bug7021/sounds/vm-tocallback.gsm
team/jcollie/bug7021/sounds/vm-tocallnum.gsm
team/jcollie/bug7021/sounds/vm-tocancel.gsm
team/jcollie/bug7021/sounds/vm-tocancelmsg.gsm
team/jcollie/bug7021/sounds/vm-toenternumber.gsm
team/jcollie/bug7021/sounds/vm-toforward.gsm
team/jcollie/bug7021/sounds/vm-tohearenv.gsm
team/jcollie/bug7021/sounds/vm-tomakecall.gsm
team/jcollie/bug7021/sounds/vm-tooshort.gsm
team/jcollie/bug7021/sounds/vm-toreply.gsm
team/jcollie/bug7021/sounds/vm-torerecord.gsm
team/jcollie/bug7021/sounds/vm-undelete.gsm
team/jcollie/bug7021/sounds/vm-undeleted.gsm
team/jcollie/bug7021/sounds/vm-unknown-caller.gsm
team/jcollie/bug7021/sounds/vm-whichbox.gsm
team/jcollie/bug7021/sounds/vm-youhave.gsm
Modified:
team/jcollie/bug7021/ (props changed)
team/jcollie/bug7021/Makefile
team/jcollie/bug7021/abstract_jb.c
team/jcollie/bug7021/acl.c
team/jcollie/bug7021/aclocal.m4
team/jcollie/bug7021/app.c
team/jcollie/bug7021/apps/app_adsiprog.c
team/jcollie/bug7021/apps/app_alarmreceiver.c
team/jcollie/bug7021/apps/app_amd.c
team/jcollie/bug7021/apps/app_authenticate.c
team/jcollie/bug7021/apps/app_cdr.c
team/jcollie/bug7021/apps/app_chanisavail.c
team/jcollie/bug7021/apps/app_channelredirect.c
team/jcollie/bug7021/apps/app_chanspy.c
team/jcollie/bug7021/apps/app_controlplayback.c
team/jcollie/bug7021/apps/app_db.c
team/jcollie/bug7021/apps/app_dial.c
team/jcollie/bug7021/apps/app_dictate.c
team/jcollie/bug7021/apps/app_directed_pickup.c
team/jcollie/bug7021/apps/app_directory.c
team/jcollie/bug7021/apps/app_disa.c
team/jcollie/bug7021/apps/app_dumpchan.c
team/jcollie/bug7021/apps/app_echo.c
team/jcollie/bug7021/apps/app_exec.c
team/jcollie/bug7021/apps/app_externalivr.c
team/jcollie/bug7021/apps/app_festival.c
team/jcollie/bug7021/apps/app_flash.c
team/jcollie/bug7021/apps/app_followme.c
team/jcollie/bug7021/apps/app_forkcdr.c
team/jcollie/bug7021/apps/app_getcpeid.c
team/jcollie/bug7021/apps/app_hasnewvoicemail.c
team/jcollie/bug7021/apps/app_ices.c
team/jcollie/bug7021/apps/app_image.c
team/jcollie/bug7021/apps/app_ivrdemo.c
team/jcollie/bug7021/apps/app_lookupblacklist.c
team/jcollie/bug7021/apps/app_lookupcidname.c
team/jcollie/bug7021/apps/app_macro.c
team/jcollie/bug7021/apps/app_meetme.c
team/jcollie/bug7021/apps/app_milliwatt.c
team/jcollie/bug7021/apps/app_mixmonitor.c
team/jcollie/bug7021/apps/app_morsecode.c
team/jcollie/bug7021/apps/app_mp3.c
team/jcollie/bug7021/apps/app_nbscat.c
team/jcollie/bug7021/apps/app_osplookup.c
team/jcollie/bug7021/apps/app_page.c
team/jcollie/bug7021/apps/app_parkandannounce.c
team/jcollie/bug7021/apps/app_playback.c
team/jcollie/bug7021/apps/app_privacy.c
team/jcollie/bug7021/apps/app_queue.c
team/jcollie/bug7021/apps/app_random.c
team/jcollie/bug7021/apps/app_read.c
team/jcollie/bug7021/apps/app_readfile.c
team/jcollie/bug7021/apps/app_realtime.c
team/jcollie/bug7021/apps/app_record.c
team/jcollie/bug7021/apps/app_sayunixtime.c
team/jcollie/bug7021/apps/app_senddtmf.c
team/jcollie/bug7021/apps/app_sendtext.c
team/jcollie/bug7021/apps/app_setcallerid.c
team/jcollie/bug7021/apps/app_setcdruserfield.c
team/jcollie/bug7021/apps/app_settransfercapability.c
team/jcollie/bug7021/apps/app_skel.c
team/jcollie/bug7021/apps/app_sms.c
team/jcollie/bug7021/apps/app_softhangup.c
team/jcollie/bug7021/apps/app_speech_utils.c
team/jcollie/bug7021/apps/app_stack.c
team/jcollie/bug7021/apps/app_system.c
team/jcollie/bug7021/apps/app_talkdetect.c
team/jcollie/bug7021/apps/app_test.c
team/jcollie/bug7021/apps/app_transfer.c
team/jcollie/bug7021/apps/app_url.c
team/jcollie/bug7021/apps/app_userevent.c
team/jcollie/bug7021/apps/app_verbose.c
team/jcollie/bug7021/apps/app_voicemail.c
team/jcollie/bug7021/apps/app_waitforring.c
team/jcollie/bug7021/apps/app_waitforsilence.c
team/jcollie/bug7021/apps/app_while.c
team/jcollie/bug7021/apps/app_zapateller.c
team/jcollie/bug7021/apps/app_zapbarge.c
team/jcollie/bug7021/apps/app_zapras.c
team/jcollie/bug7021/apps/app_zapscan.c
team/jcollie/bug7021/ast_expr2.c
team/jcollie/bug7021/ast_expr2.fl
team/jcollie/bug7021/ast_expr2.y
team/jcollie/bug7021/ast_expr2f.c
team/jcollie/bug7021/asterisk.c
team/jcollie/bug7021/astmm.c
team/jcollie/bug7021/autoservice.c
team/jcollie/bug7021/build_tools/cflags.xml
team/jcollie/bug7021/build_tools/menuselect.c
team/jcollie/bug7021/build_tools/menuselect_curses.c
team/jcollie/bug7021/build_tools/prep_moduledeps
team/jcollie/bug7021/callerid.c
team/jcollie/bug7021/cdr.c
team/jcollie/bug7021/cdr/cdr_csv.c
team/jcollie/bug7021/cdr/cdr_custom.c
team/jcollie/bug7021/cdr/cdr_manager.c
team/jcollie/bug7021/cdr/cdr_odbc.c
team/jcollie/bug7021/cdr/cdr_pgsql.c
team/jcollie/bug7021/cdr/cdr_radius.c
team/jcollie/bug7021/cdr/cdr_sqlite.c
team/jcollie/bug7021/cdr/cdr_tds.c
team/jcollie/bug7021/channel.c
team/jcollie/bug7021/channels/chan_agent.c
team/jcollie/bug7021/channels/chan_alsa.c
team/jcollie/bug7021/channels/chan_features.c
team/jcollie/bug7021/channels/chan_h323.c
team/jcollie/bug7021/channels/chan_iax2.c
team/jcollie/bug7021/channels/chan_jingle.c
team/jcollie/bug7021/channels/chan_local.c
team/jcollie/bug7021/channels/chan_mgcp.c
team/jcollie/bug7021/channels/chan_misdn.c
team/jcollie/bug7021/channels/chan_nbs.c
team/jcollie/bug7021/channels/chan_oss.c
team/jcollie/bug7021/channels/chan_phone.c
team/jcollie/bug7021/channels/chan_sip.c
team/jcollie/bug7021/channels/chan_skinny.c
team/jcollie/bug7021/channels/chan_vpb.c
team/jcollie/bug7021/channels/chan_zap.c
team/jcollie/bug7021/channels/iax2-parser.c
team/jcollie/bug7021/channels/iax2-provision.c
team/jcollie/bug7021/channels/misdn_config.c
team/jcollie/bug7021/chanvars.c
team/jcollie/bug7021/cli.c
team/jcollie/bug7021/codecs/codec_a_mu.c
team/jcollie/bug7021/codecs/codec_adpcm.c
team/jcollie/bug7021/codecs/codec_alaw.c
team/jcollie/bug7021/codecs/codec_g723_1.c
team/jcollie/bug7021/codecs/codec_g726.c
team/jcollie/bug7021/codecs/codec_gsm.c
team/jcollie/bug7021/codecs/codec_ilbc.c
team/jcollie/bug7021/codecs/codec_lpc10.c
team/jcollie/bug7021/codecs/codec_speex.c
team/jcollie/bug7021/codecs/codec_ulaw.c
team/jcollie/bug7021/config.c
team/jcollie/bug7021/configs/jabber.conf.sample
team/jcollie/bug7021/configs/musiconhold.conf.sample
team/jcollie/bug7021/configure
team/jcollie/bug7021/configure.ac
team/jcollie/bug7021/cryptostub.c
team/jcollie/bug7021/db.c
team/jcollie/bug7021/devicestate.c
team/jcollie/bug7021/dns.c
team/jcollie/bug7021/dnsmgr.c
team/jcollie/bug7021/doc/smdi.txt
team/jcollie/bug7021/dsp.c
team/jcollie/bug7021/enum.c
team/jcollie/bug7021/file.c
team/jcollie/bug7021/fixedjitterbuf.c
team/jcollie/bug7021/formats/format_g723.c
team/jcollie/bug7021/formats/format_g726.c
team/jcollie/bug7021/formats/format_g729.c
team/jcollie/bug7021/formats/format_gsm.c
team/jcollie/bug7021/formats/format_h263.c
team/jcollie/bug7021/formats/format_h264.c
team/jcollie/bug7021/formats/format_ilbc.c
team/jcollie/bug7021/formats/format_jpeg.c
team/jcollie/bug7021/formats/format_ogg_vorbis.c
team/jcollie/bug7021/formats/format_pcm.c
team/jcollie/bug7021/formats/format_sln.c
team/jcollie/bug7021/formats/format_vox.c
team/jcollie/bug7021/formats/format_wav.c
team/jcollie/bug7021/formats/format_wav_gsm.c
team/jcollie/bug7021/frame.c
team/jcollie/bug7021/fskmodem.c
team/jcollie/bug7021/funcs/func_base64.c
team/jcollie/bug7021/funcs/func_callerid.c
team/jcollie/bug7021/funcs/func_cdr.c
team/jcollie/bug7021/funcs/func_channel.c
team/jcollie/bug7021/funcs/func_curl.c
team/jcollie/bug7021/funcs/func_cut.c
team/jcollie/bug7021/funcs/func_db.c
team/jcollie/bug7021/funcs/func_enum.c
team/jcollie/bug7021/funcs/func_env.c
team/jcollie/bug7021/funcs/func_global.c
team/jcollie/bug7021/funcs/func_groupcount.c
team/jcollie/bug7021/funcs/func_language.c
team/jcollie/bug7021/funcs/func_logic.c
team/jcollie/bug7021/funcs/func_math.c
team/jcollie/bug7021/funcs/func_md5.c
team/jcollie/bug7021/funcs/func_moh.c
team/jcollie/bug7021/funcs/func_odbc.c
team/jcollie/bug7021/funcs/func_rand.c
team/jcollie/bug7021/funcs/func_realtime.c
team/jcollie/bug7021/funcs/func_sha1.c
team/jcollie/bug7021/funcs/func_strings.c
team/jcollie/bug7021/funcs/func_timeout.c
team/jcollie/bug7021/funcs/func_uri.c
team/jcollie/bug7021/http.c
team/jcollie/bug7021/image.c
team/jcollie/bug7021/include/ (props changed)
team/jcollie/bug7021/include/asterisk/ (props changed)
team/jcollie/bug7021/include/asterisk.h
team/jcollie/bug7021/include/asterisk/astmm.h
team/jcollie/bug7021/include/asterisk/callerid.h
team/jcollie/bug7021/include/asterisk/doxyref.h
team/jcollie/bug7021/include/asterisk/jabber.h
team/jcollie/bug7021/indications.c
team/jcollie/bug7021/io.c
team/jcollie/bug7021/jitterbuf.c
team/jcollie/bug7021/loader.c
team/jcollie/bug7021/logger.c
team/jcollie/bug7021/manager.c
team/jcollie/bug7021/md5.c
team/jcollie/bug7021/netsock.c
team/jcollie/bug7021/pbx.c
team/jcollie/bug7021/pbx/ael/ael.flex
team/jcollie/bug7021/pbx/ael/ael.tab.c
team/jcollie/bug7021/pbx/ael/ael.y
team/jcollie/bug7021/pbx/ael/ael_lex.c
team/jcollie/bug7021/pbx/dundi-parser.c
team/jcollie/bug7021/pbx/pbx_ael.c
team/jcollie/bug7021/pbx/pbx_config.c
team/jcollie/bug7021/pbx/pbx_dundi.c
team/jcollie/bug7021/pbx/pbx_gtkconsole.c
team/jcollie/bug7021/pbx/pbx_loopback.c
team/jcollie/bug7021/pbx/pbx_realtime.c
team/jcollie/bug7021/pbx/pbx_spool.c
team/jcollie/bug7021/plc.c
team/jcollie/bug7021/privacy.c
team/jcollie/bug7021/res/res_adsi.c
team/jcollie/bug7021/res/res_agi.c
team/jcollie/bug7021/res/res_clioriginate.c
team/jcollie/bug7021/res/res_config_odbc.c
team/jcollie/bug7021/res/res_config_pgsql.c
team/jcollie/bug7021/res/res_convert.c
team/jcollie/bug7021/res/res_crypto.c
team/jcollie/bug7021/res/res_features.c
team/jcollie/bug7021/res/res_indications.c
team/jcollie/bug7021/res/res_jabber.c
team/jcollie/bug7021/res/res_monitor.c
team/jcollie/bug7021/res/res_musiconhold.c
team/jcollie/bug7021/res/res_odbc.c
team/jcollie/bug7021/res/res_osp.c
team/jcollie/bug7021/res/res_smdi.c
team/jcollie/bug7021/res/res_speech.c
team/jcollie/bug7021/rtp.c
team/jcollie/bug7021/say.c
team/jcollie/bug7021/sched.c
team/jcollie/bug7021/slinfactory.c
team/jcollie/bug7021/sounds/ (props changed)
team/jcollie/bug7021/srv.c
team/jcollie/bug7021/stdtime/localtime.c
team/jcollie/bug7021/strcompat.c
team/jcollie/bug7021/tdd.c
team/jcollie/bug7021/term.c
team/jcollie/bug7021/translate.c
team/jcollie/bug7021/udptl.c
team/jcollie/bug7021/utils.c
team/jcollie/bug7021/utils/ael_main.c
team/jcollie/bug7021/utils/astman.c
team/jcollie/bug7021/utils/smsq.c
Propchange: team/jcollie/bug7021/
------------------------------------------------------------------------------
automerge = *
Propchange: team/jcollie/bug7021/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 8 08:58:43 2006
@@ -1,1 +1,1 @@
-/trunk:1-32825
+/trunk:1-33031
Modified: team/jcollie/bug7021/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/Makefile?rev=33032&r1=33031&r2=33032&view=diff
==============================================================================
--- team/jcollie/bug7021/Makefile (original)
+++ team/jcollie/bug7021/Makefile Thu Jun 8 08:58:43 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/jcollie/bug7021/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/abstract_jb.c?rev=33032&r1=33031&r2=33032&view=diff
==============================================================================
--- team/jcollie/bug7021/abstract_jb.c (original)
+++ team/jcollie/bug7021/abstract_jb.c Thu Jun 8 08:58:43 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/jcollie/bug7021/acl.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/acl.c?rev=33032&r1=33031&r2=33032&view=diff
==============================================================================
--- team/jcollie/bug7021/acl.c (original)
+++ team/jcollie/bug7021/acl.c Thu Jun 8 08:58:43 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/jcollie/bug7021/aclocal.m4
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7021/aclocal.m4?rev=33032&r1=33031&r2=33032&view=diff
==============================================================================
--- team/jcollie/bug7021/aclocal.m4 (original)
+++ team/jcollie/bug7021/aclocal.m4 Thu Jun 8 08:58:43 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],
+[
[... 16867 lines stripped ...]
More information about the asterisk-commits
mailing list