diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 19:34:13 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 19:34:13 +0000 |
| commit | e4e6e152c5c6d7f1c85c8ed506d90ef838ad03af (patch) | |
| tree | 1fca640326ed77efd78f9b5696d06dca7f75af55 | |
| parent | d0d8544a57560fc2096b50416aa8128b50301e29 (diff) | |
| parent | 665404ff2a9ba2d3e8585b0c622c97690cb6925f (diff) | |
Create Asterisk 1.6.2.15 from 1.6.2.15-rc1
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.15@297393 f38db490-d61c-443f-a65b-d21fe96a405b
75 files changed, 14020 insertions, 31057 deletions
@@ -1 +1 @@ -1.6.2.14 +1.6.2.15-rc1 @@ -1,3 +1,912 @@ +2010-11-15 Leif Madsen <lmadsen@digium.com> + + * Asterisk 1.6.2.15-rc1 + +2010-11-15 18:24 +0000 [r294988-295062] Tilghman Lesher <tlesher@digium.com> + + * tests/test_expr.c (added), /: Merged revisions 295026 via + svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r295026 | tilghman | 2010-11-15 11:58:37 -0600 (Mon, 15 Nov 2010) + | 2 lines Create test verifying results of expression parser + ........ + + * funcs/func_curl.c: It is possible to crash Asterisk by feeding + the curl engine invalid data. (closes issue #18161) Reported by: + wdoekes Patches: 20101029__issue18161.diff.txt uploaded by + tilghman (license 14) Tested by: tilghman + +2010-11-12 21:14 +0000 [r294904-294910] Jeff Peeler <jpeeler@digium.com> + + * apps/app_voicemail.c: Return correct error code if lock path + fails. The recent changes to open_mailbox actually caused it to + be fixed, but let's be consistent. Reported by alecdavis in + asterisk-dev. + + * apps/app_voicemail.c, /: Merged revisions 294903 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r294903 | jpeeler | 2010-11-12 14:49:09 -0600 (Fri, 12 + Nov 2010) | 16 lines Fix regression causing abort in voicemail + after opening a mailbox with no mesgs. In order to be more safe, + some error handling code was changed to respect more error + conditions including the potential memory allocation failure for + deleted and heard message tracking introduced in 293004. However, + last_message_index returns -1 for zero messages (perhaps as + expected) and was triggering the stricter error checking. Because + last_message_index is only called directly in one place, just + return 0 from open_mailbox (for file based storage) when no + messages are detected unless a real error has occurred. (closes + issue #18240) Reported by: leobrown Patches: + bug18240.1-6-2.diff.txt uploaded by alecdavis (license 585) + Tested by: pabelanger ........ + +2010-11-12 02:44 +0000 [r294822] Richard Mudgett <rmudgett@digium.com> + + * channels/chan_dahdi.c, /: Merged revisions 294821 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r294821 | rmudgett | 2010-11-11 20:41:13 -0600 (Thu, 11 + Nov 2010) | 11 lines Asterisk is getting a "No D-channels + available!" warning message every 4 seconds. Asterisk is just + whining too much with this message: "No D-channels available! + Using Primary channel XXX as D-channel anyway!". Filtered the + message so it only comes out once if there is no D channel + available without an intervening D channel available period. + (closes issue #17270) Reported by: jmls ........ + +2010-11-11 21:57 +0000 [r294639-294733] Jeff Peeler <jpeeler@digium.com> + + * /, channels/chan_sip.c: Merged revisions 294688 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r294688 | jpeeler | 2010-11-11 15:12:27 -0600 (Thu, 11 Nov 2010) + | 18 lines Fix problem with qualify option packets for realtime + peers never stopping. The option packets not only never stopped, + but if a realtime peer was not in the peer list multiple options + dialogs could accumulate over time. This scenario has the + potential to progress to the point of saturating a link just from + options packets. The fix was to ensure that the poke scheduler + checks to see if a peer is in the peer list before continuing to + poke. The reason a peer must be in the peer list to be able to + properly manage an options dialog is because otherwise the call + pointer is lost when the peer is regenerated from the database, + which is how existing qualify dialogs are detected. (closes issue + #16382) (closes issue #17779) Reported by: lftsy Patches: + bug16382-3.patch uploaded by jpeeler (license 325) Tested by: + zerohalo ........ + + * main/asterisk.c, include/asterisk.h, main/pbx.c, /: Merged + revisions 294384 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r294384 | jpeeler | 2010-11-09 11:37:59 -0600 (Tue, 09 Nov 2010) + | 47 lines Fix a deadlock in device state change processing. + Copied from some notes from the original author (Russell): + Deadlock scenario: Thread 1: device state change thread Holds - + rdlock on contexts Holds - hints lock Waiting on channels + container lock Thread 2: SIP monitor thread Holds the "iflock" + Holds a sip_pvt lock Holds channel container lock Waiting for a + channel lock Thread 3: A channel thread (chan_local in this case) + Holds 2 channel locks acquired within app_dial Holds a 3rd + channel lock it got inside of chan_local Holds a local_pvt lock + Waiting on a rdlock of the contexts lock A bunch of other threads + waiting on a wrlock of the contexts lock To address this + deadlock, some locking order rules must be put in place and + enforced. Existing relevant rules: 1) channel lock before a pvt + lock 2) contexts lock before hints lock 3) channels container + before a channel What's missing is some enforcement of the order + when you involve more than any two. To fix this problem, I put in + some code that ensures that (at least in the code paths involved + in this bug) the locks in (3) come before the locks in (2). To + change the operation of thread 1 to comply, I converted the + storage of hints to an astobj2 container. This allows processing + of hints without holding the hints container lock. So, in the + code path that led to thread 1's state, it no longer holds either + the contexts or hints lock while it attempts to lock the channels + container. (closes issue #18165) Reported by: antonio ABE-2583 + ........ + +2010-11-10 23:16 +0000 [r294571] Tilghman Lesher <tlesher@digium.com> + + * main/features.c: Actually pay attention to documented settings in + features.conf. (closes issue #16757) Reported by: voxter Patches: + 20101012__issue16757.diff.txt uploaded by tilghman (license 14) + Review: https://reviewboard.asterisk.org/r/994/ + +2010-11-10 12:41 +0000 [r294500] Russell Bryant <russell@digium.com> + + * main/devicestate.c: Improve a debug message to be more readable + and consistent. (closes issue #18282) Reported by: klaus3000 + Patches: ast_devstate2str-patch.txt uploaded by klaus3000 + (license 65) + +2010-11-09 20:27 +0000 [r294429] Tilghman Lesher <tlesher@digium.com> + + * configure, configure.ac: Detect GMime properly on systems where + gmime flags and libs are configured with pkg-config. (closes + issue #16155) Reported by: jcollie Patches: + 20100917__issue16155.diff.txt uploaded by tilghman (license 14) + Tested by: tilghman + +2010-11-08 22:30 +0000 [r294277-294312] Jeff Peeler <jpeeler@digium.com> + + * res/res_timing_timerfd.c: add missing unlock not present in + 294277 + + * main/timing.c, main/channel.c, res/res_timing_timerfd.c, + include/asterisk/timing.h: Fix playback failure when using IAX + with the timerfd module. To fix this issue the alert pipe will + now be used when the timerfd module is in use. There appeared to + be a race that was not solved by adding locking in the timerfd + module, but needed to be there anyway. The race was between the + timer being put in non-continuous mode in ast_read on the channel + thread and the IAX frame scheduler queuing a frame which would + enable continuous mode before the non-continuous mode event was + read. This race for now is simply avoided. (closes issue #18110) + Reported by: tpanton Tested by: tpanton I put tested by tpanton + because it was tested on his hardware. Thanks for the remote + access to debug this issue! + +2010-11-08 20:50 +0000 [r294242] Matthew Nicholson <mnicholson@digium.com> + + * channels/chan_sip.c: Go off hold when we get an empty reinvite + telling us to. (closes issue 0014448) Reported by: frawd (closes + issue #17878) Reported by: frawd + +2010-11-05 00:06 +0000 [r293969] Shaun Ruffell <sruffell@digium.com> + + * codecs/codec_dahdi.c, /: Merged revisions 293968 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r293968 | sruffell | 2010-11-04 19:02:53 -0500 (Thu, 04 + Nov 2010) | 17 lines codecs/codec_dahdi: Prevent "choppy" audio + when receiving unexpected frame sizes. dahdi-linux 2.4.0 + (specifically commit 9034) added the capability for the wctc4xxp + to return more than a single packet of data in response to a + read. However, when decoding packets, codec_dahdi was still + assuming that the default number of samples was in each read. In + other words, each packet your provider sent you, regardless of + size, would result in 20 ms of decoded data (30 ms if decoding + G723). If your provider was sending 60 ms packets then + codec_dahdi would end up stripping 40 ms of data from each + transcoded frame resulting in "choppy" audio. This would only + affect systems where G729 packets are arriving in sizes greater + than 20ms or G723 packets arriving in sizes greater than 30ms. + DAHDI-744. ........ + +2010-11-03 18:31 +0000 [r293806] Richard Mudgett <rmudgett@digium.com> + + * channels/chan_dahdi.c, /: Merged revisions 293805 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r293805 | rmudgett | 2010-11-03 13:23:04 -0500 (Wed, 03 + Nov 2010) | 20 lines Party A in an analog 3-way call would + continue to hear ringback after party C answers. All parties are + analog FXS ports. 1) A calls B. 2) A flash hooks to call C. 3) A + flash hooks to bring C into 3-way call before C answers. (A and B + hear ringback) 4) C answers 5) A continues to hear ringback + during the 3-way call. (All parties can hear each other.) * Fixed + use of wrong variable in dahdi_bridge() that stopped ringback on + the wrong subchannel. * Made several debug messages have more + information. A similar issue happens if B and C are SIP channels. + B continues to hear ringback. For some reason this only affects + v1.8 and trunk. * Don't start ringback on the real and 3-way + subchannels when creating the 3-way conference. Removing this + code is benign on v1.6.2 and earlier. ........ + +2010-11-02 23:07 +0000 [r293723] Jeff Peeler <jpeeler@digium.com> + + * /, channels/chan_sip.c: Merged revisions 293722 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r293722 | jpeeler | 2010-11-02 18:02:51 -0500 (Tue, 02 Nov 2010) + | 8 lines Add enabled/disabled information for rtautoclear sip + show settings output. When setting to zero/"no", the numeric + default was shown making it not obvious the disabled setting was + respected. (closes issue #18123) Reported by: zerohalo ........ + +2010-11-02 21:26 +0000 [r293647] Richard Mudgett <rmudgett@digium.com> + + * channels/chan_dahdi.c, /: Merged revisions 293639 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r293639 | rmudgett | 2010-11-02 16:24:13 -0500 (Tue, 02 + Nov 2010) | 6 lines Make warning message have more useful + information in it. Change "Unable to get index, and nullok is not + asserted" to "Unable to get index for '<channel-name>' on channel + <number> (<function>(), line <number>)". ........ + +2010-10-30 01:49 +0000 [r293340-293417] Richard Mudgett <rmudgett@digium.com> + + * channels/chan_dahdi.c, /: Merged revisions 293416 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r293416 | rmudgett | 2010-10-29 20:45:49 -0500 (Fri, 29 + Oct 2010) | 1 line Remove some more code that serves no purpose. + ........ + + * channels/chan_dahdi.c, /: Merged revisions 293339 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r293339 | rmudgett | 2010-10-29 19:34:12 -0500 (Fri, 29 + Oct 2010) | 1 line Remove some code that serves no purpose. + ........ + +2010-10-28 19:54 +0000 [r293195-293196] Tilghman Lesher <tlesher@digium.com> + + * main/ast_expr2.c, main/ast_expr2.h: Merged revisions 293194 via + svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) + | 5 lines "!00" evaluated as false, which is incorrect. Fixing. + Reported (though the reporter did not understand he was reporting + a bug) on the asterisk-users list: + http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html + ........ + + * /, res/ael/ael.tab.c, main/ast_expr2.y, res/ael/ael_lex.c, + res/ael/ael.tab.h: Merged revisions 293194 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) + | 5 lines "!00" evaluated as false, which is incorrect. Fixing. + Reported (though the reporter did not understand he was reporting + a bug) on the asterisk-users list: + http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html + ........ + +2010-10-28 16:09 +0000 [r293158] Jeff Peeler <jpeeler@digium.com> + + * funcs/func_strings.c: Fix infinite loop in FILTER(). Specifically + when you're using characters above \x7f or invalid character + escapes (e.g. \xgg). (closes issue #18060) Reported by: wdoekes + Patches: issue18060_func_strings_filter_infinite_loop.patch + uploaded by wdoekes (license 717) Tested by: wdoekes + +2010-10-26 18:33 +0000 [r293118] Jeff Peeler <jpeeler@digium.com> + + * apps/app_voicemail.c, /: Merged revisions 293004 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r293004 | jpeeler | 2010-10-25 17:55:28 -0500 (Mon, 25 + Oct 2010) | 29 lines Fix inprocess_container in voicemail to + correctly restrict max messages. The comparison function logic + was off, so the number of sessions for a given mailbox were not + being incremented properly. This problem caused the maximum + number of messages per folder to not be respected when + simultaneously leaving multiple voicemails just below the + threshold. These problems should be fixed by the above, but just + in case: Fixed resequence_mailbox to rely on the actual number of + detected number of files in a directory rather than just assuming + only 10 messages more than the maximum had been left. Also if + more messages than the maximum are deleted they are actually + removed now. The second purpose of this commit should have been + separated out probably, but is related to the above. Again, if + the number of messages in a given voicemail folder exceeds the + maximum set limit make sure to allocate enough space for the + deleted and heard index tracking array. A few random fixes: There + was a forgotten decrement of the inprocess count in + imap_store_file. When using IMAP storage, do not look in the + directory where file based storage messages may still reside and + influence the message count. Ensure to use only the first format + in sendmail. ABE-2516 ........ + +2010-10-25 19:06 +0000 [r292867] David Vossel <dvossel@digium.com> + + * channels/chan_local.c, /: Merged revisions 292866 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r292866 | dvossel | 2010-10-25 14:05:07 -0500 (Mon, 25 + Oct 2010) | 27 lines This patch turns chan_local pvts into + astobj2 objects. chan_local does some dangerous things involving + deadlock avoidance. tech_pvt functions like hangup and + queue_frame are provided with a locked channel upon entry. Those + functions are completely safe as long as you don't attempt to + give up that channel lock, but that is impossible to guarantee + due to the required deadlock avoidance necessary to lock both the + tech_pvt and both channels involved. In the past, we have tried + to account for this by doing things like setting a "glare" flag + that indicates what function should destroy the pvt. This was + used in local_hangup and local_queue_frame to decided who should + destroy the pvt if they collided in separate threads. I have + removed the need to do this by converting all chan_local + tech_pvts to astobj2. This means we can ref a pvt before deadlock + avoidance and not have to worry about that pvt possibly getting + destroyed under us. It also cleans up where we destroy the + tech_pvt. The only unlink from the tech_pvt container occurs in + local_hangup now, which is where it should occur. Since there + still may be thread collisions on some functions like + local_hangup after deadlock avoidance, I have added some checks + to detect those collisions and exit appropriately. I think this + patch is going to solve quite a bit of weirdness we have had with + local channels in the past. ........ + +2010-10-22 21:16 +0000 [r292786] Leif Madsen <lmadsen@digium.com> + + * contrib/scripts/asterisk.ldif, channels/chan_sip.c, + configs/res_ldap.conf.sample: Update the LDIF file for LDAP. The + LDIF file asterisk.ldif was quite a bit out of date from the + asterisk.ldap-schema file, so I've now updated that to be in + sync. The asterisk.ldif file being out of sync was a problem on + my systems where I was doing an ldapadd to import the schema into + the LDAP database, and the existing file would cause problems and + ERROR messages when registering. Additional documention has been + added based on feedback in the issue I'm closing. (closes issue + #13861) Reported by: scramatte Patches: ldap-update.txt uploaded + by lmadsen (license 10) Tested by: lmadsen, jcovert, suretec, + rgenthner + +2010-10-21 13:11 +0000 [r292556] Leif Madsen <lmadsen@digium.com> + + * configs/res_ldap.conf.sample: Change res_ldap.sample.conf to + match the schema. (closes issue #17376) Reported by: jcovert + Patches: res_ldap.conf.sample.patch uploaded by jcovert (license + 551) + +2010-10-21 00:05 +0000 [r292412] Paul Belanger <paul.belanger@polybeacon.com> + + * apps/app_dial.c, /: Merged revisions 292411 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r292411 | pabelanger | 2010-10-20 20:00:51 -0400 (Wed, 20 Oct + 2010) | 10 lines Record priv-recordintro as sln, not gsm This + removes the gsm->sln step when transcoding priv-recordintro. + (closes issue #18176) Reported by: pabelanger Patches: + chan_sip.diff uploaded by pabelanger (license 224) ........ + +2010-10-18 22:01 +0000 [r292229] Leif Madsen <lmadsen@digium.com> + + * sounds/Makefile: Fix typo in the sounds/Makefile. (Issue #17426) + +2010-10-18 21:54 +0000 [r292226] Jeff Peeler <jpeeler@digium.com> + + * apps/app_voicemail.c, /: Merged revisions 292223 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r292223 | jpeeler | 2010-10-18 16:50:30 -0500 (Mon, 18 + Oct 2010) | 11 lines Fix improper operator key acceptance and + clean up temp recording files. This is a fix for when pressing + the operator key after recording an unavailable, busy, name, or + temporary message in mailbox options. The operator key should not + be accepted here, but should be allowed during the message + recording. If the operator key is pressed during ensure the file + is saved or deleted as apporopriate. Also, ensure removal of + temporary recorded files after an early hang up or when message + acceptance confirmation times out. ABE-2518 ........ + +2010-10-18 21:50 +0000 [r292224] Leif Madsen <lmadsen@digium.com> + + * sounds/Makefile, /, sounds/sounds.xml: Merged revisions 292222 + via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r292222 | lmadsen | 2010-10-18 16:47:25 -0500 (Mon, 18 Oct 2010) + | 9 lines Add support for the new English (Australian Accent) + sound files. (closes issue #17426) Reported by: camsown Patches: + core-sounds-en_AU.txt uploaded by camsown (license 1050) + add_AU_sounds.patch.txt uploaded by lmadsen (license 10) Tested + by: camsown, lmadsen, jtodd, qwell ........ + +2010-10-16 10:03 +0000 [r292049] Tzafrir Cohen <tzafrir.cohen@xorcom.com> + + * res/res_musiconhold.c, configs/musiconhold.conf.sample: Base + directory for MOH should be ASTDATADIR If the directive + 'directory' is relative, make it relative to the datadir, rather + than to the varlibdir. In the sample configuration it is relative + ('moh'). This has no effect unless you have actively set the + datadir explicitly (at build time or at run time). (closes issue + #16906) Patches: moh_datadir uploaded by tzafrir (license 46) + Review: https://reviewboard.asterisk.org/r/974/ + +2010-10-15 19:35 +0000 [r291939] Paul Belanger <paul.belanger@polybeacon.com> + + * configs/gtalk.conf.sample, /: Merged revisions 291938 via + svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r291938 | pabelanger | 2010-10-15 15:30:41 -0400 (Fri, 15 Oct + 2010) | 2 lines Clean up formatting. ........ + +2010-10-15 16:16 +0000 [r291904] Terry Wilson <twilson@digium.com> + + * res/res_jabber.c: Don't crash or deadlock on module unload We + can't hold the lock while pthread_join is called since + aji_log_hook will attempt to lock from the other therad. We + reorder the pthread_join and ast_aji_disconnect so that we don't + do an SSL_read() while SSL_shutdown is running, causing a crash. + +2010-10-13 23:36 +0000 [r291655] Richard Mudgett <rmudgett@digium.com> + + * channels/chan_dahdi.c, /: Merged revisions 291643 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r291643 | rmudgett | 2010-10-13 18:29:58 -0500 (Wed, 13 + Oct 2010) | 20 lines Deadlock between dahdi_exception() and + dahdi_indicate(). There is a deadlock between dahdi_exception() + and dahdi_indicate() for analog ports. The call-waiting and + three-way-calling feature can experience deadlock if these + features are trying to do something and an event from the bridged + channel happens at the same time. Deadlock avoidance code added + to obtain necessary channel locks before attemting an operation + with call-waiting and three-way-calling. (closes issue #16847) + Reported by: shin-shoryuken Patches: issue_16847_v1.4.patch + uploaded by rmudgett (license 664) issue_16847_v1.6.2.patch + uploaded by rmudgett (license 664) issue_16847_v1.8_v2.patch + uploaded by rmudgett (license 664) Tested by: alecdavis, rmudgett + Review: https://reviewboard.asterisk.org/r/971/ ........ + +2010-10-13 22:58 +0000 [r291580] Terry Wilson <twilson@digium.com> + + * main/channel.c, /: Merged revisions 291577 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r291577 | twilson | 2010-10-13 15:45:15 -0700 (Wed, 13 Oct 2010) + | 21 lines Don't ignore frames that have been queued when + softhangup'd When an outgoing call is answered and hung up by the + far end *very* quickly, we may not read any frames and therefor + end up with a call that displays the wrong + disposition/DIALSTATUS. The reason is because ast_queue_hangup() + immediately sets the _softhangup flag on the channel and then + queues the HANGUP control frame, but __ast_read refuses to read + any frames if ast_check_hangup() indicates that a hangup request + has been made (which it will if _softhangup is set). So, we end + up losing control frames. This change makes __ast_read continue + to read frames even if a soft hangup has been requested. It + queues a hangup frame to make sure that __ast_read() will still + eventually return NULL. Much thanks to David Vossel for all of + the reviews, discussion, and help! (closes issue #16946) Reported + by: davidw Review: https://reviewboard.asterisk.org/r/740/ + ........ + +2010-10-13 15:29 +0000 [r291393] Russell Bryant <russell@digium.com> + + * /, channels/chan_sip.c: Merged revisions 291392 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r291392 | russell | 2010-10-13 10:23:19 -0500 (Wed, 13 Oct 2010) + | 6 lines Lock pvt so pvt->owner can't disappear when queueing up + a frame. This fixes a crash due to a hangup race condition. + ABE-2601 ........ + +2010-10-12 17:20 +0000 [r291280] Leif Madsen <lmadsen@digium.com> + + * configs/phoneprov.conf.sample: Add undocumented variables to + phoneprov.conf.sample (closes issue #18107) Reported by: lathama + Patches: phoneprov.conf.sample.diff uploaded by lathama (license + 1028) + +2010-10-12 17:05 +0000 [r291264] Tilghman Lesher <tlesher@digium.com> + + * /, main/acl.c: Merged revisions 291263 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r291263 | tilghman | 2010-10-12 11:55:30 -0500 (Tue, 12 Oct 2010) + | 2 lines Oops, incorrect range (although unallocated at ARIN) + ........ + +2010-10-12 16:07 +0000 [r291229] Leif Madsen <lmadsen@digium.com> + + * configs/manager.conf.sample: Add documention that mentions + options are defined but not used. (Issue #18101) + +2010-10-11 18:39 +0000 [r291073-291111] Richard Mudgett <rmudgett@digium.com> + + * channels/chan_sip.c: Make exit from handle_request_do() + consistent. + + * /, channels/chan_sip.c: Merged revisions 291109 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r291109 | rmudgett | 2010-10-11 13:29:43 -0500 (Mon, 11 Oct 2010) + | 1 line Add missing unlock to an exception condition in + reload_config(). ........ + + * main/cli.c: Fixed infinite loop in verbose/debug message output. + Setting the module/filename specific message level and then + changing it resulted in the linked list being looped on itself. + Traversing this linked list is an infinite loop if what you are + looking for is not in the list. Also plugged some CLI parsing + holes in the associated CLI command: * Removing a nonexistent + module from the list actually added it with a level of zero. * + Setting the non-module specific level to zero is now equivalent + to setting it to "off" as documented. + +2010-10-08 02:45 +0000 [r290863] Jeff Peeler <jpeeler@digium.com> + + * main/asterisk.c, /: Merged revisions 290862 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r290862 | jpeeler | 2010-10-07 21:35:29 -0500 (Thu, 07 Oct 2010) + | 9 lines Ensure editline cleanup occurs when Ctrl-C is pressed + at control console. A recent change was made to avoid a race + condition on shutdown which only called the end functions from + the console thread. However, when pressing Ctrl-C the quit + handler is called from the signal handler thread. (closes issue + #17698) Reported by: jmls ........ + +2010-10-07 20:57 +0000 [r290751] Jason Parker <jparker@digium.com> + + * autoconf/ast_ext_lib.m4, /, configure, + include/asterisk/autoconfig.h.in: Merged revisions 290750 via + svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r290750 | qwell | 2010-10-07 15:56:04 -0500 (Thu, 07 Oct 2010) | + 9 lines Allow PRI to build properly when using --with-pri. Use + the directories found for the parent when using lib dependencies. + (closes issue #17314) Reported by: tzafrir Patches: + 17314-withdeps.diff uploaded by qwell (license 4) ........ + +2010-10-07 10:53 +0000 [r290712] Russell Bryant <russell@digium.com> + + * main/pbx.c: Don't crash when Set() is called without a value. + Review: https://reviewboard.asterisk.org/r/949/ + +2010-10-06 13:48 +0000 [r290396-290575] Tilghman Lesher <tlesher@digium.com> + + * main/file.c: Allow streaming audio from a pipe. (closes issue + #18001) Reported by: jamicque Patches: + 20100926__issue18001.diff.txt uploaded by tilghman (license 14) + Tested by: jamicque + + * res/res_jabber.c, /: Merged revisions 290392 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r290392 | tilghman | 2010-10-05 15:20:07 -0500 (Tue, 05 Oct 2010) + | 8 lines Fix a crash by ensuring that we don't alter memory + after it's freed. (closes issue #17387) Reported by: jmls + Patches: 20100726__issue17387.diff.txt uploaded by tilghman + (license 14) Tested by: jmls ........ + +2010-10-05 19:54 +0000 [r290375] David Vossel <dvossel@digium.com> + + * apps/app_directed_pickup.c: Fixes PickupChan() not working with + full channel name. (closes issue #18011) Reported by: schern + Patches: app_directed_pickup.c.2.patch uploaded by schern + (license 995) app_directed_pickup.c.trunk.patch uploaded by + schern (license 995) Tested by: schern, dvossel + +2010-10-05 17:42 +0000 [r290324] Richard Mudgett <rmudgett@digium.com> + + * contrib/valgrind.supp, /: Merged revisions 290323 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ................ r290323 | rmudgett | 2010-10-05 12:41:18 -0500 + (Tue, 05 Oct 2010) | 11 lines Merged revision 258974 from + https://origsvn.digium.com/svn/asterisk/trunk .......... r258974 + | diruggles | 2010-04-26 14:05:47 -0500 (Mon, 26 Apr 2010) | 4 + lines Line 24 missed in compatibility fix in revision 233577 + added a "fun:" prefix line 24 .......... ................ + +2010-10-04 23:14 +0000 [r290101-290254] Tilghman Lesher <tlesher@digium.com> + + * pbx/ael/ael-test/ref.ael-test19, + pbx/ael/ael-test/ref.ael-vtest13, res/ael/pval.c, main/pbx.c, + pbx/ael/ael-test/ref.ael-vtest17, + pbx/ael/ael-test/ref.ael-ntest10, pbx/ael/ael-test/ref.ael-test1, + pbx/ael/ael-test/ref.ael-test2, pbx/ael/ael-test/ref.ael-test3, + pbx/ael/ael-test/ref.ael-test4, pbx/ael/ael-test/ref.ael-test5: + Change new pattern matcher to regard dashes the same as the old + pattern matcher -- as visual candy to be ignored. Also change the + AEL parser to not generate dashes within extensions, as those + dashes would be ignored. Update the AEL tests to match this + behavior. (closes issue #17366) Reported by: murf Patches: + 20100727__issue17366.diff.txt uploaded by tilghman (license 14) + Tested by: tilghman + + * /, configure, configure.ac: Merged revisions 290177 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r290177 | tilghman | 2010-10-04 15:15:26 -0500 (Mon, 04 + Oct 2010) | 2 lines Fixing Mac OS X auto-builder. ........ + + * /, configure, configure.ac: Merged revisions 290100 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r290100 | tilghman | 2010-10-03 16:04:29 -0500 (Sun, 03 + Oct 2010) | 2 lines Automatically re-run configure test for + menuselect, when the relevant makeopts settings change. ........ + +2010-10-02 08:52 +0000 [r289950] Olle Johansson <oej@edvina.net> + + * main/manager.c, /: Merged revisions 289949 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289949 | oej | 2010-10-02 10:50:05 +0200 (Lör, 02 Okt 2010) | 2 + lines Add documentation for undocumented option to AMI action + originate ........ + +2010-10-02 04:45 +0000 [r289874] Tilghman Lesher <tlesher@digium.com> + + * apps/app_voicemail.c, /: Merged revisions 289873 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r289873 | tilghman | 2010-10-01 23:42:08 -0500 (Fri, 01 + Oct 2010) | 8 lines When forwarding a message, a prepend means + that the filesystem will always have a better copy. (closes issue + #17803) Reported by: dpetersen Patches: + 20100923__issue17803.diff.txt uploaded by tilghman (license 14) + Tested by: dpetersen ........ + +2010-10-01 23:01 +0000 [r289798] Jeff Peeler <jpeeler@digium.com> + + * main/rtp.c, /, channels/chan_sip.c, include/asterisk/rtp.h: + Merged revisions 289797 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289797 | jpeeler | 2010-10-01 17:58:38 -0500 (Fri, 01 Oct 2010) + | 15 lines Change RFC2833 DTMF event duration on end to report + actual elapsed time. The scenario here is with a non P2P early + media session. The reported time length of DTMF presses are + coming up short when sending to the remote side. Currently the + event duration is a running total that is incremented when + sending continuation packets. These continuation packets are only + triggered upon incoming media from the remote side, which means + that the running total probably is not going to end up matching + the actual length of time Asterisk received DTMF. This patch + changes the end event duration to be lengthened if it is detected + that the end event is going to come up short. Review: + https://reviewboard.asterisk.org/r/957/ ABE-2476 ........ + +2010-10-01 17:09 +0000 [r289704] Paul Belanger <paul.belanger@polybeacon.com> + + * res/res_jabber.c, /, configs/jabber.conf.sample: Merged revisions + 289703 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289703 | pabelanger | 2010-10-01 13:03:11 -0400 (Fri, 01 Oct + 2010) | 6 lines Disable debugging by default and reformat .config + file. Review: https://reviewboard.asterisk.org/r/929/ ........ + +2010-10-01 16:21 +0000 [r289700] Jeff Peeler <jpeeler@digium.com> + + * /, channels/chan_sip.c: Merged revisions 289699 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289699 | jpeeler | 2010-10-01 11:20:00 -0500 (Fri, 01 Oct 2010) + | 14 lines Ensure user portion of SIP URI matches dialplan when + using encoded characters. This commit takes a simliar approach to + 288112 and checks the dialplan to determine the proper action for + an incoming contact header as to whether or not it should be + decoded or not. sip_new was blindly always decoding the + extension, which also caused the outgoing contact header to be + incorrect as well as failing to match the encoded extension in + the dialplan. (closes issue #17892) Reported by: wdoekes Patches: + bug17892-1.patch uploaded by jpeeler (license 325) Tested by: + wdoekes ........ + +2010-10-01 09:42 +0000 [r289622] schmitds <schmitds@localhost>: + + * channels/chan_sip.c: don't iterate through all dialogs to find + and delete old subscribes On every incoming subscribe there is a + iteration through all dialogs to find old subscribes and delete + them. This is slow and not RFC conform. This was only needed in + 1.2 cause a subscribe was not deleted when a dialog was + destroyed, after 1.4 a subscribe get removed when its dialog is + destroyed. (closes issue #17950) Reported by: schmidts Tested by: + schmidts Review: https://reviewboard.asterisk.org/r/901/ + +2010-09-30 19:51 +0000 [r289553] Matthew Nicholson <mnicholson@digium.com> + + * channels/chan_sip.c: Properly handle channel allocation failures + duing invites with replaces. ABE-2588 + +2010-09-30 17:09 +0000 [r289501] Brett Bryant <bbryant@digium.com> + + * /, res/res_agi.c: Merged revisions 289500 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289500 | bbryant | 2010-09-30 13:08:20 -0400 (Thu, 30 Sep 2010) + | 11 lines res_agi.c:handle_getvariablefull() could recursively + lock a channel and not release it if an argument is the current + channel's name. (closes issue #17970) Reported by: mdu113 + Patches: res_agi.c.diff3 uploaded by mdu113 (license 582) Tested + by: mdu113 Review: https://reviewboard.asterisk.org/r/947/ + ........ + +2010-09-30 15:37 +0000 [r289425] Russell Bryant <russell@digium.com> + + * /, apps/app_sms.c: Merged revisions 289424 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289424 | russell | 2010-09-30 10:34:29 -0500 (Thu, 30 Sep 2010) + | 8 lines Fix a crash in app_sms. Since the data being passed to + the generator callback is on the stack of the SMS() application, + we must ensure that the generator is stopped before the + application exits. ABE-2587 ........ + +2010-09-29 21:03 +0000 [r289339] Jason Parker <jparker@digium.com> + + * main/channel.c, /, main/features.c: Merged revisions 289338 via + svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289338 | qwell | 2010-09-29 15:56:26 -0500 (Wed, 29 Sep 2010) | + 8 lines Allow a manager originate to succeed on forwarded + devices. The timeout to wait for an answer was being set to 0 + when a device forwarded to another extension. We don't always + need the timeout set like this, so make it an optional parameter, + and don't use it in this case. ABE-2544 ........ + +2010-09-29 20:24 +0000 [r289334] Leif Madsen <lmadsen@digium.com> + + * configs/res_ldap.conf.sample: Update sample documentation to note + md5secret requirements. + +2010-09-29 20:15 +0000 [r289332] Russell Bryant <russell@digium.com> + + * res/res_config_ldap.c: Don't completely ignore md5secret from + LDAP if the value does not begin with {md5}. This fixes a problem + that lmadsen ran in to where md5secret was not working for him. + +2010-09-29 15:04 +0000 [r289178] Matthew Nicholson <mnicholson@digium.com> + + * main/channel.c, /: Merged revisions 289177 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289177 | mnicholson | 2010-09-29 10:03:27 -0500 (Wed, 29 Sep + 2010) | 8 lines Set the caller id on CDRs when it is set on the + parent channel. (closes issue #17569) Reported by: tbelder + Patches: 17569.diff uploaded by tbelder (license 618) Tested by: + tbelder ........ + +2010-09-28 18:14 +0000 [r289095] Brett Bryant <bbryant@digium.com> + + * main/channel.c, /: Merged revisions 289094 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r289094 | bbryant | 2010-09-28 14:10:19 -0400 (Tue, 28 Sep 2010) + | 14 lines Fixes an issue with the Newchannel AMI event during + the Masquerading process. Fixes an issue with the Newchannel AMI + event during the Masquerading process, where no Newchannel AMI + event was generated for the psuedo channel used during the + masquerading process. (closes issue #17987) Reported by: + RadicAlish Patches: newchannel.patch.txt uploaded by RadicAlish + (license 1122) Tested by: RadicAlish Review: + https://reviewboard.asterisk.org/r/937/ ........ + +2010-09-24 15:37 +0000 [r288747] Terry Wilson <twilson@digium.com> + + * channels/chan_local.c, /: Merged revisions 288746 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r288746 | twilson | 2010-09-24 08:26:09 -0700 (Fri, 24 + Sep 2010) | 5 lines Don't fail a masquerade if it is already + being hung up This avoids noise on some Local channel situations + where we don't use /n. Thanks to Alec Davis for the suggestion. + ........ + +2010-09-24 13:53 +0000 [r288637-288712] Tilghman Lesher <tlesher@digium.com> + + * funcs/func_strings.c: Solaris won't printf a NULL. (closes issue + #18041) Reported by: asgaroth + + * cdr/cdr_pgsql.c, /, configure, include/asterisk/autoconfig.h.in, + include/asterisk/compat.h, main/strcompat.c, configure.ac, + include/asterisk/channel.h: Merged revisions 288636 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r288636 | tilghman | 2010-09-23 22:20:24 -0500 (Thu, 23 + Sep 2010) | 2 lines Solaris compatibility fixes ........ + +2010-09-22 23:10 +0000 [r288500] Terry Wilson <twilson@digium.com> + + * channels/chan_local.c, /: Merged revisions 288499 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r288499 | twilson | 2010-09-22 16:00:30 -0700 (Wed, 22 + Sep 2010) | 8 lines Don't let a Local channel get bridged to + itself If a local channel gets bridged to itself, it becomes + orphaned with no devices left to actually tell it to hang up. + This patch modifies local_fixup() to detect this case and deny + it. Review: https://reviewboard.asterisk.org/r/934 ........ + +2010-09-22 17:49 +0000 [r288344-288417] David Vossel <dvossel@digium.com> + + * /, channels/chan_sip.c: Merged revisions 288416 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r288416 | dvossel | 2010-09-22 12:48:15 -0500 (Wed, 22 Sep 2010) + | 5 lines RFC3261 section 12.2 explicitly says out of order + requests are responded with a 500 Server Internal Error response. + ABE-2458 ........ + + * /, channels/chan_sip.c: Merged revisions 288343 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r288343 | dvossel | 2010-09-22 11:49:56 -0500 (Wed, 22 Sep 2010) + | 2 lines During check_pendings, if the dialog is terminated with + a CANCEL, change the invitestate to INV_CANCEL like in + sip_hangup. ........ + +2010-09-22 16:44 +0000 [r288340] Russell Bryant <russell@digium.com> + + * main/asterisk.c, /: Merged revisions 288339 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r288339 | russell | 2010-09-22 11:39:16 -0500 (Wed, 22 Sep 2010) + | 11 lines Fix a 100% CPU consumption problem when setting + console=yes in asterisk.conf. The handling of -c and console=yes + should be the same, but they were not. When you specify -c, it + sets both a flag for console module and for asterisk not to + fork() off into the background. The handling of console=yes only + set console mode, so you would end up with a background process() + trying to run the Asterisk console and freaking out since it + didn't have anything to read input from. Thanks to beagles for + reporting and helping debug the problem! ........ + +2010-09-22 15:11 +0000 [r288267] Tilghman Lesher <tlesher@digium.com> + + * cdr/cdr_pgsql.c, configs/cdr_pgsql.conf.sample, /, UPGRADE.txt: + Merged revisions 288265-288266 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r288265 | tilghman | 2010-09-22 09:48:04 -0500 (Wed, 22 Sep 2010) + | 9 lines Allow the encoding to be set, in case local charset + does not agree with database. (closes issue #16940) Reported by: + jamicque Patches: 20100827__issue16940.diff.txt uploaded by + tilghman (license 14) 20100921__issue16940__1.6.2.diff.txt + uploaded by tilghman (license 14) Tested by: jamicque ........ + r288266 | tilghman | 2010-09-22 10:04:52 -0500 (Wed, 22 Sep 2010) + | 5 lines Document addition of encoding parameter. (issue #16940) + Reported by: jamicque ........ + +2010-09-22 00:03 +0000 [r288193] Richard Mudgett <rmudgett@digium.com> + + * channels/chan_iax2.c, /: Merged revisions 288192 via svnmerge + from https://origsvn.digium.com/svn/asterisk/branches/1.4 + ........ r288192 | rmudgett | 2010-09-21 18:55:58 -0500 (Tue, 21 + Sep 2010) | 26 lines In chan_iax2.c:schedule_delivery() calls + ast_bridged_channel() on an unlocked channel. Near the beginning + of schedule_delivery(), ast_bridged_channel() is called on + iaxs[fr->callno]->owner. However, the channel is not locked, + which can result in ast_bridged_channel() crashing should + owner->tech change to a technology that doesn't implement + bridged_channel. I also fixed the other calls to + ast_bridged_channel() in chan_iax2.c since the owner lock was not + held there either. Converted the existing channel deadlock + avoidance to use iax2_lock_owner(). Using the new function + simplified some awkward code. In the process of fixing the + locking on ast_bridged_channel(), I also found a memory leak in + socket_process() for v1.6.2 and v1.8. The local struct variable + ies.vars is not freed on early/abnormal function exits. (closes + issue #17919) Reported by: rain Patches: issue17919_v1.4.patch + uploaded by rmudgett (license 664) issue17919_w_leak_v1.6.2.patch + uploaded by rmudgett (license 664) issue17919_w_leak_v1.8.patch + uploaded by rmudgett (license 664) Review: + https://reviewboard.asterisk.org/r/926/ ........ + +2010-09-21 22:22 +0000 [r288147] Paul Belanger <paul.belanger@polybeacon.com> + + * channels/chan_iax2.c: Setup timer before set_config(). (closes + issue #18019) Reported by: Netview Patches: issue_0018019.patch + uploaded by pabelanger (license 224) Tested by: Netview + +2010-09-21 21:59 +0000 [r288113] Tilghman Lesher <tlesher@digium.com> + + * /, channels/chan_sip.c: Merged revisions 288112 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r288112 | tilghman | 2010-09-21 16:58:13 -0500 (Tue, 21 Sep 2010) + | 15 lines Try both the encoded and unencoded subscription URI + for a match in hints. When a phone sends an encoded URI for a + subscription, the URI is not matched with the actual hint that is + in decoded format. For example, if we have an extension with a + hint that is named: "#5601" or "*5601", the subscription will + work fine if the phone subscribes with an already decoded URI, + but when it's decoded like "%255601" or "%2A5601", Asterisk is + unable to match it with the correct hint. (closes issue #17785) + Reported by: ramonpeek Patches: 20100831__issue17785.diff.txt + uploaded by tilghman (license 14) Tested by: ramonpeek ........ + +2010-09-21 19:46 +0000 [r288006] Brett Bryant <bbryant@digium.com> + + * main/channel.c, /: Merged revisions 288005 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r288005 | bbryant | 2010-09-21 15:43:46 -0400 (Tue, 21 Sep 2010) + | 8 lines Add a check to fix a rare segmentation fault you'd get + if ast_frdup couldn't allocate memory on the first frame being + queued in ast_queue_frame. (closes issue #17882) Reported by: + seanbright Tested by: seanbright ........ + +2010-09-21 19:07 +0000 [r287934] Tilghman Lesher <tlesher@digium.com> + + * main/asterisk.c, /: Merged revisions 287933 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r287933 | tilghman | 2010-09-21 14:07:07 -0500 (Tue, 21 Sep 2010) + | 2 lines Less than zero is an error, not any non-zero value. + ........ + +2010-09-20 23:58 +0000 [r287759] Brett Bryant <bbryant@digium.com> + + * /, apps/app_meetme.c: Merged revisions 287758 via svnmerge from + https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ + r287758 | bbryant | 2010-09-20 19:57:08 -0400 (Mon, 20 Sep 2010) + | 16 lines Fix misvalidation of meetme pins in conjunction with + the 'a' MeetMe flag. When using the 'a' MeetMe flag and having a + user and admin pin setup for your conference, using the user pin + would gain you admin priviledges. Also, when no user pin was set, + an admin pin was, the 'a' MeetMe flag wasn't used, and the user + tried to enter a conference then they were still prompted for a + pin and forced to hit #. (closes issue #17908) Reported by: kuj + Patches: pins_2.patch uploaded by kuj (license 1111) Tested by: + kuj Review: [full review board URL with trailing slash] ........ + +2010-09-20 23:16 +0000 [r287685] Alec L Davis <sivad.a@paradise.net.nz> + + * main/channel.c: ast_channel_masquerade: Avoid recursive + masquerades. Check all 4 combinations of (original/clonechan) * + (masq/masqr). Initially original->masq and clonechan->masqr were + only checked. It's possible with multiple masq's planned - and + not yet executed, that the 'original' chan could already have + another masq'd into it - thus original->masqr would be set, that + masqr would lost. Likewise for the clonechan->masq. (closes issue + #16057;#17363) Reported by: amorsen;davidw,alecdavis Patches: + based on bug16057.diff4.txt uploaded by alecdavis (license 585) + Tested by: ramonpeek, davidw, alecdavis + +2010-09-20 21:28 +0000 [r287642] Jason Parker <jparker@digium.com> + + * channels/chan_skinny.c: Don't crash when parking a non-bridged + call. (closes issue #17680) Reported by: jmhunter Patches: + chan_skinny-park-v1.txt uploaded by DEA (license 3) Tested by: + jmhunter, DEA + 2010-11-02 Leif Madsen <lmadsen@digium.com> * Asterisk 1.6.2.14 Released. diff --git a/UPGRADE.txt b/UPGRADE.txt index 53182753e..7f0642b4f 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -126,6 +126,11 @@ From 1.6.1 to 1.6.2: * The cdr.conf file must exist and be configured correctly in order for CDR records to be written. +* cdr_pgsql now assumes the encoding of strings it is handed are in LATIN9, + which should cover most uses of the extended ASCII set. If your strings + use a different encoding in Asterisk, the "encoding" parameter may be set + to specify the correct character set. + From 1.6.0.1 to 1.6.1: * The ast_agi_register_multiple() and ast_agi_unregister_multiple() diff --git a/apps/app_dial.c b/apps/app_dial.c index f2735a63e..0424ec0d8 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1469,7 +1469,7 @@ static int setup_privacy_args(struct privacy_args *pa, */ silencethreshold = ast_dsp_get_threshold_from_settings(THRESHOLD_SILENCE); ast_answer(chan); - res = ast_play_and_record(chan, "priv-recordintro", pa->privintro, 4, "gsm", &duration, silencethreshold, 2000, 0); /* NOTE: I've reduced the total time to 4 sec */ + res = ast_play_and_record(chan, "priv-recordintro", pa->privintro, 4, "sln", &duration, silencethreshold, 2000, 0); /* NOTE: I've reduced the total time to 4 sec */ /* don't think we'll need a lock removed, we took care of conflicts by naming the pa.privintro file */ if (res == -1) { diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index a00cd475e..26fc610a3 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -129,16 +129,24 @@ static struct ast_channel *my_ast_get_channel_by_name_locked(const char *channam size_t channame_len, chkchan_len; channame_len = strlen(channame); - chkchan_len = channame_len + 1; - chkchan = alloca(chkchan_len + 1); - - /* need to append a '-' for the comparison so we check full channel name, - * i.e SIP/hgc- , use a temporary variable so original stays the same for - * debugging. + /* Check if channel name contains a '-'. + * In this case the channel name will be interpreted as full channel name. */ - strcpy(chkchan, channame); - strcat(chkchan, "-"); + if (strchr(channame, '-')) { + /* check full channel name */ + chkchan_len = channame_len; + chkchan = (char *)channame; + } else { + /* need to append a '-' for the comparison so we check full channel name, + * i.e SIP/hgc- , use a temporary variable so original stays the same for + * debugging. + */ + chkchan_len = channame_len + 1; + chkchan = alloca(chkchan_len + 1); + strcpy(chkchan, channame); + strcat(chkchan, "-"); + } for (chan = ast_walk_channel_by_name_prefix_locked(NULL, channame, channame_len); chan; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 4ef16189d..59ba74355 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3983,9 +3983,13 @@ static int conf_exec(struct ast_channel *chan, void *data) res = -1; } } else { - if (((!ast_strlen_zero(cnf->pin) && - !ast_test_flag(&confflags, CONFFLAG_ADMIN)) || - !ast_strlen_zero(cnf->pinadmin)) && + if (((!ast_strlen_zero(cnf->pin) && + !ast_test_flag(&confflags, CONFFLAG_ADMIN)) || + (!ast_strlen_zero(cnf->pinadmin) && + ast_test_flag(&confflags, CONFFLAG_ADMIN)) || + (!ast_strlen_zero(cnf->pin) && + ast_strlen_zero(cnf->pinadmin) && + ast_test_flag(&confflags, CONFFLAG_ADMIN))) && (!(cnf->users == 0 && cnf->isdynamic))) { char pin[MAX_PIN] = ""; int j; @@ -4000,9 +4004,11 @@ static int conf_exec(struct ast_channel *chan, void *data) res = ast_app_getdata(chan, "conf-getpin", pin + strlen(pin), sizeof(pin) - 1 - strlen(pin), 0); } if (res >= 0) { - if (!strcasecmp(pin, cnf->pin) || - (!ast_strlen_zero(cnf->pinadmin) && - !strcasecmp(pin, cnf->pinadmin))) { + if ((!strcasecmp(pin, cnf->pin) && + (ast_strlen_zero(cnf->pinadmin) || + !ast_test_flag(&confflags, CONFFLAG_ADMIN))) || + (!ast_strlen_zero(cnf->pinadmin) && + !strcasecmp(pin, cnf->pinadmin))) { /* Pin correct */ allowretry = 0; if (!ast_strlen_zero(cnf->pinadmin) && !strcasecmp(pin, cnf->pinadmin)) { diff --git a/apps/app_sms.c b/apps/app_sms.c index bbf014065..3d79bf65f 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -2039,6 +2039,12 @@ static int sms_exec(struct ast_channel *chan, void *data) } res = h.err; /* XXX */ + /* + * The SMS generator data is on the stack. We _MUST_ make sure the generator + * is stopped before returning from this function. + */ + ast_deactivate_generator(chan); + sms_log(&h, '?'); /* log incomplete message */ done: return (res); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 5b80e01ce..73c4ee2e5 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -627,6 +627,7 @@ struct vm_state { char intro[PATH_MAX]; int *deleted; int *heard; + int dh_arraysize; /* used for deleted / heard allocation */ int curmsg; int lastmsg; int newmessages; @@ -851,7 +852,7 @@ static int inprocess_hash_fn(const void *obj, const int flags) static int inprocess_cmp_fn(void *obj, void *arg, int flags) { struct inprocess *i = obj, *j = arg; - if (!strcmp(i->mailbox, j->mailbox)) { + if (strcmp(i->mailbox, j->mailbox)) { return 0; } return !strcmp(i->context, j->context) ? CMP_MATCH : 0; @@ -870,6 +871,9 @@ static int inprocess_count(const char *context, const char *mailbox, int delta) ao2_ref(i, -1); return ret; } + if (delta < 0) { + ast_log(LOG_WARNING, "BUG: ref count decrement on non-existing object???\n"); + } if (!(i = ao2_alloc(sizeof(*i) + strlen(context) + strlen(mailbox) + 2, NULL))) { ao2_unlock(inprocess_container); return 0; @@ -1546,6 +1550,33 @@ static void free_user(struct ast_vm_user *vmu) } } +static int vm_allocate_dh(struct vm_state *vms, struct ast_vm_user *vmu, int count_msg) { + + int arraysize = (vmu->maxmsg > count_msg ? vmu->maxmsg : count_msg); + if (!vms->dh_arraysize) { + /* initial allocation */ + if (!(vms->deleted = ast_calloc(arraysize, sizeof(int)))) { + return -1; + } + if (!(vms->heard = ast_calloc(arraysize, sizeof(int)))) { + return -1; + } + vms->dh_arraysize = arraysize; + } else if (vms->dh_arraysize < arraysize) { + if (!(vms->deleted = ast_realloc(vms->deleted, arraysize * sizeof(int)))) { + return -1; + } + if (!(vms->heard = ast_realloc(vms->heard, arraysize * sizeof(int)))) { + return -1; + } + memset(vms->deleted, 0, arraysize * sizeof(int)); + memset(vms->heard, 0, arraysize * sizeof(int)); + vms->dh_arraysize = arraysize; + } + + return 0; +} + /* All IMAP-specific functions should go in this block. This * keeps them from being spread out all over the code */ #ifdef IMAP_STORAGE @@ -1947,9 +1978,11 @@ static int imap_check_limits(struct ast_channel *chan, struct vm_state *vms, str } /* Check if we have exceeded maxmsg */ - if (msgnum >= vmu->maxmsg - inprocess_count(vmu->mailbox, vmu->context, 0)) { - ast_log(AST_LOG_WARNING, "Unable to leave message since we will exceed the maximum number of messages allowed (%u > %u)\n", msgnum, vmu->maxmsg); + ast_debug(3, "Checking message number quota: mailbox has %d messages, maximum is set to %d, current messages %d\n", msgnum, vmu->maxmsg, inprocess_count(vmu->mailbox, vmu->context, 0)); + if (msgnum >= vmu->maxmsg - inprocess_count(vmu->mailbox, vmu->context, +1)) { + ast_log(LOG_WARNING, "Unable to leave message since we will exceed the maximum number of messages allowed (%u >= %u)\n", msgnum, vmu->maxmsg); ast_play_and_wait(chan, "vm-mailboxfull"); + pbx_builtin_setvar_helper(chan, "VMSTATUS", "FAILED"); return -1; } @@ -2095,7 +2128,7 @@ static int imap_store_file(const char *dir, const char *mailboxuser, const char if (tempcopy) *(vmu->email) = '\0'; - + inprocess_count(vmu->mailbox, vmu->context, -1); return 0; } @@ -2422,6 +2455,17 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) mail_search_full (vms->mailstream, NULL, pgm, NIL); vms->lastmsg = vms->vmArrayIndex - 1; mail_free_searchpgm(&pgm); + /* Since IMAP storage actually stores both old and new messages in the same IMAP folder, + * ensure to allocate enough space to account for all of them. Warn if old messages + * have not been checked first as that is required. + */ + if (box == 0 && !vms->dh_arraysize) { + ast_log(LOG_WARNING, "The code expects the old messages to be checked first, fix the code.\n"); + } + if (vm_allocate_dh(vms, vmu, box == 0 ? vms->vmArrayIndex + vms->oldmessages : vms->lastmsg)) { + ast_mutex_unlock(&vms->lock); + return -1; + } ast_mutex_unlock(&vms->lock); return 0; @@ -4533,11 +4577,18 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *c FILE *p=NULL; char tmp[80] = "/tmp/astmail-XXXXXX"; char tmp2[256]; + char *stringp; if (vmu && ast_strlen_zero(vmu->email)) { ast_log(AST_LOG_WARNING, "E-mail address missing for mailbox [%s]. E-mail will not be sent.\n", vmu->mailbox); return(0); } + + /* Mail only the first format */ + format = ast_strdupa(format); + stringp = format; + strsep(&stringp, "|"); + if (!strcmp(format, "wav49")) format = "WAV"; ast_debug(3, "Attaching file '%s', format '%s', uservm is '%d', global is %d\n", attach, format, attach_user_voicemail, ast_test_flag((&globalflags), VM_ATTACH)); @@ -4956,18 +5007,12 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i recipmsgnum = last_message_index(recip, todir) + 1; if (recipmsgnum < recip->maxmsg - (imbox ? 0 : inprocess_count(vmu->mailbox, vmu->context, 0))) { make_file(topath, sizeof(topath), todir, recipmsgnum); - if (EXISTS(fromdir, msgnum, frompath, chan->language)) { - COPY(fromdir, msgnum, todir, recipmsgnum, recip->mailbox, recip->context, frompath, topath); - } else { - /* For ODBC storage, if the file we want to copy isn't yet in the database, then the SQL - * copy will fail. Instead, we need to create a local copy, store it, and delete the local - * copy. We don't have to #ifdef this because if file storage reaches this point, there's a - * much worse problem happening and IMAP storage doesn't call this function - */ - copy_plain_file(frompath, topath); - STORE(todir, recip->mailbox, recip->context, recipmsgnum, chan, recip, fmt, duration, NULL, NULL); - vm_delete(topath); - } + /* If we are prepending a message for ODBC, then the message already + * exists in the database, but we want to force copying from the + * filesystem (since only the FS contains the prepend). */ + copy_plain_file(frompath, topath); + STORE(todir, recip->mailbox, recip->context, recipmsgnum, chan, recip, fmt, duration, NULL, NULL); + vm_delete(topath); } else { ast_log(AST_LOG_ERROR, "Recipient mailbox %s@%s is full\n", recip->mailbox, recip->context); res = -1; @@ -5292,7 +5337,14 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ DISPOSE(tempfile, -1); /* It's easier just to try to make it than to check for its existence */ +#ifndef IMAP_STORAGE create_dirpath(dir, sizeof(dir), vmu->context, ext, "INBOX"); +#else + snprintf(dir, sizeof(dir), "%simap", VM_SPOOL_DIR); + if (mkdir(dir, VOICEMAIL_DIR_MODE) && errno != EEXIST) { + ast_log(LOG_WARNING, "mkdir '%s' failed: %s\n", dir, strerror(errno)); + } +#endif /* Check current or macro-calling context for special extensions */ if (ast_test_flag(vmu, VM_OPERATOR)) { @@ -5455,7 +5507,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ /* here is a big difference! We add one to it later */ msgnum = newmsgs + oldmsgs; ast_debug(3, "Messagecount set to %d\n",msgnum); - snprintf(fn, sizeof(fn), "%s/imap/msg%s%04d", VM_SPOOL_DIR, vmu->mailbox, msgnum); + snprintf(fn, sizeof(fn), "%simap/msg%s%04d", VM_SPOOL_DIR, vmu->mailbox, msgnum); /* set variable for compatibility */ pbx_builtin_setvar_helper(chan, "VM_MESSAGEFILE", "IMAP_STORAGE"); @@ -6533,7 +6585,11 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, } ast_channel_unlock(chan); +#ifndef IMAP_STORAGE make_dir(todir, sizeof(todir), vmu->context, vmu->mailbox, !ast_strlen_zero(flag) && !strcmp(flag, "Urgent") ? "Urgent" : "INBOX"); +#else + snprintf(todir, sizeof(todir), "%simap", VM_SPOOL_DIR); +#endif make_file(fn, sizeof(fn), todir, msgnum); snprintf(ext_context, sizeof(ext_context), "%s@%s", vmu->mailbox, vmu->context); @@ -7332,6 +7388,7 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) /* Faster to make the directory than to check if it exists. */ create_dirpath(vms->curdir, sizeof(vms->curdir), vmu->context, vms->username, vms->curbox); + /* traverses directory using readdir (or select query for ODBC) */ count_msg = count_messages(vmu, vms->curdir); if (count_msg < 0) { return count_msg; @@ -7339,6 +7396,10 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) vms->lastmsg = count_msg - 1; } + if (vm_allocate_dh(vms, vmu, count_msg)) { + return -1; + } + /* The following test is needed in case sequencing gets messed up. There appears to be more than one way to mess up sequence, so @@ -7348,14 +7409,17 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) if (vm_lock_path(vms->curdir)) { ast_log(AST_LOG_ERROR, "Could not open mailbox %s: mailbox is locked\n", vms->curdir); - return -1; + return ERROR_LOCK_PATH; } + /* for local storage, checks directory for messages up to maxmsg limit */ last_msg = last_message_index(vmu, vms->curdir); ast_unlock_path(vms->curdir); - if (last_msg < 0) { + if (last_msg < -1) { return last_msg; + } else if (vms->lastmsg != last_msg) { + ast_log(LOG_NOTICE, "Mailbox: %s, expected %d but found %d message(s) in box with max threshold of %d.\n", vms->curdir, last_msg + 1, vms->lastmsg + 1, vmu->maxmsg); } return 0; @@ -7381,7 +7445,8 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu) return ERROR_LOCK_PATH; } - for (x = 0; x < vmu->maxmsg; x++) { + /* must check up to last detected message, just in case it is erroneously greater than maxmsg */ + for (x = 0; x < vms->lastmsg + 1; x++) { if (!vms->deleted[x] && ((strcasecmp(vms->curbox, "INBOX") && strcasecmp(vms->curbox, "Urgent")) || !vms->heard[x] || (vms->heard[x] && !ast_test_flag(vmu, VM_MOVEHEARD)))) { /* Save this message. It's not in INBOX or hasn't been heard */ make_file(vms->fn, sizeof(vms->fn), vms->curdir, x); @@ -7435,7 +7500,7 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu) if (vms->deleted) { /* Since we now expunge after each delete, deleting in reverse order * ensures that no reordering occurs between each step. */ - for (x = vmu->maxmsg - 1; x >= 0; x--) { + for (x = vms->dh_arraysize - 1; x >= 0; x--) { if (vms->deleted[x]) { ast_debug(3, "IMAP delete of %d\n", x); DELETE(vms->curdir, x, vms->fn, vmu); @@ -7446,10 +7511,10 @@ static int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu) done: if (vms->deleted) { - memset(vms->deleted, 0, vmu->maxmsg * sizeof(int)); + memset(vms->deleted, 0, vms->dh_arraysize * sizeof(int)); } if (vms->heard) { - memset(vms->heard, 0, vmu->maxmsg * sizeof(int)); + memset(vms->heard, 0, vms->dh_arraysize * sizeof(int)); } return 0; @@ -9333,20 +9398,20 @@ static int vm_execmain(struct ast_channel *chan, void *data) /* Retrieve urgent, old and new message counts */ ast_debug(1, "Before open_mailbox\n"); res = open_mailbox(&vms, vmu, OLD_FOLDER); /* Count all messages, even Urgent */ - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; vms.oldmessages = vms.lastmsg + 1; ast_debug(1, "Number of old messages: %d\n",vms.oldmessages); /* check INBOX */ res = open_mailbox(&vms, vmu, NEW_FOLDER); - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; vms.newmessages = vms.lastmsg + 1; ast_debug(1, "Number of new messages: %d\n",vms.newmessages); /* Start in Urgent */ in_urgent = 1; res = open_mailbox(&vms, vmu, 11); /*11 is the Urgent folder */ - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; vms.urgentmessages = vms.lastmsg + 1; ast_debug(1, "Number of urgent messages: %d\n",vms.urgentmessages); @@ -9360,7 +9425,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) in_urgent = 0; res = open_mailbox(&vms, vmu, play_folder); } - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; /* If there are no new messages, inform the user and hangup */ @@ -9376,13 +9441,13 @@ static int vm_execmain(struct ast_channel *chan, void *data) res = open_mailbox(&vms, vmu, OLD_FOLDER); /* Count all messages, even Urgent */ in_urgent = 0; play_folder = 1; - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; } else if (!vms.urgentmessages && vms.newmessages) { /* If we have new messages but none are urgent */ in_urgent = 0; res = open_mailbox(&vms, vmu, NEW_FOLDER); - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; } } @@ -9450,7 +9515,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) /* If folder is not urgent, set in_urgent to zero! */ if (cmd != 11) in_urgent = 0; res = open_mailbox(&vms, vmu, cmd); - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; play_folder = cmd; cmd = 0; @@ -9581,7 +9646,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) if (res == ERROR_LOCK_PATH) goto out; res = open_mailbox(&vms, vmu, 11); /* Open Urgent folder */ - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; ast_debug(1, "No more new messages, opened INBOX and got %d Urgent messages\n",vms.lastmsg + 1); vms.curmsg = vms.lastmsg; @@ -9610,7 +9675,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) if (res == ERROR_LOCK_PATH) goto out; res = open_mailbox(&vms, vmu, NEW_FOLDER); - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; ast_debug(1, "No more urgent messages, opened INBOX and got %d new messages\n",vms.lastmsg + 1); vms.curmsg = -1; @@ -9672,7 +9737,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) if (res == ERROR_LOCK_PATH) goto out; res = open_mailbox(&vms, vmu, NEW_FOLDER); - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; ast_debug(1, "No more urgent messages, opened INBOX and got %d new messages\n",vms.lastmsg + 1); vms.curmsg = -1; @@ -9709,7 +9774,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) if (res == ERROR_LOCK_PATH) goto out; res = open_mailbox(&vms, vmu, NEW_FOLDER); - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; ast_debug(1, "No more urgent messages, opened INBOX and got %d new messages\n",vms.lastmsg + 1); vms.curmsg = -1; @@ -9782,7 +9847,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) if (res == ERROR_LOCK_PATH) goto out; res = open_mailbox(&vms, vmu, NEW_FOLDER); - if (res == ERROR_LOCK_PATH) + if (res < 0) goto out; ast_debug(1, "No more urgent messages, opened INBOX and got %d new messages\n",vms.lastmsg + 1); vms.curmsg = -1; @@ -11698,6 +11763,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re char tempfile[PATH_MAX]; char *acceptdtmf = "#"; char *canceldtmf = ""; + int canceleddtmf = 0; /* Note that urgent and private are for flagging messages as such in the future */ @@ -11759,6 +11825,10 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (ast_test_flag(vmu, VM_OPERATOR)) canceldtmf = "0"; cmd = ast_play_and_record_full(chan, playfile, tempfile, maxtime, fmt, duration, silencethreshold, maxsilence, unlockdir, acceptdtmf, canceldtmf); + if (strchr(canceldtmf, cmd)) { + /* need this flag here to distinguish between pressing '0' during message recording or after */ + canceleddtmf = 1; + } if (record_gain) ast_channel_setoption(chan, AST_OPTION_RXGAIN, &zero_gain, sizeof(zero_gain), 0); if (cmd == -1) { @@ -11838,7 +11908,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re return 1; #endif case '0': - if (!ast_test_flag(vmu, VM_OPERATOR) || !outsidecaller) { + if (!ast_test_flag(vmu, VM_OPERATOR) || (!canceleddtmf && !outsidecaller)) { cmd = ast_play_and_wait(chan, "vm-sorry"); break; } @@ -11847,6 +11917,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (!cmd) cmd = ast_waitfordigit(chan, 3000); if (cmd == '1') { + ast_filerename(tempfile, recordfile, NULL); ast_play_and_wait(chan, "vm-msgsaved"); cmd = '0'; } else if (cmd == '4') { @@ -11858,7 +11929,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re cmd = '0'; } else { ast_play_and_wait(chan, "vm-deleted"); - DELETE(recordfile, -1, recordfile, vmu); + DELETE(tempfile, -1, tempfile, vmu); cmd = '0'; } } @@ -11903,6 +11974,10 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re } } } + if (!outsidecaller && (cmd == -1 || cmd == 't')) { + /* Hang up or timeout, so delete the recording. */ + ast_filedelete(tempfile, NULL); + } if (cmd == 't') cmd = 0; else if (outsidecaller) /* won't play if time out occurs */ diff --git a/asterisk-1.6.2.14-summary.html b/asterisk-1.6.2.14-summary.html deleted file mode 100644 index fe9593ec5..000000000 --- a/asterisk-1.6.2.14-summary.html +++ /dev/null @@ -1,361 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.6.2.14</title></head> -<body> -<h1 align="center"><a name="top">Release Summary</a></h1> -<h3 align="center">asterisk-1.6.2.14</h3> -<h3 align="center">Date: 2010-11-02</h3> -<h3 align="center"><asteriskteam@digium.com></h3> -<hr/> -<h2 align="center">Table of Contents</h2> -<ol> - <li><a href="#summary">Summary</a></li> - <li><a href="#contributors">Contributors</a></li> - <li><a href="#issues">Closed Issues</a></li> - <li><a href="#commits">Other Changes</a></li> - <li><a href="#diffstat">Diffstat</a></li> -</ol> -<hr/> -<a name="summary"><h2 align="center">Summary</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p> -<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.6.2.12.</p> -<hr/> -<a name="contributors"><h2 align="center">Contributors</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p> -<table width="100%" border="0"> -<tr> -<td width="33%"><h3>Coders</h3></td> -<td width="33%"><h3>Testers</h3></td> -<td width="33%"><h3>Reporters</h3></td> -</tr> -<tr valign="top"> -<td> -17 tilghman<br/> -8 dvossel<br/> -7 mnicholson<br/> -5 qwell<br/> -3 twilson<br/> -2 bbryant<br/> -2 oej<br/> -1 alexkuklin<br/> -1 jpeeler<br/> -1 junky<br/> -1 makoto<br/> -1 modelnine<br/> -1 Nick<br/> -1 pabelanger<br/> -1 pprindeville<br/> -1 rmudgett<br/> -1 RoadKill<br/> -1 schmidts<br/> -1 sysreq<br/> -</td> -<td> -2 mnicholson<br/> -2 qwell<br/> -1 alexkuklin<br/> -1 denzs<br/> -1 gmartinez<br/> -1 junky<br/> -1 mdu113<br/> -1 mkeuter<br/> -1 Nick_Lewis<br/> -1 PavelL<br/> -1 pprindeville<br/> -1 ricardolandim<br/> -1 RoadKill<br/> -1 sysreq<br/> -</td> -<td> -2 oej<br/> -1 298<br/> -1 alexkuklin<br/> -1 alexrecarey<br/> -1 coolmig<br/> -1 denzs<br/> -1 Guggemand<br/> -1 haakon<br/> -1 ibc<br/> -1 javyer<br/> -1 kshumard<br/> -1 lmadsen<br/> -1 makoto<br/> -1 mdu113<br/> -1 modelnine<br/> -1 Nick_Lewis<br/> -1 PavelL<br/> -1 pj<br/> -1 pprindeville<br/> -1 raarts<br/> -1 ricardolandim<br/> -1 RoadKill<br/> -1 russell<br/> -1 schmidts<br/> -1 sysreq<br/> -1 under<br/> -</td> -</tr> -</table> -<hr/> -<a name="issues"><h2 align="center">Closed Issues</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p> -<h3>Category: Applications/app_festival</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=15706">#15706</a>: [patch] app_festival hangs on reading from spawned subprocess<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284280">284280</a><br/> -Reporter: modelnine<br/> -Testers: gmartinez<br/> -Coders: modelnine<br/> -<br/> -<h3>Category: Applications/app_meetme</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17408">#17408</a>: [patch] MoH not restarted after end of conference announcement is played<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285532">285532</a><br/> -Reporter: sysreq<br/> -Testers: sysreq<br/> -Coders: sysreq<br/> -<br/> -<h3>Category: Applications/app_queue</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=16893">#16893</a>: [patch] Realtime queue does not re-read announce variable from mysql after first use<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287387">287387</a><br/> -Reporter: haakon<br/> -Coders: tilghman<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17082">#17082</a>: [patch] Improve realtime queue logging<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284472">284472</a><br/> -Reporter: coolmig<br/> -Coders: tilghman<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17535">#17535</a>: [patch] queue reload clears queue statistics<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284631">284631</a><br/> -Reporter: raarts<br/> -Coders: tilghman<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17673">#17673</a>: [patch] When using Local/ as members, language is not inherited<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286115">286115</a><br/> -Reporter: Guggemand<br/> -Coders: twilson<br/> -<br/> -<h3>Category: Applications/app_voicemail</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=15726">#15726</a>: [patch] password change for mailboxes without user name<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285196">285196</a><br/> -Reporter: 298<br/> -Testers: junky<br/> -Coders: junky<br/> -<br/> -<h3>Category: CDR/General</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17900">#17900</a>: [patch] empty CDR variables and everything that goes after is not shown<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287115">287115</a><br/> -Reporter: under<br/> -Testers: mnicholson<br/> -Coders: mnicholson<br/> -<br/> -<h3>Category: Channels/chan_iax2</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17935">#17935</a>: [patch] IAXregistry AMI does not return ActionID data<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284958">284958</a><br/> -Reporter: alexkuklin<br/> -Testers: alexkuklin<br/> -Coders: alexkuklin<br/> -<br/> -<h3>Category: Channels/chan_sip/General</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17741">#17741</a>: [patch] sip_poke_noanswer launch ast_devstate_changed everytime even a peer is still unreachable<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284399">284399</a><br/> -Reporter: schmidts<br/> -Coders: schmidts<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17758">#17758</a>: [patch] Asterisk just reads the first "Accept" header<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284002">284002</a><br/> -Reporter: ibc<br/> -Coders: dvossel<br/> -<br/> -<h3>Category: Channels/chan_sip/IPv6</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17840">#17840</a>: sip show settings: Internal IP with bindaddr=::<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286456">286456</a><br/> -Reporter: oej<br/> -Coders: qwell<br/> -<br/> -<h3>Category: Channels/chan_sip/Interoperability</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17005">#17005</a>: [patch] Asterisk sends session-timer with "require" after 15 minutes<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285563">285563</a><br/> -Reporter: alexrecarey<br/> -Coders: dvossel<br/> -<br/> -<h3>Category: Channels/chan_sip/Registration</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17551">#17551</a>: [patch] Realtime erase username when Unavailable<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286757">286757</a><br/> -Reporter: ricardolandim<br/> -Testers: ricardolandim, mnicholson<br/> -Coders: mnicholson<br/> -<br/> -<h3>Category: Channels/chan_sip/Subscriptions</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17790">#17790</a>: [patch] Missing semicolon in SIP-Notify<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=283881">283881</a><br/> -Reporter: denzs<br/> -Testers: qwell, denzs<br/> -Coders: qwell<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17928">#17928</a>: [patch] AST_MAX_EXTENSION limitation on hint string length<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287119">287119</a><br/> -Reporter: mdu113<br/> -Testers: mdu113<br/> -Coders: tilghman<br/> -<br/> -<h3>Category: Codecs/codec_gsm</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17688">#17688</a>: [patch] GCC 4.2.x optimizations result in improper behavior of GSM codec<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285818">285818</a><br/> -Reporter: pprindeville<br/> -Testers: mkeuter, pprindeville<br/> -Coders: pprindeville<br/> -<br/> -<h3>Category: Core/Channels</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17370">#17370</a>: [patch] ast_readstring (multiple DTMF input) doesn't transmit silence to the caller even if transmit_silence=yes<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285744">285744</a><br/> -Reporter: makoto<br/> -Coders: makoto<br/> -<br/> -<h3>Category: Core/Configuration</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17794">#17794</a>: [patch] segfault on dialplan reload<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285366">285366</a><br/> -Reporter: PavelL<br/> -Testers: PavelL<br/> -Coders: tilghman<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17835">#17835</a>: [patch] say.conf dont have the same amount of rule's as say.c<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284317">284317</a><br/> -Reporter: RoadKill<br/> -Testers: RoadKill<br/> -Coders: RoadKill<br/> -<br/> -<h3>Category: Core/General</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17678">#17678</a>: Fix select() usage in Asterisk<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284593">284593</a><br/> -Reporter: russell<br/> -Coders: tilghman<br/> -<br/> -<h3>Category: Core/ManagerInterface</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17891">#17891</a>: Possible memory leak in originate<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287470">287470</a><br/> -Reporter: oej<br/> -Coders: oej<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17917">#17917</a>: Reloads of manager.conf do not properly handle the resetting of options<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284778">284778</a><br/> -Reporter: lmadsen<br/> -Coders: bbryant<br/> -<br/> -<h3>Category: PBX/General</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=16903">#16903</a>: [patch] Incorrect pattern specificity in new dial pattern functions<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285710">285710</a><br/> -Reporter: Nick_Lewis<br/> -Testers: Nick_Lewis<br/> -Coders: Nick<br/> -<br/> -<h3>Category: Resources/res_musiconhold</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=16744">#16744</a>: [patch] 'moh reload' doesn't reload moh directory content<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285526">285526</a><br/> -Reporter: pj<br/> -Testers: qwell<br/> -Coders: qwell<br/> -<br/> -<a href="https://issues.asterisk.org/view.php?id=17807">#17807</a>: Music on hold doesn't recover very cleanly when it can't play a file<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285639">285639</a><br/> -Reporter: kshumard<br/> -Coders: bbryant<br/> -<br/> -<h3>Category: Utilities/General</h3><br/> -<a href="https://issues.asterisk.org/view.php?id=17958">#17958</a>: [patch] debian warnings on make config<br/> -Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287198">287198</a><br/> -Reporter: javyer<br/> -Coders: qwell<br/> -<br/> -<hr/> -<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p> -<table width="100%" border="1"> -<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=283318">283318</a></td><td>tilghman</td><td>CDR drivers depend upon res_odbc, not directly on the ODBC libraries</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=283381">283381</a></td><td>dvossel</td><td>This fix makes sure the ast_channel hangs up correctly when the dialog's PENDING_BYE flag is set.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=283558">283558</a></td><td>dvossel</td><td>Asterisk will not advertise session timers are supported when 'session-timers=refuse' is used.</td> -<td><a href="https://issues.asterisk.org/view.php?id=17005">#17005</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=283594">283594</a></td><td>dvossel</td><td>Add to and from tags to NOTIFY dialog-info xml body so pickup can occur.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=283691">283691</a></td><td>dvossel</td><td>Fixed how Asterisk destroys a dialog on channel hangup before invite receives a response.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284595">284595</a></td><td>tilghman</td><td>Failed to rerun bootstrap.sh after last commit</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284665">284665</a></td><td>tilghman</td><td>Fixing build.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284704">284704</a></td><td>dvossel</td><td>Removed relatedpeer code from sip_autodestruct</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=284897">284897</a></td><td>twilson</td><td>Properly detect when a sound file doesn't exist</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285089">285089</a></td><td>tilghman</td><td>Silly convenience script for BSD platforms.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285267">285267</a></td><td>tilghman</td><td>Use poll, if indicated to do so, in the ast_poll2 implementation.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285529">285529</a></td><td>qwell</td><td>Follow coding guidelines in moh rescan fix. Also fix the documentation that got me in trouble.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285567">285567</a></td><td>dvossel</td><td>In retrans_pkt, do not unlock pvt until the end of the function on a transmit failure.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285930">285930</a></td><td>tilghman</td><td>Fix Mac OS X build.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=285961">285961</a></td><td>tilghman</td><td>Another fix for Mac OS X.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286024">286024</a></td><td>tilghman</td><td>Missing newline</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286116">286116</a></td><td>rmudgett</td><td>An outgoing call may not get hung up if a pre-connect incoming ISDN call is disconnected.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286117">286117</a></td><td>pabelanger</td><td>Load iax.conf before registering any functions/applications/actions.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286223">286223</a></td><td>twilson</td><td>Return -1 if chan_local doesn't support an option</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286268">286268</a></td><td>oej</td><td>Handle error response when we can't make file compatible</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286527">286527</a></td><td>tilghman</td><td>Refactor conversion to ast_poll() to fix callparking regression.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286557">286557</a></td><td>tilghman</td><td>C precedence got me</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286587">286587</a></td><td>tilghman</td><td>Add documentation on missing backend tables for Voicemail</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286681">286681</a></td><td>mnicholson</td><td>Only drop duplicate answer frames if the channel is bridged.</td> -<td><a href="https://issues.asterisk.org/view.php?id=2342">#2342</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=286998">286998</a></td><td>jpeeler</td><td>Ensure mailbox is not filled to capacity before doing message forwarding.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287308">287308</a></td><td>mnicholson</td><td>Use ast_strdup() instead of ast_strdupa() while processing in ast_hint_state_changed().</td> -<td><a href="https://issues.asterisk.org/view.php?id=17928">#17928</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287556">287556</a></td><td>mnicholson</td><td>Use ast_str when processing hint state changes</td> -<td><a href="https://issues.asterisk.org/view.php?id=17928">#17928</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287557">287557</a></td><td>mnicholson</td><td>Revert r287556.</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287558">287558</a></td><td>mnicholson</td><td>Use ast_str when processing hint state changes</td> -<td><a href="https://issues.asterisk.org/view.php?id=17928">#17928</a></td></tr></table> -<hr/> -<a name="diffstat"><h2 align="center">Diffstat Results</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p> -<pre> -BSDmakefile | 11 + -apps/app_chanspy.c | 2 -apps/app_festival.c | 13 - -apps/app_meetme.c | 6 -apps/app_queue.c | 10 -apps/app_voicemail.c | 43 +++- -cdr/cdr_adaptive_odbc.c | 3 -cdr/cdr_odbc.c | 3 -channels/chan_dahdi.c | 16 + -channels/chan_iax2.c | 43 ++-- -channels/chan_local.c | 67 ++++++ -channels/chan_misdn.c | 43 +--- -channels/chan_phone.c | 80 ++++--- -channels/chan_sip.c | 261 ++++++++++++++++---------- -channels/chan_usbradio.c | 159 +++++++-------- -channels/console_video.c | 233 +++++++++++------------ -codecs/gsm/Makefile | 8 -configs/say.conf.sample | 11 - -configure.ac | 64 ++++++ -contrib/init.d/rc.debian.asterisk | 12 + -contrib/realtime/mysql/voicemail_data.sql | 29 ++ -contrib/realtime/mysql/voicemail_messages.sql | 29 ++ -funcs/func_channel.c | 20 + -include/asterisk/astobj2.h | 4 -include/asterisk/autoconfig.h.in | 77 +++++-- -include/asterisk/channel.h | 54 +---- -include/asterisk/frame.h | 7 -include/asterisk/pbx.h | 4 -include/asterisk/poll-compat.h | 8 -include/asterisk/select.h | 109 ++++++++++ -main/asterisk.c | 44 ++++ -main/cdr.c | 20 - -main/channel.c | 16 + -main/features.c | 99 ++++++--- -main/file.c | 5 -main/manager.c | 38 ++- -main/pbx.c | 29 +- -main/poll.c | 196 ++++++++++--------- -main/rtp.c | 7 -main/test.c | 2 -makeopts.in | 1 -pbx/pbx_config.c | 28 +- -res/res_ais.c | 20 + -res/res_config_odbc.c | 2 -res/res_config_pgsql.c | 15 + -res/res_jabber.c | 26 -- -res/res_musiconhold.c | 25 ++ -tests/test_heap.c | 6 -tests/test_poll.c | 247 ++++++++++++++++++++++++ -utils/clicompat.c | 1 -50 files changed, 1579 insertions(+), 677 deletions(-) -</pre><br/> -<hr/> -</body> -</html> diff --git a/asterisk-1.6.2.14-summary.txt b/asterisk-1.6.2.14-summary.txt deleted file mode 100644 index f206e3f0d..000000000 --- a/asterisk-1.6.2.14-summary.txt +++ /dev/null @@ -1,455 +0,0 @@ - Release Summary - - asterisk-1.6.2.14 - - Date: 2010-11-02 - - <asteriskteam@digium.com> - - ---------------------------------------------------------------------- - - Table of Contents - - 1. Summary - 2. Contributors - 3. Closed Issues - 4. Other Changes - 5. Diffstat - - ---------------------------------------------------------------------- - - Summary - - [Back to Top] - - This release includes only bug fixes. The changes included were made only - to address problems that have been identified in this release series. - Users should be able to safely upgrade to this version if this release - series is already in use. Users considering upgrading from a previous - release series are strongly encouraged to review the UPGRADE.txt document - as well as the CHANGES document for information about upgrading to this - release series. - - The data in this summary reflects changes that have been made since the - previous release, asterisk-1.6.2.12. - - ---------------------------------------------------------------------- - - Contributors - - [Back to Top] - - This table lists the people who have submitted code, those that have - tested patches, as well as those that reported issues on the issue tracker - that were resolved in this release. For coders, the number is how many of - their patches (of any size) were committed into this release. For testers, - the number is the number of times their name was listed as assisting with - testing a patch. Finally, for reporters, the number is the number of - issues that they reported that were closed by commits that went into this - release. - - Coders Testers Reporters - 17 tilghman 2 mnicholson 2 oej - 8 dvossel 2 qwell 1 298 - 7 mnicholson 1 alexkuklin 1 alexkuklin - 5 qwell 1 denzs 1 alexrecarey - 3 twilson 1 gmartinez 1 coolmig - 2 bbryant 1 junky 1 denzs - 2 oej 1 mdu113 1 Guggemand - 1 alexkuklin 1 mkeuter 1 haakon - 1 jpeeler 1 Nick_Lewis 1 ibc - 1 junky 1 PavelL 1 javyer - 1 makoto 1 pprindeville 1 kshumard - 1 modelnine 1 ricardolandim 1 lmadsen - 1 Nick 1 RoadKill 1 makoto - 1 pabelanger 1 sysreq 1 mdu113 - 1 pprindeville 1 modelnine - 1 rmudgett 1 Nick_Lewis - 1 RoadKill 1 PavelL - 1 schmidts 1 pj - 1 sysreq 1 pprindeville - 1 raarts - 1 ricardolandim - 1 RoadKill - 1 russell - 1 schmidts - 1 sysreq - 1 under - - ---------------------------------------------------------------------- - - Closed Issues - - [Back to Top] - - This is a list of all issues from the issue tracker that were closed by - changes that went into this release. - - Category: Applications/app_festival - - #15706: [patch] app_festival hangs on reading from spawned subprocess - Revision: 284280 - Reporter: modelnine - Testers: gmartinez - Coders: modelnine - - Category: Applications/app_meetme - - #17408: [patch] MoH not restarted after end of conference announcement is - played - Revision: 285532 - Reporter: sysreq - Testers: sysreq - Coders: sysreq - - Category: Applications/app_queue - - #16893: [patch] Realtime queue does not re-read announce variable from - mysql after first use - Revision: 287387 - Reporter: haakon - Coders: tilghman - - #17082: [patch] Improve realtime queue logging - Revision: 284472 - Reporter: coolmig - Coders: tilghman - - #17535: [patch] queue reload clears queue statistics - Revision: 284631 - Reporter: raarts - Coders: tilghman - - #17673: [patch] When using Local/ as members, language is not inherited - Revision: 286115 - Reporter: Guggemand - Coders: twilson - - Category: Applications/app_voicemail - - #15726: [patch] password change for mailboxes without user name - Revision: 285196 - Reporter: 298 - Testers: junky - Coders: junky - - Category: CDR/General - - #17900: [patch] empty CDR variables and everything that goes after is not - shown - Revision: 287115 - Reporter: under - Testers: mnicholson - Coders: mnicholson - - Category: Channels/chan_iax2 - - #17935: [patch] IAXregistry AMI does not return ActionID data - Revision: 284958 - Reporter: alexkuklin - Testers: alexkuklin - Coders: alexkuklin - - Category: Channels/chan_sip/General - - #17741: [patch] sip_poke_noanswer launch ast_devstate_changed everytime - even a peer is still unreachable - Revision: 284399 - Reporter: schmidts - Coders: schmidts - - #17758: [patch] Asterisk just reads the first "Accept" header - Revision: 284002 - Reporter: ibc - Coders: dvossel - - Category: Channels/chan_sip/IPv6 - - #17840: sip show settings: Internal IP with bindaddr=:: - Revision: 286456 - Reporter: oej - Coders: qwell - - Category: Channels/chan_sip/Interoperability - - #17005: [patch] Asterisk sends session-timer with "require" after 15 - minutes - Revision: 285563 - Reporter: alexrecarey - Coders: dvossel - - Category: Channels/chan_sip/Registration - - #17551: [patch] Realtime erase username when Unavailable - Revision: 286757 - Reporter: ricardolandim - Testers: ricardolandim, mnicholson - Coders: mnicholson - - Category: Channels/chan_sip/Subscriptions - - #17790: [patch] Missing semicolon in SIP-Notify - Revision: 283881 - Reporter: denzs - Testers: qwell, denzs - Coders: qwell - - #17928: [patch] AST_MAX_EXTENSION limitation on hint string length - Revision: 287119 - Reporter: mdu113 - Testers: mdu113 - Coders: tilghman - - Category: Codecs/codec_gsm - - #17688: [patch] GCC 4.2.x optimizations result in improper behavior of GSM - codec - Revision: 285818 - Reporter: pprindeville - Testers: mkeuter, pprindeville - Coders: pprindeville - - Category: Core/Channels - - #17370: [patch] ast_readstring (multiple DTMF input) doesn't transmit - silence to the caller even if transmit_silence=yes - Revision: 285744 - Reporter: makoto - Coders: makoto - - Category: Core/Configuration - - #17794: [patch] segfault on dialplan reload - Revision: 285366 - Reporter: PavelL - Testers: PavelL - Coders: tilghman - - #17835: [patch] say.conf dont have the same amount of rule's as say.c - Revision: 284317 - Reporter: RoadKill - Testers: RoadKill - Coders: RoadKill - - Category: Core/General - - #17678: Fix select() usage in Asterisk - Revision: 284593 - Reporter: russell - Coders: tilghman - - Category: Core/ManagerInterface - - #17891: Possible memory leak in originate - Revision: 287470 - Reporter: oej - Coders: oej - - #17917: Reloads of manager.conf do not properly handle the resetting of - options - Revision: 284778 - Reporter: lmadsen - Coders: bbryant - - Category: PBX/General - - #16903: [patch] Incorrect pattern specificity in new dial pattern - functions - Revision: 285710 - Reporter: Nick_Lewis - Testers: Nick_Lewis - Coders: Nick - - Category: Resources/res_musiconhold - - #16744: [patch] 'moh reload' doesn't reload moh directory content - Revision: 285526 - Reporter: pj - Testers: qwell - Coders: qwell - - #17807: Music on hold doesn't recover very cleanly when it can't play a - file - Revision: 285639 - Reporter: kshumard - Coders: bbryant - - Category: Utilities/General - - #17958: [patch] debian warnings on make config - Revision: 287198 - Reporter: javyer - Coders: qwell - - ---------------------------------------------------------------------- - - Commits Not Associated with an Issue - - [Back to Top] - - This is a list of all changes that went into this release that did not - directly close an issue from the issue tracker. The commits may have been - marked as being related to an issue. If that is the case, the issue - numbers are listed here, as well. - - +------------------------------------------------------------------------+ - | Revision | Author | Summary | Issues | - | | | | Referenced | - |----------+------------+-----------------------------------+------------| - | | | CDR drivers depend upon res_odbc, | | - | 283318 | tilghman | not directly on the ODBC | | - | | | libraries | | - |----------+------------+-----------------------------------+------------| - | | | This fix makes sure the | | - | 283381 | dvossel | ast_channel hangs up correctly | | - | | | when the dialog's PENDING_BYE | | - | | | flag is set. | | - |----------+------------+-----------------------------------+------------| - | | | Asterisk will not advertise | | - | 283558 | dvossel | session timers are supported when | #17005 | - | | | 'session-timers=refuse' is used. | | - |----------+------------+-----------------------------------+------------| - | | | Add to and from tags to NOTIFY | | - | 283594 | dvossel | dialog-info xml body so pickup | | - | | | can occur. | | - |----------+------------+-----------------------------------+------------| - | | | Fixed how Asterisk destroys a | | - | 283691 | dvossel | dialog on channel hangup before | | - | | | invite receives a response. | | - |----------+------------+-----------------------------------+------------| - | 284595 | tilghman | Failed to rerun bootstrap.sh | | - | | | after last commit | | - |----------+------------+-----------------------------------+------------| - | 284665 | tilghman | Fixing build. | | - |----------+------------+-----------------------------------+------------| - | 284704 | dvossel | Removed relatedpeer code from | | - | | | sip_autodestruct | | - |----------+------------+-----------------------------------+------------| - | 284897 | twilson | Properly detect when a sound file | | - | | | doesn't exist | | - |----------+------------+-----------------------------------+------------| - | 285089 | tilghman | Silly convenience script for BSD | | - | | | platforms. | | - |----------+------------+-----------------------------------+------------| - | 285267 | tilghman | Use poll, if indicated to do so, | | - | | | in the ast_poll2 implementation. | | - |----------+------------+-----------------------------------+------------| - | | | Follow coding guidelines in moh | | - | 285529 | qwell | rescan fix. Also fix the | | - | | | documentation that got me in | | - | | | trouble. | | - |----------+------------+-----------------------------------+------------| - | | | In retrans_pkt, do not unlock pvt | | - | 285567 | dvossel | until the end of the function on | | - | | | a transmit failure. | | - |----------+------------+-----------------------------------+------------| - | 285930 | tilghman | Fix Mac OS X build. | | - |----------+------------+-----------------------------------+------------| - | 285961 | tilghman | Another fix for Mac OS X. | | - |----------+------------+-----------------------------------+------------| - | 286024 | tilghman | Missing newline | | - |----------+------------+-----------------------------------+------------| - | | | An outgoing call may not get hung | | - | 286116 | rmudgett | up if a pre-connect incoming ISDN | | - | | | call is disconnected. | | - |----------+------------+-----------------------------------+------------| - | | | Load iax.conf before registering | | - | 286117 | pabelanger | any | | - | | | functions/applications/actions. | | - |----------+------------+-----------------------------------+------------| - | 286223 | twilson | Return -1 if chan_local doesn't | | - | | | support an option | | - |----------+------------+-----------------------------------+------------| - | 286268 | oej | Handle error response when we | | - | | | can't make file compatible | | - |----------+------------+-----------------------------------+------------| - | 286527 | tilghman | Refactor conversion to ast_poll() | | - | | | to fix callparking regression. | | - |----------+------------+-----------------------------------+------------| - | 286557 | tilghman | C precedence got me | | - |----------+------------+-----------------------------------+------------| - | 286587 | tilghman | Add documentation on missing | | - | | | backend tables for Voicemail | | - |----------+------------+-----------------------------------+------------| - | 286681 | mnicholson | Only drop duplicate answer frames | #2342 | - | | | if the channel is bridged. | | - |----------+------------+-----------------------------------+------------| - | | | Ensure mailbox is not filled to | | - | 286998 | jpeeler | capacity before doing message | | - | | | forwarding. | | - |----------+------------+-----------------------------------+------------| - | | | Use ast_strdup() instead of | | - | 287308 | mnicholson | ast_strdupa() while processing in | #17928 | - | | | ast_hint_state_changed(). | | - |----------+------------+-----------------------------------+------------| - | 287556 | mnicholson | Use ast_str when processing hint | #17928 | - | | | state changes | | - |----------+------------+-----------------------------------+------------| - | 287557 | mnicholson | Revert r287556. | | - |----------+------------+-----------------------------------+------------| - | 287558 | mnicholson | Use ast_str when processing hint | #17928 | - | | | state changes | | - +------------------------------------------------------------------------+ - - ---------------------------------------------------------------------- - - Diffstat Results - - [Back to Top] - - This is a summary of the changes to the source code that went into this - release that was generated using the diffstat utility. - - BSDmakefile | 11 + - apps/app_chanspy.c | 2 - apps/app_festival.c | 13 - - apps/app_meetme.c | 6 - apps/app_queue.c | 10 - apps/app_voicemail.c | 43 +++- - cdr/cdr_adaptive_odbc.c | 3 - cdr/cdr_odbc.c | 3 - channels/chan_dahdi.c | 16 + - channels/chan_iax2.c | 43 ++-- - channels/chan_local.c | 67 ++++++ - channels/chan_misdn.c | 43 +--- - channels/chan_phone.c | 80 ++++--- - channels/chan_sip.c | 261 ++++++++++++++++---------- - channels/chan_usbradio.c | 159 +++++++-------- - channels/console_video.c | 233 +++++++++++------------ - codecs/gsm/Makefile | 8 - configs/say.conf.sample | 11 - - configure.ac | 64 ++++++ - contrib/init.d/rc.debian.asterisk | 12 + - contrib/realtime/mysql/voicemail_data.sql | 29 ++ - contrib/realtime/mysql/voicemail_messages.sql | 29 ++ - funcs/func_channel.c | 20 + - include/asterisk/astobj2.h | 4 - include/asterisk/autoconfig.h.in | 77 +++++-- - include/asterisk/channel.h | 54 +---- - include/asterisk/frame.h | 7 - include/asterisk/pbx.h | 4 - include/asterisk/poll-compat.h | 8 - include/asterisk/select.h | 109 ++++++++++ - main/asterisk.c | 44 ++++ - main/cdr.c | 20 - - main/channel.c | 16 + - main/features.c | 99 ++++++--- - main/file.c | 5 - main/manager.c | 38 ++- - main/pbx.c | 29 +- - main/poll.c | 196 ++++++++++--------- - main/rtp.c | 7 - main/test.c | 2 - makeopts.in | 1 - pbx/pbx_config.c | 28 +- - res/res_ais.c | 20 + - res/res_config_odbc.c | 2 - res/res_config_pgsql.c | 15 + - res/res_jabber.c | 26 -- - res/res_musiconhold.c | 25 ++ - tests/test_heap.c | 6 - tests/test_poll.c | 247 ++++++++++++++++++++++++ - utils/clicompat.c | 1 - 50 files changed, 1579 insertions(+), 677 deletions(-) - - ---------------------------------------------------------------------- diff --git a/asterisk-1.6.2.15-rc1-summary.html b/asterisk-1.6.2.15-rc1-summary.html new file mode 100644 index 000000000..a1c7b366f --- /dev/null +++ b/asterisk-1.6.2.15-rc1-summary.html @@ -0,0 +1,524 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.6.2.15-rc1</title></head> +<body> +<h1 align="center"><a name="top">Release Summary</a></h1> +<h3 align="center">asterisk-1.6.2.15-rc1</h3> +<h3 align="center">Date: 2010-11-15</h3> +<h3 align="center"><asteriskteam@digium.com></h3> +<hr/> +<h2 align="center">Table of Contents</h2> +<ol> + <li><a href="#summary">Summary</a></li> + <li><a href="#contributors">Contributors</a></li> + <li><a href="#issues">Closed Issues</a></li> + <li><a href="#commits">Other Changes</a></li> + <li><a href="#diffstat">Diffstat</a></li> +</ol> +<hr/> +<a name="summary"><h2 align="center">Summary</h2></a> +<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p> +<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.6.2.14.</p> +<hr/> +<a name="contributors"><h2 align="center">Contributors</h2></a> +<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p> +<table width="100%" border="0"> +<tr> +<td width="33%"><h3>Coders</h3></td> +<td width="33%"><h3>Testers</h3></td> +<td width="33%"><h3>Reporters</h3></td> +</tr> +<tr valign="top"> +<td> +18 tilghman<br/> +12 jpeeler<br/> +11 rmudgett<br/> +5 lmadsen<br/> +5 russell<br/> +4 pabelanger<br/> +4 twilson<br/> +3 dvossel<br/> +2 alecdavis<br/> +2 mnicholson<br/> +2 qwell<br/> +1 bbryant<br/> +1 camsown<br/> +1 DEA<br/> +1 jcovert<br/> +1 klaus3000<br/> +1 kuj<br/> +1 lathama<br/> +1 mdu113<br/> +1 oej<br/> +1 RadicAlish<br/> +1 schern<br/> +1 schmitds<br/> +1 sruffell<br/> +1 tbelder<br/> +1 tzafrir<br/> +1 wdoekes<br/> +</td> +<td> +3 tilghman<br/> +2 alecdavis<br/> +2 jamicque<br/> +2 lmadsen<br/> +2 ramonpeek<br/> +2 wdoekes<br/> +2 zerohalo<br/> +1 camsown<br/> +1 davidw<br/> +1 DEA<br/> +1 dpetersen<br/> +1 dvossel<br/> +1 jcovert<br/> +1 jmhunter<br/> +1 jmls<br/> +1 jtodd<br/> +1 kuj<br/> +1 mdu113<br/> +1 Netview<br/> +1 pabelanger<br/> +1 qwell<br/> +1 RadicAlish<br/> +1 rgenthner<br/> +1 rmudgett<br/> +1 schern<br/> +1 schmidts<br/> +1 seanbright<br/> +1 suretec<br/> +1 tbelder<br/> +1 tpanton<br/> +</td> +<td> +3 jmls<br/> +3 wdoekes<br/> +2 jamicque<br/> +2 tzafrir<br/> +1 amorsen<br/> +1 antonio<br/> +1 asgaroth<br/> +1 camsown<br/> +1 davidw<br/> +1 dpetersen<br/> +1 frawd<br/> +1 jcollie<br/> +1 jcovert<br/> +1 jmhunter<br/> +1 klaus3000<br/> +1 kuj<br/> +1 lathama<br/> +1 lftsy<br/> +1 mdu113<br/> +1 murf<br/> +1 netfuse<br/> +1 Netview<br/> +1 pabelanger<br/> +1 RadicAlish<br/> +1 rain<br/> +1 ramonpeek<br/> +1 schern<br/> +1 schmidts<br/> +1 scramatte<br/> +1 seanbright<br/> +1 shin-shoryuken<br/> +1 smallet<br/> +1 tbelder<br/> +1 tpanton<br/> +1 voxter<br/> +1 zerohalo<br/> +</td> +</tr> +</table> +<hr/> +<a name="issues"><h2 align="center">Closed Issues</h2></a> +<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p> +<h3>Category: Applications/app_dial</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16946">#16946</a>: Call that clears in same app_dial poll as answer is reported as NOANSWER but NORMAL_CLEARING<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291580">291580</a><br/> +Reporter: davidw<br/> +Coders: twilson<br/> +<br/> +<h3>Category: Applications/app_directed_pickup</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=18011">#18011</a>: [patch] PickupChan() is not working with full channel name<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290375">290375</a><br/> +Reporter: schern<br/> +Testers: schern, dvossel<br/> +Coders: schern<br/> +<br/> +<h3>Category: Applications/app_meetme</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17908">#17908</a>: [patch] MeetMe PIN handling broken<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287759">287759</a><br/> +Reporter: kuj<br/> +Testers: kuj<br/> +Coders: kuj<br/> +<br/> +<h3>Category: Applications/app_voicemail</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=18240">#18240</a>: [patch] VoicemailMain Exits Without Warning<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294904">294904</a><br/> +Reporter: netfuse<br/> +Testers: pabelanger<br/> +Coders: alecdavis<br/> +<br/> +<h3>Category: Applications/app_voicemail/ODBC</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17803">#17803</a>: [patch] [regression] Forwarding a voicemail with a prepended message does not work<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289874">289874</a><br/> +Reporter: dpetersen<br/> +Testers: dpetersen<br/> +Coders: tilghman<br/> +<br/> +<h3>Category: CDR/General</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17569">#17569</a>: [patch] cdr->src variable is not set anymore in destination channels<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289178">289178</a><br/> +Reporter: tbelder<br/> +Testers: tbelder<br/> +Coders: tbelder<br/> +<br/> +<h3>Category: CDR/cdr_pgsql</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16940">#16940</a>: [patch] Problem inserting CDR records when certain characters are used<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288267">288267</a><br/> +Reporter: jamicque<br/> +Testers: jamicque<br/> +Coders: tilghman<br/> +<br/> +<h3>Category: Channels/chan_dahdi</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16847">#16847</a>: [patch] Deadlock between dahdi_exception and dahdi_indicate<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291655">291655</a><br/> +Reporter: shin-shoryuken<br/> +Testers: alecdavis, rmudgett<br/> +Coders: rmudgett<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=17270">#17270</a>: getting warning message every 4 seconds<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294822">294822</a><br/> +Reporter: jmls<br/> +Coders: rmudgett<br/> +<br/> +<h3>Category: Channels/chan_iax2</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17919">#17919</a>: [patch] schedule_delivery calls ast_bridged_channel() on an unlocked channel<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288193">288193</a><br/> +Reporter: rain<br/> +Coders: rmudgett<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=18019">#18019</a>: [patch] chan_iax2 - timing interface missing<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288147">288147</a><br/> +Reporter: Netview<br/> +Testers: Netview<br/> +Coders: pabelanger<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=18110">#18110</a>: Playback stalls when playing demo-congrats to an IAX2 channel<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294277">294277</a><br/> +Reporter: tpanton<br/> +Testers: tpanton<br/> +Coders: jpeeler<br/> +<br/> +<h3>Category: Channels/chan_sip/General</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16382">#16382</a>: [patch] SIP OPTIONS qualify message forever<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294733">294733</a><br/> +Reporter: lftsy<br/> +Testers: zerohalo<br/> +Coders: jpeeler<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=17892">#17892</a>: [patch] contact header does not get ast_uri_encoded value from p->exten, but dialplan does<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289700">289700</a><br/> +Reporter: wdoekes<br/> +Testers: wdoekes<br/> +Coders: jpeeler<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=18123">#18123</a>: rtautoclear = no or rtautoclear = 0 not respected in sip.conf<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293723">293723</a><br/> +Reporter: zerohalo<br/> +Coders: jpeeler<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=18176">#18176</a>: [patch] record priv-recordintro as sln, not gsm<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292412">292412</a><br/> +Reporter: pabelanger<br/> +Coders: pabelanger<br/> +<br/> +<h3>Category: Channels/chan_sip/Interoperability</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17878">#17878</a>: [patch] chan_sip fails to remove hold when receving a reINVITE without SDP<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294242">294242</a><br/> +Reporter: frawd<br/> +Coders: mnicholson<br/> +<br/> +<h3>Category: Channels/chan_sip/Subscriptions</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17785">#17785</a>: [patch] Encoded URI in a subscription does not work<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288113">288113</a><br/> +Reporter: ramonpeek<br/> +Testers: ramonpeek<br/> +Coders: tilghman<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=17950">#17950</a>: iterate through all ao2_sip dialogs on every subscribe is slow, and not needed<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289622">289622</a><br/> +Reporter: schmidts<br/> +Testers: schmidts<br/> +Coders: schmitds<br/> +<br/> +<h3>Category: Channels/chan_sip/TCP-TLS</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17779">#17779</a>: [patch] tcptls.c:350 Unable to connect SIP socket Connection refused<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294733">294733</a><br/> +Reporter: smallet<br/> +Testers: zerohalo<br/> +Coders: jpeeler<br/> +<br/> +<h3>Category: Channels/chan_skinny</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17680">#17680</a>: [patch] chan_skinny crashes asterisk when parking a call<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287642">287642</a><br/> +Reporter: jmhunter<br/> +Testers: jmhunter, DEA<br/> +Coders: DEA<br/> +<br/> +<h3>Category: Core/BuildSystem</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16155">#16155</a>: [patch] Use pkg-config to find gmime libraries.<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294429">294429</a><br/> +Reporter: jcollie<br/> +Testers: tilghman<br/> +Coders: tilghman<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=17314">#17314</a>: [patch] ./configure --with-pri=LIBPATH does not use libpri from LIBPRI_PATH<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290751">290751</a><br/> +Reporter: tzafrir<br/> +Coders: qwell<br/> +<br/> +<h3>Category: Core/General</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16057">#16057</a>: [patch] Asterisk crashes with "Fixup failed on channel XXX, strange things may happen."<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287685">287685</a><br/> +Reporter: amorsen<br/> +Testers: ramonpeek, davidw, alecdavis<br/> +Coders: alecdavis<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=17698">#17698</a>: CTRL-C from asterisk -vvvvvvvvc has strange results<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290863">290863</a><br/> +Reporter: jmls<br/> +Coders: jpeeler<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=18282">#18282</a>: [patch] better debug message in devicestate.c<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294500">294500</a><br/> +Reporter: klaus3000<br/> +Coders: klaus3000<br/> +<br/> +<h3>Category: Core/ManagerInterface</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17987">#17987</a>: [regression] Newchannel event is missing during masquerading process<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289095">289095</a><br/> +Reporter: RadicAlish<br/> +Testers: RadicAlish<br/> +Coders: RadicAlish<br/> +<br/> +<h3>Category: Core/PBX</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=18165">#18165</a>: [patch] hint state changes deadlock problem<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294639">294639</a><br/> +Reporter: antonio<br/> +Coders: jpeeler<br/> +<br/> +<h3>Category: Functions/func_curl</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=18161">#18161</a>: [patch] crashing func_curl hashcompat with invalid data<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294988">294988</a><br/> +Reporter: wdoekes<br/> +Testers: tilghman<br/> +Coders: tilghman<br/> +<br/> +<h3>Category: Functions/func_odbc</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=18041">#18041</a>: Crash when assigning 2 return vallues to an ARRAY with FUNC_ODBC call<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288712">288712</a><br/> +Reporter: asgaroth<br/> +Coders: tilghman<br/> +<br/> +<h3>Category: Functions/func_strings</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=18060">#18060</a>: [patch] func_string FILTER contains an infinite loop<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293158">293158</a><br/> +Reporter: wdoekes<br/> +Testers: wdoekes<br/> +Coders: wdoekes<br/> +<br/> +<h3>Category: PBX/General</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17366">#17366</a>: [patch] strange extension pattern matching<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290254">290254</a><br/> +Reporter: murf<br/> +Testers: tilghman<br/> +Coders: tilghman<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=17882">#17882</a>: Crash in ast_frame_free<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288006">288006</a><br/> +Reporter: seanbright<br/> +Testers: seanbright<br/> +Coders: bbryant<br/> +<br/> +<h3>Category: Resources/res_agi</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17970">#17970</a>: [patch] res_agi.c:handle_getvariablefull() failes to unlock channel if given channel name of the channel that AGI is running on<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289501">289501</a><br/> +Reporter: mdu113<br/> +Testers: mdu113<br/> +Coders: mdu113<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=18001">#18001</a>: [patch] GET DATA problem with pipes<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290575">290575</a><br/> +Reporter: jamicque<br/> +Testers: jamicque<br/> +Coders: tilghman<br/> +<br/> +<h3>Category: Resources/res_config_ldap</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=13861">#13861</a>: [patch] ERROR[23999]: res_config_ldap.c:1292 update_ldap: Couldn't modify ... Undefined attribute type<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292786">292786</a><br/> +Reporter: scramatte<br/> +Testers: lmadsen, jcovert, suretec, rgenthner<br/> +Coders: lmadsen<br/> +<br/> +<a href="https://issues.asterisk.org/view.php?id=17376">#17376</a>: [patch] res_ldap.conf points md5secret to RealmedPassword, but the schema uses AstAccountRealmedPassword<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292556">292556</a><br/> +Reporter: jcovert<br/> +Coders: jcovert<br/> +<br/> +<h3>Category: Resources/res_features</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16757">#16757</a>: [patch] Parking a call, then retrieving it with ParkedCall() kills the ability to transfer the retrieved call.<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294571">294571</a><br/> +Reporter: voxter<br/> +Coders: tilghman<br/> +<br/> +<h3>Category: Resources/res_jabber</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17387">#17387</a>: [patch] Memory corruption from iksemel<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290396">290396</a><br/> +Reporter: jmls<br/> +Testers: jmls<br/> +Coders: tilghman<br/> +<br/> +<h3>Category: Resources/res_musiconhold</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=16906">#16906</a>: [patch] moh files install under datadir, at runtime: under varlibdir<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292049">292049</a><br/> +Reporter: tzafrir<br/> +Coders: tzafrir<br/> +<br/> +<h3>Category: Resources/res_phoneprov</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=18107">#18107</a>: [patch] Add Undocumented Variables to phoneprov.conf.sample<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291280">291280</a><br/> +Reporter: lathama<br/> +Coders: lathama<br/> +<br/> +<h3>Category: Sounds</h3><br/> +<a href="https://issues.asterisk.org/view.php?id=17426">#17426</a>: [patch] Australian Accent core sounds submission<br/> +Revision: <a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292224">292224</a><br/> +Reporter: camsown<br/> +Testers: camsown, lmadsen, jtodd, qwell<br/> +Coders: camsown, lmadsen<br/> +<br/> +<hr/> +<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a> +<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p> +<table width="100%" border="1"> +<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=287934">287934</a></td><td>tilghman</td><td>Less than zero is an error, not any non-zero value.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288340">288340</a></td><td>russell</td><td>Fix a 100% CPU consumption problem when setting console=yes in asterisk.conf.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288344">288344</a></td><td>dvossel</td><td>During check_pendings, if the dialog is terminated with a CANCEL, change the invitestate to INV_CANCEL like in sip_hangup.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288417">288417</a></td><td>dvossel</td><td>RFC3261 section 12.2 explicitly says out of order requests are responded with a 500 Server Internal Error response.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288500">288500</a></td><td>twilson</td><td>Don't let a Local channel get bridged to itself</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288637">288637</a></td><td>tilghman</td><td>Solaris compatibility fixes</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=288747">288747</a></td><td>twilson</td><td>Don't fail a masquerade if it is already being hung up</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289332">289332</a></td><td>russell</td><td>Don't completely ignore md5secret from LDAP if the value does not begin with {md5}.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289334">289334</a></td><td>lmadsen</td><td>Update sample documentation to note md5secret requirements.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289339">289339</a></td><td>qwell</td><td>Allow a manager originate to succeed on forwarded devices.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289425">289425</a></td><td>russell</td><td>Fix a crash in app_sms.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289553">289553</a></td><td>mnicholson</td><td>Properly handle channel allocation failures duing invites with replaces.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289704">289704</a></td><td>pabelanger</td><td>Disable debugging by default</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289798">289798</a></td><td>jpeeler</td><td>Change RFC2833 DTMF event duration on end to report actual elapsed time.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=289950">289950</a></td><td>oej</td><td>Add documentation for undocumented option to AMI action originate</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290101">290101</a></td><td>tilghman</td><td>Automatically re-run configure test for menuselect, when the relevant makeopts settings change.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290201">290201</a></td><td>tilghman</td><td>Fixing Mac OS X auto-builder.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290324">290324</a></td><td>rmudgett</td><td>Merged revision 258974 from</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=290712">290712</a></td><td>russell</td><td>Don't crash when Set() is called without a value.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291073">291073</a></td><td>rmudgett</td><td>Fixed infinite loop in verbose/debug message output.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291110">291110</a></td><td>rmudgett</td><td>Add missing unlock to an exception condition in reload_config().</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291111">291111</a></td><td>rmudgett</td><td>Make exit from handle_request_do() consistent.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291229">291229</a></td><td>lmadsen</td><td>Add documention that mentions options are defined but not used.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291264">291264</a></td><td>tilghman</td><td>Oops, incorrect range (although unallocated at ARIN)</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291393">291393</a></td><td>russell</td><td>Lock pvt so pvt->owner can't disappear when queueing up a frame.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291904">291904</a></td><td>twilson</td><td>Don't crash or deadlock on module unload</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=291939">291939</a></td><td>pabelanger</td><td>Clean up formatting.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292226">292226</a></td><td>jpeeler</td><td>Fix improper operator key acceptance and clean up temp recording files.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292229">292229</a></td><td>lmadsen</td><td>Fix typo in the sounds/Makefile.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=292867">292867</a></td><td>dvossel</td><td>This patch turns chan_local pvts into astobj2 objects.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293118">293118</a></td><td>jpeeler</td><td>Fix inprocess_container in voicemail to correctly restrict max messages.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293195">293195</a></td><td>tilghman</td><td>"!00" evaluated as false, which is incorrect. Fixing.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293196">293196</a></td><td>tilghman</td><td>"!00" evaluated as false, which is incorrect. Fixing.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293340">293340</a></td><td>rmudgett</td><td>Remove some code that serves no purpose.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293417">293417</a></td><td>rmudgett</td><td>Remove some more code that serves no purpose.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293647">293647</a></td><td>rmudgett</td><td>Make warning message have more useful information in it.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293806">293806</a></td><td>rmudgett</td><td>Party A in an analog 3-way call would continue to hear ringback after party C answers.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=293969">293969</a></td><td>sruffell</td><td>codecs/codec_dahdi: Prevent "choppy" audio when receiving unexpected frame sizes.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294312">294312</a></td><td>jpeeler</td><td>add missing unlock not present in 294277</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=294910">294910</a></td><td>jpeeler</td><td>Return correct error code if lock path fails. The recent changes to open_mailbox actually caused it to be fixed, but let's be consistent.</td> +<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=295062">295062</a></td><td>tilghman</td><td>Create test verifying results of expression parser</td> +<td></td></tr></table> +<hr/> +<a name="diffstat"><h2 align="center">Diffstat Results</h2></a> +<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p> +<pre> +UPGRADE.txt | 5 +apps/app_dial.c | 2 +apps/app_directed_pickup.c | 24 +apps/app_meetme.c | 18 +apps/app_sms.c | 6 +apps/app_voicemail.c | 149 + +autoconf/ast_ext_lib.m4 | 1 +cdr/cdr_pgsql.c | 29 +channels/chan_dahdi.c | 363 +++- +channels/chan_iax2.c | 317 ++-- +channels/chan_local.c | 337 ++-- +channels/chan_sip.c | 220 +- +channels/chan_skinny.c | 28 +codecs/codec_dahdi.c | 8 +configs/cdr_pgsql.conf.sample | 1 +configs/gtalk.conf.sample | 26 +configs/jabber.conf.sample | 38 +configs/manager.conf.sample | 4 +configs/musiconhold.conf.sample | 2 +configs/phoneprov.conf.sample | 14 +configs/res_ldap.conf.sample | 33 +configure.ac | 52 +contrib/scripts/asterisk.ldif | 171 +- +contrib/valgrind.supp | 2 +funcs/func_curl.c | 5 +funcs/func_strings.c | 10 +include/asterisk.h | 1 +include/asterisk/autoconfig.h.in | 56 +include/asterisk/channel.h | 13 +include/asterisk/compat.h | 4 +include/asterisk/rtp.h | 1 +include/asterisk/timing.h | 10 +main/acl.c | 4 +main/ast_expr2.c | 566 ++++--- +main/ast_expr2.h | 69 +main/ast_expr2.y | 4 +main/asterisk.c | 14 +main/channel.c | 65 +main/cli.c | 55 +main/devicestate.c | 3 +main/features.c | 13 +main/file.c | 8 +main/manager.c | 1 +main/pbx.c | 308 ++- +main/rtp.c | 14 +main/strcompat.c | 13 +main/timing.c | 5 +pbx/ael/ael-test/ref.ael-ntest10 | 305 ++- +pbx/ael/ael-test/ref.ael-test1 | 28 +pbx/ael/ael-test/ref.ael-test19 | 28 +pbx/ael/ael-test/ref.ael-test2 | 47 +pbx/ael/ael-test/ref.ael-test3 | 190 +- +pbx/ael/ael-test/ref.ael-test4 | 47 +pbx/ael/ael-test/ref.ael-test5 | 20 +pbx/ael/ael-test/ref.ael-vtest13 | 3020 +++++++++++++++++++-------------------- +pbx/ael/ael-test/ref.ael-vtest17 | 24 +res/ael/ael.tab.c | 978 +++++++++--- +res/ael/ael.tab.h | 87 - +res/ael/ael_lex.c | 32 +res/ael/pval.c | 62 +res/res_agi.c | 2 +res/res_config_ldap.c | 4 +res/res_jabber.c | 17 +res/res_musiconhold.c | 2 +res/res_timing_timerfd.c | 10 +sounds/Makefile | 11 +sounds/sounds.xml | 18 +tests/test_expr.c | 191 ++ +68 files changed, 4908 insertions(+), 3307 deletions(-) +</pre><br/> +<hr/> +</body> +</html> diff --git a/asterisk-1.6.2.15-rc1-summary.txt b/asterisk-1.6.2.15-rc1-summary.txt new file mode 100644 index 000000000..0c7782312 --- /dev/null +++ b/asterisk-1.6.2.15-rc1-summary.txt @@ -0,0 +1,642 @@ + Release Summary + + asterisk-1.6.2.15-rc1 + + Date: 2010-11-15 + + <asteriskteam@digium.com> + + ---------------------------------------------------------------------- + + Table of Contents + + 1. Summary + 2. Contributors + 3. Closed Issues + 4. Other Changes + 5. Diffstat + + ---------------------------------------------------------------------- + + Summary + + [Back to Top] + + This release includes only bug fixes. The changes included were made only + to address problems that have been identified in this release series. + Users should be able to safely upgrade to this version if this release + series is already in use. Users considering upgrading from a previous + release series are strongly encouraged to review the UPGRADE.txt document + as well as the CHANGES document for information about upgrading to this + release series. + + The data in this summary reflects changes that have been made since the + previous release, asterisk-1.6.2.14. + + ---------------------------------------------------------------------- + + Contributors + + [Back to Top] + + This table lists the people who have submitted code, those that have + tested patches, as well as those that reported issues on the issue tracker + that were resolved in this release. For coders, the number is how many of + their patches (of any size) were committed into this release. For testers, + the number is the number of times their name was listed as assisting with + testing a patch. Finally, for reporters, the number is the number of + issues that they reported that were closed by commits that went into this + release. + + Coders Testers Reporters + 18 tilghman 3 tilghman 3 jmls + 12 jpeeler 2 alecdavis 3 wdoekes + 11 rmudgett 2 jamicque 2 jamicque + 5 lmadsen 2 lmadsen 2 tzafrir + 5 russell 2 ramonpeek 1 amorsen + 4 pabelanger 2 wdoekes 1 antonio + 4 twilson 2 zerohalo 1 asgaroth + 3 dvossel 1 camsown 1 camsown + 2 alecdavis 1 davidw 1 davidw + 2 mnicholson 1 DEA 1 dpetersen + 2 qwell 1 dpetersen 1 frawd + 1 bbryant 1 dvossel 1 jcollie + 1 camsown 1 jcovert 1 jcovert + 1 DEA 1 jmhunter 1 jmhunter + 1 jcovert 1 jmls 1 klaus3000 + 1 klaus3000 1 jtodd 1 kuj + 1 kuj 1 kuj 1 lathama + 1 lathama 1 mdu113 1 lftsy + 1 mdu113 1 Netview 1 mdu113 + 1 oej 1 pabelanger 1 murf + 1 RadicAlish 1 qwell 1 netfuse + 1 schern 1 RadicAlish 1 Netview + 1 schmitds 1 rgenthner 1 pabelanger + 1 sruffell 1 rmudgett 1 RadicAlish + 1 tbelder 1 schern 1 rain + 1 tzafrir 1 schmidts 1 ramonpeek + 1 wdoekes 1 seanbright 1 schern + 1 suretec 1 schmidts + 1 tbelder 1 scramatte + 1 tpanton 1 seanbright + 1 shin-shoryuken + 1 smallet + 1 tbelder + 1 tpanton + 1 voxter + 1 zerohalo + + ---------------------------------------------------------------------- + + Closed Issues + + [Back to Top] + + This is a list of all issues from the issue tracker that were closed by + changes that went into this release. + + Category: Applications/app_dial + + #16946: Call that clears in same app_dial poll as answer is reported as + NOANSWER but NORMAL_CLEARING + Revision: 291580 + Reporter: davidw + Coders: twilson + + Category: Applications/app_directed_pickup + + #18011: [patch] PickupChan() is not working with full channel name + Revision: 290375 + Reporter: schern + Testers: schern, dvossel + Coders: schern + + Category: Applications/app_meetme + + #17908: [patch] MeetMe PIN handling broken + Revision: 287759 + Reporter: kuj + Testers: kuj + Coders: kuj + + Category: Applications/app_voicemail + + #18240: [patch] VoicemailMain Exits Without Warning + Revision: 294904 + Reporter: netfuse + Testers: pabelanger + Coders: alecdavis + + Category: Applications/app_voicemail/ODBC + + #17803: [patch] [regression] Forwarding a voicemail with a prepended + message does not work + Revision: 289874 + Reporter: dpetersen + Testers: dpetersen + Coders: tilghman + + Category: CDR/General + + #17569: [patch] cdr->src variable is not set anymore in destination + channels + Revision: 289178 + Reporter: tbelder + Testers: tbelder + Coders: tbelder + + Category: CDR/cdr_pgsql + + #16940: [patch] Problem inserting CDR records when certain characters are + used + Revision: 288267 + Reporter: jamicque + Testers: jamicque + Coders: tilghman + + Category: Channels/chan_dahdi + + #16847: [patch] Deadlock between dahdi_exception and dahdi_indicate + Revision: 291655 + Reporter: shin-shoryuken + Testers: alecdavis, rmudgett + Coders: rmudgett + + #17270: getting warning message every 4 seconds + Revision: 294822 + Reporter: jmls + Coders: rmudgett + + Category: Channels/chan_iax2 + + #17919: [patch] schedule_delivery calls ast_bridged_channel() on an + unlocked channel + Revision: 288193 + Reporter: rain + Coders: rmudgett + + #18019: [patch] chan_iax2 - timing interface missing + Revision: 288147 + Reporter: Netview + Testers: Netview + Coders: pabelanger + + #18110: Playback stalls when playing demo-congrats to an IAX2 channel + Revision: 294277 + Reporter: tpanton + Testers: tpanton + Coders: jpeeler + + Category: Channels/chan_sip/General + + #16382: [patch] SIP OPTIONS qualify message forever + Revision: 294733 + Reporter: lftsy + Testers: zerohalo + Coders: jpeeler + + #17892: [patch] contact header does not get ast_uri_encoded value from + p->exten, but dialplan does + Revision: 289700 + Reporter: wdoekes + Testers: wdoekes + Coders: jpeeler + + #18123: rtautoclear = no or rtautoclear = 0 not respected in sip.conf + Revision: 293723 + Reporter: zerohalo + Coders: jpeeler + + #18176: [patch] record priv-recordintro as sln, not gsm + Revision: 292412 + Reporter: pabelanger + Coders: pabelanger + + Category: Channels/chan_sip/Interoperability + + #17878: [patch] chan_sip fails to remove hold when receving a reINVITE + without SDP + Revision: 294242 + Reporter: frawd + Coders: mnicholson + + Category: Channels/chan_sip/Subscriptions + + #17785: [patch] Encoded URI in a subscription does not work + Revision: 288113 + Reporter: ramonpeek + Testers: ramonpeek + Coders: tilghman + + #17950: iterate through all ao2_sip dialogs on every subscribe is slow, + and not needed + Revision: 289622 + Reporter: schmidts + Testers: schmidts + Coders: schmitds + + Category: Channels/chan_sip/TCP-TLS + + #17779: [patch] tcptls.c:350 Unable to connect SIP socket Connection + refused + Revision: 294733 + Reporter: smallet + Testers: zerohalo + Coders: jpeeler + + Category: Channels/chan_skinny + + #17680: [patch] chan_skinny crashes asterisk when parking a call + Revision: 287642 + Reporter: jmhunter + Testers: jmhunter, DEA + Coders: DEA + + Category: Core/BuildSystem + + #16155: [patch] Use pkg-config to find gmime libraries. + Revision: 294429 + Reporter: jcollie + Testers: tilghman + Coders: tilghman + + #17314: [patch] ./configure --with-pri=LIBPATH does not use libpri from + LIBPRI_PATH + Revision: 290751 + Reporter: tzafrir + Coders: qwell + + Category: Core/General + + #16057: [patch] Asterisk crashes with "Fixup failed on channel XXX, + strange things may happen." + Revision: 287685 + Reporter: amorsen + Testers: ramonpeek, davidw, alecdavis + Coders: alecdavis + + #17698: CTRL-C from asterisk -vvvvvvvvc has strange results + Revision: 290863 + Reporter: jmls + Coders: jpeeler + + #18282: [patch] better debug message in devicestate.c + Revision: 294500 + Reporter: klaus3000 + Coders: klaus3000 + + Category: Core/ManagerInterface + + #17987: [regression] Newchannel event is missing during masquerading + process + Revision: 289095 + Reporter: RadicAlish + Testers: RadicAlish + Coders: RadicAlish + + Category: Core/PBX + + #18165: [patch] hint state changes deadlock problem + Revision: 294639 + Reporter: antonio + Coders: jpeeler + + Category: Functions/func_curl + + #18161: [patch] crashing func_curl hashcompat with invalid data + Revision: 294988 + Reporter: wdoekes + Testers: tilghman + Coders: tilghman + + Category: Functions/func_odbc + + #18041: Crash when assigning 2 return vallues to an ARRAY with FUNC_ODBC + call + Revision: 288712 + Reporter: asgaroth + Coders: tilghman + + Category: Functions/func_strings + + #18060: [patch] func_string FILTER contains an infinite loop + Revision: 293158 + Reporter: wdoekes + Testers: wdoekes + Coders: wdoekes + + Category: PBX/General + + #17366: [patch] strange extension pattern matching + Revision: 290254 + Reporter: murf + Testers: tilghman + Coders: tilghman + + #17882: Crash in ast_frame_free + Revision: 288006 + Reporter: seanbright + Testers: seanbright + Coders: bbryant + + Category: Resources/res_agi + + #17970: [patch] res_agi.c:handle_getvariablefull() failes to unlock + channel if given channel name of the channel that AGI is running on + Revision: 289501 + Reporter: mdu113 + Testers: mdu113 + Coders: mdu113 + + #18001: [patch] GET DATA problem with pipes + Revision: 290575 + Reporter: jamicque + Testers: jamicque + Coders: tilghman + + Category: Resources/res_config_ldap + + #13861: [patch] ERROR[23999]: res_config_ldap.c:1292 update_ldap: Couldn't + modify ... Undefined attribute type + Revision: 292786 + Reporter: scramatte + Testers: lmadsen, jcovert, suretec, rgenthner + Coders: lmadsen + + #17376: [patch] res_ldap.conf points md5secret to RealmedPassword, but the + schema uses AstAccountRealmedPassword + Revision: 292556 + Reporter: jcovert + Coders: jcovert + + Category: Resources/res_features + + #16757: [patch] Parking a call, then retrieving it with ParkedCall() kills + the ability to transfer the retrieved call. + Revision: 294571 + Reporter: voxter + Coders: tilghman + + Category: Resources/res_jabber + + #17387: [patch] Memory corruption from iksemel + Revision: 290396 + Reporter: jmls + Testers: jmls + Coders: tilghman + + Category: Resources/res_musiconhold + + #16906: [patch] moh files install under datadir, at runtime: under + varlibdir + Revision: 292049 + Reporter: tzafrir + Coders: tzafrir + + Category: Resources/res_phoneprov + + #18107: [patch] Add Undocumented Variables to phoneprov.conf.sample + Revision: 291280 + Reporter: lathama + Coders: lathama + + Category: Sounds + + #17426: [patch] Australian Accent core sounds submission + Revision: 292224 + Reporter: camsown + Testers: camsown, lmadsen, jtodd, qwell + Coders: camsown, lmadsen + + ---------------------------------------------------------------------- + + Commits Not Associated with an Issue + + [Back to Top] + + This is a list of all changes that went into this release that did not + directly close an issue from the issue tracker. The commits may have been + marked as being related to an issue. If that is the case, the issue + numbers are listed here, as well. + + +------------------------------------------------------------------------+ + | Revision | Author | Summary | Issues | + | | | | Referenced | + |----------+------------+-----------------------------------+------------| + | 287934 | tilghman | Less than zero is an error, not | | + | | | any non-zero value. | | + |----------+------------+-----------------------------------+------------| + | | | Fix a 100% CPU consumption | | + | 288340 | russell | problem when setting console=yes | | + | | | in asterisk.conf. | | + |----------+------------+-----------------------------------+------------| + | | | During check_pendings, if the | | + | 288344 | dvossel | dialog is terminated with a | | + | | | CANCEL, change the invitestate to | | + | | | INV_CANCEL like in sip_hangup. | | + |----------+------------+-----------------------------------+------------| + | | | RFC3261 section 12.2 explicitly | | + | 288417 | dvossel | says out of order requests are | | + | | | responded with a 500 Server | | + | | | Internal Error response. | | + |----------+------------+-----------------------------------+------------| + | 288500 | twilson | Don't let a Local channel get | | + | | | bridged to itself | | + |----------+------------+-----------------------------------+------------| + | 288637 | tilghman | Solaris compatibility fixes | | + |----------+------------+-----------------------------------+------------| + | 288747 | twilson | Don't fail a masquerade if it is | | + | | | already being hung up | | + |----------+------------+-----------------------------------+------------| + | | | Don't completely ignore md5secret | | + | 289332 | russell | from LDAP if the value does not | | + | | | begin with {md5}. | | + |----------+------------+-----------------------------------+------------| + | 289334 | lmadsen | Update sample documentation to | | + | | | note md5secret requirements. | | + |----------+------------+-----------------------------------+------------| + | 289339 | qwell | Allow a manager originate to | | + | | | succeed on forwarded devices. | | + |----------+------------+-----------------------------------+------------| + | 289425 | russell | Fix a crash in app_sms. | | + |----------+------------+-----------------------------------+------------| + | | | Properly handle channel | | + | 289553 | mnicholson | allocation failures duing invites | | + | | | with replaces. | | + |----------+------------+-----------------------------------+------------| + | 289704 | pabelanger | Disable debugging by default | | + |----------+------------+-----------------------------------+------------| + | | | Change RFC2833 DTMF event | | + | 289798 | jpeeler | duration on end to report actual | | + | | | elapsed time. | | + |----------+------------+-----------------------------------+------------| + | | | Add documentation for | | + | 289950 | oej | undocumented option to AMI action | | + | | | originate | | + |----------+------------+-----------------------------------+------------| + | | | Automatically re-run configure | | + | 290101 | tilghman | test for menuselect, when the | | + | | | relevant makeopts settings | | + | | | change. | | + |----------+------------+-----------------------------------+------------| + | 290201 | tilghman | Fixing Mac OS X auto-builder. | | + |----------+------------+-----------------------------------+------------| + | 290324 | rmudgett | Merged revision 258974 from | | + |----------+------------+-----------------------------------+------------| + | 290712 | russell | Don't crash when Set() is called | | + | | | without a value. | | + |----------+------------+-----------------------------------+------------| + | 291073 | rmudgett | Fixed infinite loop in | | + | | | verbose/debug message output. | | + |----------+------------+-----------------------------------+------------| + | | | Add missing unlock to an | | + | 291110 | rmudgett | exception condition in | | + | | | reload_config(). | | + |----------+------------+-----------------------------------+------------| + | 291111 | rmudgett | Make exit from | | + | | | handle_request_do() consistent. | | + |----------+------------+-----------------------------------+------------| + | 291229 | lmadsen | Add documention that mentions | | + | | | options are defined but not used. | | + |----------+------------+-----------------------------------+------------| + | 291264 | tilghman | Oops, incorrect range (although | | + | | | unallocated at ARIN) | | + |----------+------------+-----------------------------------+------------| + | | | Lock pvt so pvt->owner can't | | + | 291393 | russell | disappear when queueing up a | | + | | | frame. | | + |----------+------------+-----------------------------------+------------| + | 291904 | twilson | Don't crash or deadlock on module | | + | | | unload | | + |----------+------------+-----------------------------------+------------| + | 291939 | pabelanger | Clean up formatting. | | + |----------+------------+-----------------------------------+------------| + | | | Fix improper operator key | | + | 292226 | jpeeler | acceptance and clean up temp | | + | | | recording files. | | + |----------+------------+-----------------------------------+------------| + | 292229 | lmadsen | Fix typo in the sounds/Makefile. | | + |----------+------------+-----------------------------------+------------| + | 292867 | dvossel | This patch turns chan_local pvts | | + | | | into astobj2 objects. | | + |----------+------------+-----------------------------------+------------| + | | | Fix inprocess_container in | | + | 293118 | jpeeler | voicemail to correctly restrict | | + | | | max messages. | | + |----------+------------+-----------------------------------+------------| + | 293195 | tilghman | "!00" evaluated as false, which | | + | | | is incorrect. Fixing. | | + |----------+------------+-----------------------------------+------------| + | 293196 | tilghman | "!00" evaluated as false, which | | + | | | is incorrect. Fixing. | | + |----------+------------+-----------------------------------+------------| + | 293340 | rmudgett | Remove some code that serves no | | + | | | purpose. | | + |----------+------------+-----------------------------------+------------| + | 293417 | rmudgett | Remove some more code that serves | | + | | | no purpose. | | + |----------+------------+-----------------------------------+------------| + | 293647 | rmudgett | Make warning message have more | | + | | | useful information in it. | | + |----------+------------+-----------------------------------+------------| + | | | Party A in an analog 3-way call | | + | 293806 | rmudgett | would continue to hear ringback | | + | | | after party C answers. | | + |----------+------------+-----------------------------------+------------| + | | | codecs/codec_dahdi: Prevent | | + | 293969 | sruffell | "choppy" audio when receiving | | + | | | unexpected frame sizes. | | + |----------+------------+-----------------------------------+------------| + | 294312 | jpeeler | add missing unlock not present in | | + | | | 294277 | | + |----------+------------+-----------------------------------+------------| + | | | Return correct error code if lock | | + | | | path fails. The recent changes to | | + | 294910 | jpeeler | open_mailbox actually caused it | | + | | | to be fixed, but let's be | | + | | | consistent. | | + |----------+------------+-----------------------------------+------------| + | 295062 | tilghman | Create test verifying results of | | + | | | expression parser | | + +------------------------------------------------------------------------+ + + ---------------------------------------------------------------------- + + Diffstat Results + + [Back to Top] + + This is a summary of the changes to the source code that went into this + release that was generated using the diffstat utility. + + UPGRADE.txt | 5 + apps/app_dial.c | 2 + apps/app_directed_pickup.c | 24 + apps/app_meetme.c | 18 + apps/app_sms.c | 6 + apps/app_voicemail.c | 149 + + autoconf/ast_ext_lib.m4 | 1 + cdr/cdr_pgsql.c | 29 + channels/chan_dahdi.c | 363 +++- + channels/chan_iax2.c | 317 ++-- + channels/chan_local.c | 337 ++-- + channels/chan_sip.c | 220 +- + channels/chan_skinny.c | 28 + codecs/codec_dahdi.c | 8 + configs/cdr_pgsql.conf.sample | 1 + configs/gtalk.conf.sample | 26 + configs/jabber.conf.sample | 38 + configs/manager.conf.sample | 4 + configs/musiconhold.conf.sample | 2 + configs/phoneprov.conf.sample | 14 + configs/res_ldap.conf.sample | 33 + configure.ac | 52 + contrib/scripts/asterisk.ldif | 171 +- + contrib/valgrind.supp | 2 + funcs/func_curl.c | 5 + funcs/func_strings.c | 10 + include/asterisk.h | 1 + include/asterisk/autoconfig.h.in | 56 + include/asterisk/channel.h | 13 + include/asterisk/compat.h | 4 + include/asterisk/rtp.h | 1 + include/asterisk/timing.h | 10 + main/acl.c | 4 + main/ast_expr2.c | 566 ++++--- + main/ast_expr2.h | 69 + main/ast_expr2.y | 4 + main/asterisk.c | 14 + main/channel.c | 65 + main/cli.c | 55 + main/devicestate.c | 3 + main/features.c | 13 + main/file.c | 8 + main/manager.c | 1 + main/pbx.c | 308 ++- + main/rtp.c | 14 + main/strcompat.c | 13 + main/timing.c | 5 + pbx/ael/ael-test/ref.ael-ntest10 | 305 ++- + pbx/ael/ael-test/ref.ael-test1 | 28 + pbx/ael/ael-test/ref.ael-test19 | 28 + pbx/ael/ael-test/ref.ael-test2 | 47 + pbx/ael/ael-test/ref.ael-test3 | 190 +- + pbx/ael/ael-test/ref.ael-test4 | 47 + pbx/ael/ael-test/ref.ael-test5 | 20 + pbx/ael/ael-test/ref.ael-vtest13 | 3020 +++++++++++++++++++-------------------- + pbx/ael/ael-test/ref.ael-vtest17 | 24 + res/ael/ael.tab.c | 978 +++++++++--- + res/ael/ael.tab.h | 87 - + res/ael/ael_lex.c | 32 + res/ael/pval.c | 62 + res/res_agi.c | 2 + res/res_config_ldap.c | 4 + res/res_jabber.c | 17 + res/res_musiconhold.c | 2 + res/res_timing_timerfd.c | 10 + sounds/Makefile | 11 + sounds/sounds.xml | 18 + tests/test_expr.c | 191 ++ + 68 files changed, 4908 insertions(+), 3307 deletions(-) + + ---------------------------------------------------------------------- diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4 index 0763c2b3a..df65a1352 100644 --- a/autoconf/ast_ext_lib.m4 +++ b/autoconf/ast_ext_lib.m4 @@ -71,6 +71,7 @@ for i in ${ac_mandatory_list}; do break fi done +$1_DIR=${$3_DIR} ]) PBX_$1=0 AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.]) diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index dc9b188cf..f469bc520 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -54,7 +54,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *name = "pgsql"; static char *config = "cdr_pgsql.conf"; -static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL; +static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL, *encoding = NULL; static int connected = 0; static int maxsize = 512, maxsize2 = 512; @@ -112,6 +112,13 @@ static int pgsql_log(struct ast_cdr *cdr) conn = PQsetdbLogin(pghostname, pgdbport, NULL, NULL, pgdbname, pgdbuser, pgpassword); if (PQstatus(conn) != CONNECTION_BAD) { connected = 1; + if (PQsetClientEncoding(conn, encoding)) { +#ifdef HAVE_PGSQL_pg_encoding_to_char + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn))); +#else + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default.\n", encoding); +#endif + } } else { pgerror = PQerrorMessage(conn); ast_log(LOG_ERROR, "Unable to connect to database server %s. Calls will not be logged!\n", pghostname); @@ -452,6 +459,19 @@ static int config_module(int reload) return -1; } + if (!(tmp = ast_variable_retrieve(cfg, "global", "encoding"))) { + ast_log(LOG_WARNING, "Encoding not specified. Assuming LATIN9\n"); + tmp = "LATIN9"; + } + + if (encoding) { + ast_free(encoding); + } + if (!(encoding = ast_strdup(tmp))) { + ast_config_destroy(cfg); + return -1; + } + if (option_debug) { if (ast_strlen_zero(pghostname)) { ast_debug(1, "using default unix socket\n"); @@ -472,6 +492,13 @@ static int config_module(int reload) int i, rows, version; ast_debug(1, "Successfully connected to PostgreSQL database.\n"); connected = 1; + if (PQsetClientEncoding(conn, encoding)) { +#ifdef HAVE_PGSQL_pg_encoding_to_char + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn))); +#else + ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default.\n", encoding); +#endif + } version = PQserverVersion(conn); if (version >= 70300) { diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index bad9e2c81..67836b48d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -548,6 +548,8 @@ struct dahdi_pri { #ifdef HAVE_PRI_INBANDDISCONNECT unsigned int inbanddisconnect:1; /*!< Should we support inband audio after receiving DISCONNECT? */ #endif + /*! TRUE if we have already whined about no D channels available. */ + unsigned int no_d_channels:1; time_t lastreset; /*!< time when unused channels were last reset */ long resetinterval; /*!< Interval (in seconds) for resetting unused channels */ /*! \brief ISDN signalling type (SIG_PRI, SIG_BRI, SIG_BRI_PTMP, etc...) */ @@ -1502,7 +1504,8 @@ static struct dahdi_ring_cadence AS_RP_cadence = {{250, 10000}}; #define CANBUSYDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __DAHDI_SIG_FXO) */) #define CANPROGRESSDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __DAHDI_SIG_FXO) */) -static int dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nullok) +#define dahdi_get_index(ast, p, nullok) _dahdi_get_index(ast, p, nullok, __PRETTY_FUNCTION__, __LINE__) +static int _dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nullok, const char *fname, unsigned long line) { int res; if (p->subs[SUB_REAL].owner == ast) @@ -1514,28 +1517,54 @@ static int dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nul else { res = -1; if (!nullok) - ast_log(LOG_WARNING, "Unable to get index, and nullok is not asserted\n"); + ast_log(LOG_WARNING, + "Unable to get index for '%s' on channel %d (%s(), line %lu)\n", + ast ? ast->name : "", p->channel, fname, line); } return res; } +/*! + * \internal + * \brief Obtain the specified subchannel owner lock if the owner exists. + * + * \param pvt Channel private struct. + * \param sub_idx Subchannel owner to lock. + * + * \note Assumes the pvt->lock is already obtained. + * + * \note + * Because deadlock avoidance may have been necessary, you need to confirm + * the state of things before continuing. + * + * \return Nothing + */ +static void dahdi_lock_sub_owner(struct dahdi_pvt *pvt, int sub_idx) +{ + for (;;) { + if (!pvt->subs[sub_idx].owner) { + /* No subchannel owner pointer */ + break; + } + if (!ast_channel_trylock(pvt->subs[sub_idx].owner)) { + /* Got subchannel owner lock */ + break; + } + /* We must unlock the private to avoid the possibility of a deadlock */ + DEADLOCK_AVOIDANCE(&pvt->lock); + } +} + static void wakeup_sub(struct dahdi_pvt *p, int a, struct dahdi_pri *pri) { #ifdef HAVE_PRI if (pri) ast_mutex_unlock(&pri->lock); #endif - for (;;) { - if (p->subs[a].owner) { - if (ast_channel_trylock(p->subs[a].owner)) { - DEADLOCK_AVOIDANCE(&p->lock); - } else { - ast_queue_frame(p->subs[a].owner, &ast_null_frame); - ast_channel_unlock(p->subs[a].owner); - break; - } - } else - break; + dahdi_lock_sub_owner(p, a); + if (p->subs[a].owner) { + ast_queue_frame(p->subs[a].owner, &ast_null_frame); + ast_channel_unlock(p->subs[a].owner); } #ifdef HAVE_PRI if (pri) @@ -4165,10 +4194,14 @@ static int pri_find_dchan(struct dahdi_pri *pri) if (newslot < 0) { newslot = 0; /* This is annoying to see on non persistent layer 2 connections. Let's not complain in that case */ - if (pri->sig != SIG_BRI_PTMP) { - ast_log(LOG_WARNING, "No D-channels available! Using Primary channel %d as D-channel anyway!\n", + if (pri->sig != SIG_BRI_PTMP && !pri->no_d_channels) { + pri->no_d_channels = 1; + ast_log(LOG_WARNING, + "No D-channels available! Using Primary channel %d as D-channel anyway!\n", pri->dchannels[newslot]); } + } else { + pri->no_d_channels = 0; } if (old && (oldslot != newslot)) ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n", @@ -4391,7 +4424,8 @@ static int dahdi_hangup(struct ast_channel *ast) p->subs[idx].needcallerid = 0; p->polarity = POLARITY_IDLE; dahdi_setlinear(p->subs[idx].dfd, 0); - if (idx == SUB_REAL) { + switch (idx) { + case SUB_REAL: if ((p->subs[SUB_CALLWAIT].dfd > -1) && (p->subs[SUB_THREEWAY].dfd > -1)) { ast_debug(1, "Normal call hung up with both three way call and a call waiting call in place?\n"); if (p->subs[SUB_CALLWAIT].inthreeway) { @@ -4410,15 +4444,23 @@ static int dahdi_hangup(struct ast_channel *ast) /* This was part of a three way call. Immediately make way for another call */ ast_debug(1, "Call was complete, setting owner to former third call\n"); + p->subs[SUB_REAL].inthreeway = 0; p->owner = p->subs[SUB_REAL].owner; } else { /* This call hasn't been completed yet... Set owner to NULL */ ast_debug(1, "Call was incomplete, setting owner to NULL\n"); p->owner = NULL; } - p->subs[SUB_REAL].inthreeway = 0; } } else if (p->subs[SUB_CALLWAIT].dfd > -1) { + /* Need to hold the lock for real-call, private, and call-waiting call */ + dahdi_lock_sub_owner(p, SUB_CALLWAIT); + if (!p->subs[SUB_CALLWAIT].owner) { + /* The call waiting call dissappeared. */ + p->owner = NULL; + break; + } + /* Move to the call-wait and switch back to them. */ swap_subs(p, SUB_CALLWAIT, SUB_REAL); unalloc_sub(p, SUB_CALLWAIT); @@ -4427,6 +4469,8 @@ static int dahdi_hangup(struct ast_channel *ast) p->subs[SUB_REAL].needanswer = 1; if (ast_bridged_channel(p->subs[SUB_REAL].owner)) ast_queue_control(p->subs[SUB_REAL].owner, AST_CONTROL_UNHOLD); + /* Unlock the call-waiting call that we swapped to real-call. */ + ast_channel_unlock(p->subs[SUB_REAL].owner); } else if (p->subs[SUB_THREEWAY].dfd > -1) { swap_subs(p, SUB_THREEWAY, SUB_REAL); unalloc_sub(p, SUB_THREEWAY); @@ -4434,17 +4478,21 @@ static int dahdi_hangup(struct ast_channel *ast) /* This was part of a three way call. Immediately make way for another call */ ast_debug(1, "Call was complete, setting owner to former third call\n"); + p->subs[SUB_REAL].inthreeway = 0; p->owner = p->subs[SUB_REAL].owner; } else { /* This call hasn't been completed yet... Set owner to NULL */ ast_debug(1, "Call was incomplete, setting owner to NULL\n"); p->owner = NULL; } - p->subs[SUB_REAL].inthreeway = 0; } - } else if (idx == SUB_CALLWAIT) { + break; + case SUB_CALLWAIT: /* Ditch the holding callwait call, and immediately make it availabe */ if (p->subs[SUB_CALLWAIT].inthreeway) { + /* Need to hold the lock for call-waiting call, private, and 3-way call */ + dahdi_lock_sub_owner(p, SUB_THREEWAY); + /* This is actually part of a three way, placed on hold. Place the third part on music on hold now */ if (p->subs[SUB_THREEWAY].owner && ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) { @@ -4456,26 +4504,41 @@ static int dahdi_hangup(struct ast_channel *ast) /* Make it the call wait now */ swap_subs(p, SUB_CALLWAIT, SUB_THREEWAY); unalloc_sub(p, SUB_THREEWAY); + if (p->subs[SUB_CALLWAIT].owner) { + /* Unlock the 3-way call that we swapped to call-waiting call. */ + ast_channel_unlock(p->subs[SUB_CALLWAIT].owner); + } } else unalloc_sub(p, SUB_CALLWAIT); - } else if (idx == SUB_THREEWAY) { + break; + case SUB_THREEWAY: + /* Need to hold the lock for 3-way call, private, and call-waiting call */ + dahdi_lock_sub_owner(p, SUB_CALLWAIT); if (p->subs[SUB_CALLWAIT].inthreeway) { /* The other party of the three way call is currently in a call-wait state. Start music on hold for them, and take the main guy out of the third call */ + p->subs[SUB_CALLWAIT].inthreeway = 0; if (p->subs[SUB_CALLWAIT].owner && ast_bridged_channel(p->subs[SUB_CALLWAIT].owner)) { ast_queue_control_data(p->subs[SUB_CALLWAIT].owner, AST_CONTROL_HOLD, S_OR(p->mohsuggest, NULL), !ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0); } - p->subs[SUB_CALLWAIT].inthreeway = 0; + } + if (p->subs[SUB_CALLWAIT].owner) { + ast_channel_unlock(p->subs[SUB_CALLWAIT].owner); } p->subs[SUB_REAL].inthreeway = 0; /* If this was part of a three way call index, let us make another three way call */ unalloc_sub(p, SUB_THREEWAY); - } else { - /* This wasn't any sort of call, but how are we an index? */ - ast_log(LOG_WARNING, "Index found but not any type of call?\n"); + break; + default: + /* + * Should never happen. + * This wasn't any sort of call, so how are we an index? + */ + ast_log(LOG_ERROR, "Index found but not any type of call?\n"); + break; } } @@ -5369,11 +5432,14 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch p1->subs[SUB_REAL].owner && p1->subs[SUB_REAL].inthreeway && (p1->subs[SUB_REAL].owner->_state == AST_STATE_RINGING)) { - ast_debug(1, "Playing ringback on %s since %s is in a ringing three-way\n", c0->name, c1->name); + ast_debug(1, + "Playing ringback on %d/%d(%s) since %d/%d(%s) is in a ringing three-way\n", + p0->channel, oi0, c0->name, p1->channel, oi1, c1->name); tone_zone_play_tone(p0->subs[oi0].dfd, DAHDI_TONE_RINGTONE); os1 = p1->subs[SUB_REAL].owner->_state; } else { - ast_debug(1, "Stopping tones on %d/%d talking to %d/%d\n", p0->channel, oi0, p1->channel, oi1); + ast_debug(1, "Stopping tones on %d/%d(%s) talking to %d/%d(%s)\n", + p0->channel, oi0, c0->name, p1->channel, oi1, c1->name); tone_zone_play_tone(p0->subs[oi0].dfd, -1); } if ((oi0 == SUB_THREEWAY) && @@ -5381,12 +5447,15 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch p0->subs[SUB_REAL].owner && p0->subs[SUB_REAL].inthreeway && (p0->subs[SUB_REAL].owner->_state == AST_STATE_RINGING)) { - ast_debug(1, "Playing ringback on %s since %s is in a ringing three-way\n", c1->name, c0->name); + ast_debug(1, + "Playing ringback on %d/%d(%s) since %d/%d(%s) is in a ringing three-way\n", + p1->channel, oi1, c1->name, p0->channel, oi0, c0->name); tone_zone_play_tone(p1->subs[oi1].dfd, DAHDI_TONE_RINGTONE); os0 = p0->subs[SUB_REAL].owner->_state; } else { - ast_debug(1, "Stopping tones on %d/%d talking to %d/%d\n", p1->channel, oi1, p0->channel, oi0); - tone_zone_play_tone(p1->subs[oi0].dfd, -1); + ast_debug(1, "Stopping tones on %d/%d(%s) talking to %d/%d(%s)\n", + p1->channel, oi1, c1->name, p0->channel, oi0, c0->name); + tone_zone_play_tone(p1->subs[oi1].dfd, -1); } if ((oi0 == SUB_REAL) && (oi1 == SUB_REAL)) { if (!p0->echocanbridged || !p1->echocanbridged) { @@ -5584,6 +5653,20 @@ static int dahdi_ring_phone(struct dahdi_pvt *p) static void *ss_thread(void *data); +/*! + * \internal + * \brief Attempt to transfer 3-way call. + * + * \param p private structure. + * + * \note + * On entry these locks are held: real-call, private, 3-way call. + * + * \retval 1 Transfer successful. 3-way call is unlocked and subchannel is unalloced. + * Swapped real and 3-way subchannel. + * \retval 0 Transfer successful. 3-way call is unlocked and subchannel is unalloced. + * \retval -1 on error. Caller must unlock 3-way call. + */ static int attempt_transfer(struct dahdi_pvt *p) { /* In order to transfer, we need at least one of the channels to @@ -5591,10 +5674,17 @@ static int attempt_transfer(struct dahdi_pvt *p) together (but then, why would we want to?) */ if (ast_bridged_channel(p->subs[SUB_REAL].owner)) { /* The three-way person we're about to transfer to could still be in MOH, so - stop if now if appropriate */ + stop it now if appropriate */ if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) ast_queue_control(p->subs[SUB_THREEWAY].owner, AST_CONTROL_UNHOLD); if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING) { + /* + * This may not be safe. + * We currently hold the locks on the real-call, private, and 3-way call. + * We could possibly avoid this here by using an ast_queue_control() instead. + * However, the following ast_channel_masquerade() is going to be locking + * the bridged channel again anyway. + */ ast_indicate(ast_bridged_channel(p->subs[SUB_REAL].owner), AST_CONTROL_RINGING); } if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RING) { @@ -5611,6 +5701,13 @@ static int attempt_transfer(struct dahdi_pvt *p) } else if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) { ast_queue_control(p->subs[SUB_REAL].owner, AST_CONTROL_UNHOLD); if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RINGING) { + /* + * This may not be safe. + * We currently hold the locks on the real-call, private, and 3-way call. + * We could possibly avoid this here by using an ast_queue_control() instead. + * However, the following ast_channel_masquerade() is going to be locking + * the bridged channel again anyway. + */ ast_indicate(ast_bridged_channel(p->subs[SUB_THREEWAY].owner), AST_CONTROL_RINGING); } if (p->subs[SUB_REAL].owner->_state == AST_STATE_RING) { @@ -5630,7 +5727,6 @@ static int attempt_transfer(struct dahdi_pvt *p) } else { ast_debug(1, "Neither %s nor %s are in a bridge, nothing to transfer\n", p->subs[SUB_REAL].owner->name, p->subs[SUB_THREEWAY].owner->name); - p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; return -1; } return 0; @@ -5792,9 +5888,17 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) struct ast_frame *f; idx = dahdi_get_index(ast, p, 0); + if (idx < 0) { + return &ast_null_frame; + } + if (idx != SUB_REAL) { + ast_log(LOG_ERROR, "We got an event on a non real sub. Fix it!\n"); + } + mysig = p->sig; if (p->outsigmod > -1) mysig = p->outsigmod; + p->subs[idx].f.frametype = AST_FRAME_NULL; p->subs[idx].f.subclass = 0; p->subs[idx].f.datalen = 0; @@ -5805,8 +5909,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) p->subs[idx].f.data.ptr = NULL; f = &p->subs[idx].f; - if (idx < 0) - return &p->subs[idx].f; if (p->fake_event) { res = p->fake_event; p->fake_event = 0; @@ -5999,6 +6101,17 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) if (idx == SUB_REAL) { /* The normal line was hung up */ if (p->subs[SUB_CALLWAIT].owner) { + /* Need to hold the lock for real-call, private, and call-waiting call */ + dahdi_lock_sub_owner(p, SUB_CALLWAIT); + if (!p->subs[SUB_CALLWAIT].owner) { + /* + * The call waiting call dissappeared. + * This is now a normal hangup. + */ + dahdi_disable_ec(p); + return NULL; + } + /* There's a call waiting call, so ring the phone, but make it unowned in the mean time */ swap_subs(p, SUB_CALLWAIT, SUB_REAL); ast_verb(3, "Channel %d still has (callwait) call, ringing phone\n", p->channel); @@ -6013,37 +6126,34 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) /* Don't start streaming audio yet if the incoming call isn't up yet */ if (p->subs[SUB_REAL].owner->_state != AST_STATE_UP) p->dialing = 1; + /* Unlock the call-waiting call that we swapped to real-call. */ + ast_channel_unlock(p->subs[SUB_REAL].owner); dahdi_ring_phone(p); } else if (p->subs[SUB_THREEWAY].owner) { unsigned int mssinceflash; - /* Here we have to retain the lock on both the main channel, the 3-way channel, and - the private structure -- not especially easy or clean */ - while (p->subs[SUB_THREEWAY].owner && ast_channel_trylock(p->subs[SUB_THREEWAY].owner)) { - /* Yuck, didn't get the lock on the 3-way, gotta release everything and re-grab! */ - DLA_UNLOCK(&p->lock); - CHANNEL_DEADLOCK_AVOIDANCE(ast); - /* We can grab ast and p in that order, without worry. We should make sure - nothing seriously bad has happened though like some sort of bizarre double - masquerade! */ - DLA_LOCK(&p->lock); - if (p->owner != ast) { - ast_log(LOG_WARNING, "This isn't good...\n"); - return NULL; - } - } + + /* Need to hold the lock for real-call, private, and 3-way call */ + dahdi_lock_sub_owner(p, SUB_THREEWAY); if (!p->subs[SUB_THREEWAY].owner) { ast_log(LOG_NOTICE, "Whoa, threeway disappeared kinda randomly.\n"); + /* Just hangup */ + return NULL; + } + if (p->owner != ast) { + ast_channel_unlock(p->subs[SUB_THREEWAY].owner); + ast_log(LOG_WARNING, "This isn't good...\n"); + /* Just hangup */ return NULL; } + mssinceflash = ast_tvdiff_ms(ast_tvnow(), p->flashtime); ast_debug(1, "Last flash was %d ms ago\n", mssinceflash); if (mssinceflash < MIN_MS_SINCE_FLASH) { /* It hasn't been long enough since the last flashook. This is probably a bounce on hanging up. Hangup both channels now */ - if (p->subs[SUB_THREEWAY].owner) - ast_queue_hangup_with_cause(p->subs[SUB_THREEWAY].owner, AST_CAUSE_NO_ANSWER); - p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; ast_debug(1, "Looks like a bounced flash, hanging up both calls on %d\n", p->channel); + ast_queue_hangup_with_cause(p->subs[SUB_THREEWAY].owner, AST_CAUSE_NO_ANSWER); + p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; ast_channel_unlock(p->subs[SUB_THREEWAY].owner); } else if ((ast->pbx) || (ast->_state == AST_STATE_UP)) { if (p->transfer) { @@ -6052,33 +6162,33 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) p->subs[SUB_THREEWAY].inthreeway = 0; /* Only attempt transfer if the phone is ringing; why transfer to busy tone eh? */ if (!p->transfertobusy && ast->_state == AST_STATE_BUSY) { - ast_channel_unlock(p->subs[SUB_THREEWAY].owner); /* Swap subs and dis-own channel */ swap_subs(p, SUB_THREEWAY, SUB_REAL); + /* Unlock the 3-way call that we swapped to real-call. */ + ast_channel_unlock(p->subs[SUB_REAL].owner); p->owner = NULL; /* Ring the phone */ dahdi_ring_phone(p); } else { - if ((res = attempt_transfer(p)) < 0) { + res = attempt_transfer(p); + if (res < 0) { + /* Transfer attempt failed. */ p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; - if (p->subs[SUB_THREEWAY].owner) - ast_channel_unlock(p->subs[SUB_THREEWAY].owner); + ast_channel_unlock(p->subs[SUB_THREEWAY].owner); } else if (res) { /* Don't actually hang up at this point */ - if (p->subs[SUB_THREEWAY].owner) - ast_channel_unlock(p->subs[SUB_THREEWAY].owner); break; } } } else { p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; - if (p->subs[SUB_THREEWAY].owner) - ast_channel_unlock(p->subs[SUB_THREEWAY].owner); + ast_channel_unlock(p->subs[SUB_THREEWAY].owner); } } else { - ast_channel_unlock(p->subs[SUB_THREEWAY].owner); /* Swap subs and dis-own channel */ swap_subs(p, SUB_THREEWAY, SUB_REAL); + /* Unlock the 3-way call that we swapped to real-call. */ + ast_channel_unlock(p->subs[SUB_REAL].owner); p->owner = NULL; /* Ring the phone */ dahdi_ring_phone(p); @@ -6339,6 +6449,17 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) } if (p->subs[SUB_CALLWAIT].owner) { + /* Need to hold the lock for real-call, private, and call-waiting call */ + dahdi_lock_sub_owner(p, SUB_CALLWAIT); + if (!p->subs[SUB_CALLWAIT].owner) { + /* + * The call waiting call dissappeared. + * Let's just ignore this flash-hook. + */ + ast_log(LOG_NOTICE, "Whoa, the call-waiting call disappeared.\n"); + goto winkflashdone; + } + /* Swap to call-wait */ swap_subs(p, SUB_REAL, SUB_CALLWAIT); tone_zone_play_tone(p->subs[SUB_REAL].dfd, -1); @@ -6350,6 +6471,7 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) } p->callwaitingrepeat = 0; p->cidcwexpire = 0; + /* Start music on hold if appropriate */ if (!p->subs[SUB_CALLWAIT].inthreeway && ast_bridged_channel(p->subs[SUB_CALLWAIT].owner)) { ast_queue_control_data(p->subs[SUB_CALLWAIT].owner, AST_CONTROL_HOLD, @@ -6363,6 +6485,9 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) !ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0); } p->subs[SUB_REAL].needunhold = 1; + + /* Unlock the call-waiting call that we swapped to real-call. */ + ast_channel_unlock(p->subs[SUB_REAL].owner); } else if (!p->subs[SUB_THREEWAY].owner) { if (!p->threewaycalling) { /* Just send a flash if no 3-way calling */ @@ -6394,6 +6519,13 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) } /* Make new channel */ chan = dahdi_new(p, AST_STATE_RESERVED, 0, SUB_THREEWAY, 0, 0); + if (!chan) { + ast_log(LOG_WARNING, + "Cannot allocate new call structure on channel %d\n", + p->channel); + unalloc_sub(p, SUB_THREEWAY); + goto winkflashdone; + } if (p->dahditrcallerid) { if (!p->origcid_num) p->origcid_num = ast_strdup(p->cid_num); @@ -6410,25 +6542,12 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) if (res) ast_log(LOG_WARNING, "Unable to start dial recall tone on channel %d\n", p->channel); p->owner = chan; - if (!chan) { - ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", p->channel); - } else if (ast_pthread_create_detached(&threadid, NULL, ss_thread, chan)) { + if (ast_pthread_create_detached(&threadid, NULL, ss_thread, chan)) { ast_log(LOG_WARNING, "Unable to start simple switch on channel %d\n", p->channel); res = tone_zone_play_tone(p->subs[SUB_REAL].dfd, DAHDI_TONE_CONGESTION); dahdi_enable_ec(p); ast_hangup(chan); } else { - struct ast_channel *other = ast_bridged_channel(p->subs[SUB_THREEWAY].owner); - int way3bridge = 0, cdr3way = 0; - - if (!other) { - other = ast_bridged_channel(p->subs[SUB_REAL].owner); - } else - way3bridge = 1; - - if (p->subs[SUB_THREEWAY].owner->cdr) - cdr3way = 1; - ast_verb(3, "Started three way call on channel %d\n", p->channel); /* Start music on hold if appropriate */ @@ -6442,6 +6561,20 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) } } else { /* Already have a 3 way call */ + int orig_3way_sub; + + /* Need to hold the lock for real-call, private, and 3-way call */ + dahdi_lock_sub_owner(p, SUB_THREEWAY); + if (!p->subs[SUB_THREEWAY].owner) { + /* + * The 3-way call dissappeared. + * Let's just ignore this flash-hook. + */ + ast_log(LOG_NOTICE, "Whoa, the 3-way call disappeared.\n"); + goto winkflashdone; + } + orig_3way_sub = SUB_THREEWAY; + if (p->subs[SUB_THREEWAY].inthreeway) { /* Call is already up, drop the last person */ ast_debug(1, "Got flash with three way call up, dropping last call on %d\n", p->channel); @@ -6449,6 +6582,7 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) if ((p->subs[SUB_REAL].owner->_state != AST_STATE_UP) && (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_UP)) { /* Swap back -- we're dropping the real 3-way that isn't finished yet*/ swap_subs(p, SUB_THREEWAY, SUB_REAL); + orig_3way_sub = SUB_REAL; p->owner = p->subs[SUB_REAL].owner; } /* Drop the last call and stop the conference */ @@ -6460,46 +6594,35 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) /* Lets see what we're up to */ if (((ast->pbx) || (ast->_state == AST_STATE_UP)) && (p->transfertobusy || (ast->_state != AST_STATE_BUSY))) { - int otherindex = SUB_THREEWAY; - struct ast_channel *other = ast_bridged_channel(p->subs[SUB_THREEWAY].owner); - int way3bridge = 0, cdr3way = 0; - - if (!other) { - other = ast_bridged_channel(p->subs[SUB_REAL].owner); - } else - way3bridge = 1; - - if (p->subs[SUB_THREEWAY].owner->cdr) - cdr3way = 1; - - ast_verb(3, "Building conference on call on %s and %s\n", p->subs[SUB_THREEWAY].owner->name, p->subs[SUB_REAL].owner->name); + ast_verb(3, "Building conference call with %s and %s\n", + p->subs[SUB_THREEWAY].owner->name, + p->subs[SUB_REAL].owner->name); /* Put them in the threeway, and flip */ p->subs[SUB_THREEWAY].inthreeway = 1; p->subs[SUB_REAL].inthreeway = 1; if (ast->_state == AST_STATE_UP) { swap_subs(p, SUB_THREEWAY, SUB_REAL); - otherindex = SUB_REAL; + orig_3way_sub = SUB_REAL; } - if (p->subs[otherindex].owner && ast_bridged_channel(p->subs[otherindex].owner)) - ast_queue_control(p->subs[otherindex].owner, AST_CONTROL_UNHOLD); - p->subs[otherindex].needunhold = 1; - p->owner = p->subs[SUB_REAL].owner; - if (ast->_state == AST_STATE_RINGING) { - ast_debug(1, "Enabling ringtone on real and threeway\n"); - res = tone_zone_play_tone(p->subs[SUB_REAL].dfd, DAHDI_TONE_RINGTONE); - res = tone_zone_play_tone(p->subs[SUB_THREEWAY].dfd, DAHDI_TONE_RINGTONE); + if (ast_bridged_channel(p->subs[orig_3way_sub].owner)) { + ast_queue_control(p->subs[orig_3way_sub].owner, AST_CONTROL_UNHOLD); } + p->subs[orig_3way_sub].needunhold = 1; + p->owner = p->subs[SUB_REAL].owner; } else { - ast_verb(3, "Dumping incomplete call on on %s\n", p->subs[SUB_THREEWAY].owner->name); + ast_verb(3, "Dumping incomplete call on %s\n", p->subs[SUB_THREEWAY].owner->name); swap_subs(p, SUB_THREEWAY, SUB_REAL); + orig_3way_sub = SUB_REAL; p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV; p->owner = p->subs[SUB_REAL].owner; - if (p->subs[SUB_REAL].owner && ast_bridged_channel(p->subs[SUB_REAL].owner)) + if (ast_bridged_channel(p->subs[SUB_REAL].owner)) { ast_queue_control(p->subs[SUB_REAL].owner, AST_CONTROL_UNHOLD); + } p->subs[SUB_REAL].needunhold = 1; dahdi_enable_ec(p); } } + ast_channel_unlock(p->subs[orig_3way_sub].owner); } winkflashdone: update_conf(p); @@ -6688,12 +6811,14 @@ static struct ast_frame *__dahdi_exception(struct ast_channel *ast) { struct dahdi_pvt *p = ast->tech_pvt; int res; - int usedindex=-1; int idx; struct ast_frame *f; idx = dahdi_get_index(ast, p, 1); + if (idx < 0) { + idx = SUB_REAL; + } p->subs[idx].f.frametype = AST_FRAME_NULL; p->subs[idx].f.datalen = 0; @@ -6705,7 +6830,6 @@ static struct ast_frame *__dahdi_exception(struct ast_channel *ast) p->subs[idx].f.src = "dahdi_exception"; p->subs[idx].f.data.ptr = NULL; - if ((!p->owner) && (!(p->radio || (p->oprmode < 0)))) { /* If nobody owns us, absorb the event appropriately, otherwise we loop indefinitely. This occurs when, during call waiting, the @@ -6722,6 +6846,14 @@ static struct ast_frame *__dahdi_exception(struct ast_channel *ast) (res != DAHDI_EVENT_HOOKCOMPLETE)) { ast_debug(1, "Restoring owner of channel %d on event %d\n", p->channel, res); p->owner = p->subs[SUB_REAL].owner; + if (p->owner && ast != p->owner) { + /* + * Could this even happen? + * Possible deadlock because we do not have the real-call lock. + */ + ast_log(LOG_WARNING, "Event %s on %s is not restored owner %s\n", + event2str(res), ast->name, p->owner->name); + } if (p->owner && ast_bridged_channel(p->owner)) ast_queue_control(p->owner, AST_CONTROL_UNHOLD); p->subs[SUB_REAL].needunhold = 1; @@ -6734,8 +6866,10 @@ static struct ast_frame *__dahdi_exception(struct ast_channel *ast) dahdi_ring_phone(p); p->callwaitingrepeat = 0; p->cidcwexpire = 0; - } else - ast_log(LOG_WARNING, "Absorbed on hook, but nobody is left!?!?\n"); + } else { + ast_log(LOG_WARNING, "Absorbed %s, but nobody is left!?!?\n", + event2str(res)); + } update_conf(p); break; case DAHDI_EVENT_RINGOFFHOOK: @@ -6757,10 +6891,7 @@ static struct ast_frame *__dahdi_exception(struct ast_channel *ast) ast_verb(3, "Channel %d flashed to other channel %s\n", p->channel, p->owner->name); if (p->owner->_state != AST_STATE_UP) { /* Answer if necessary */ - usedindex = dahdi_get_index(p->owner, p, 0); - if (usedindex > -1) { - p->subs[usedindex].needanswer = 1; - } + p->subs[SUB_REAL].needanswer = 1; ast_setstate(p->owner, AST_STATE_UP); } p->callwaitingrepeat = 0; @@ -6768,12 +6899,15 @@ static struct ast_frame *__dahdi_exception(struct ast_channel *ast) if (ast_bridged_channel(p->owner)) ast_queue_control(p->owner, AST_CONTROL_UNHOLD); p->subs[SUB_REAL].needunhold = 1; - } else - ast_log(LOG_WARNING, "Absorbed on hook, but nobody is left!?!?\n"); + } else { + ast_log(LOG_WARNING, "Absorbed %s, but nobody is left!?!?\n", + event2str(res)); + } update_conf(p); break; default: ast_log(LOG_WARNING, "Don't know how to absorb event %s\n", event2str(res)); + break; } f = &p->subs[idx].f; return f; @@ -7797,9 +7931,8 @@ static void *ss_thread(void *data) goto quit; } ast_verb(3, "Starting simple switch on '%s'\n", chan->name); - idx = dahdi_get_index(chan, p, 1); + idx = dahdi_get_index(chan, p, 0); if (idx < 0) { - ast_log(LOG_WARNING, "Huh?\n"); ast_hangup(chan); goto quit; } @@ -9708,9 +9841,12 @@ static void *do_monitor(void *data) last = i; if (last) { /* Only allow MWI to be initiated on a quiescent fxs port */ - if (!last->mwisendactive && last->sig & __DAHDI_SIG_FXO && - !last->fxsoffhookstate && !last->owner && - !ast_strlen_zero(last->mailbox) && (thispass - last->onhooktime > 3)) { + if (!last->mwisendactive + && (last->sig & __DAHDI_SIG_FXO) + && !last->fxsoffhookstate + && !last->owner + && !ast_strlen_zero(last->mailbox) + && (thispass - last->onhooktime > 3)) { res = has_voicemail(last); if (last->msgstate != res) { /* Set driver resources for signalling VMWI */ @@ -12756,6 +12892,7 @@ static void *pri_dchannel(void *vpri) switch (e->e) { case PRI_EVENT_DCHAN_UP: + pri->no_d_channels = 0; if (!pri->pri) pri_find_dchan(pri); /* Note presense of D-channel */ diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index ebab90190..bcc8b39f3 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1181,6 +1181,39 @@ static const struct ast_channel_tech iax2_tech = { .func_channel_read = acf_channel_read, }; +/*! + * \internal + * \brief Obtain the owner channel lock if the owner exists. + * + * \param callno IAX2 call id. + * + * \note Assumes the iaxsl[callno] lock is already obtained. + * + * \note + * IMPORTANT NOTE!!! Any time this function is used, even if + * iaxs[callno] was valid before calling it, it may no longer be + * valid after calling it. This function may unlock and lock + * the mutex associated with this callno, meaning that another + * thread may grab it and destroy the call. + * + * \return Nothing + */ +static void iax2_lock_owner(int callno) +{ + for (;;) { + if (!iaxs[callno] || !iaxs[callno]->owner) { + /* There is no owner lock to get. */ + break; + } + if (!ast_channel_trylock(iaxs[callno]->owner)) { + /* We got the lock */ + break; + } + /* Avoid deadlock by pausing and trying again */ + DEADLOCK_AVOIDANCE(&iaxsl[callno]); + } +} + static void mwi_event_cb(const struct ast_event *event, void *userdata) { /* The MWI subscriptions exist just so the core knows we care about those @@ -2763,18 +2796,10 @@ static int find_callno_locked(unsigned short callno, unsigned short dcallno, str */ static int iax2_queue_frame(int callno, struct ast_frame *f) { - for (;;) { - if (iaxs[callno] && iaxs[callno]->owner) { - if (ast_channel_trylock(iaxs[callno]->owner)) { - /* Avoid deadlock by pausing and trying again */ - DEADLOCK_AVOIDANCE(&iaxsl[callno]); - } else { - ast_queue_frame(iaxs[callno]->owner, f); - ast_channel_unlock(iaxs[callno]->owner); - break; - } - } else - break; + iax2_lock_owner(callno); + if (iaxs[callno] && iaxs[callno]->owner) { + ast_queue_frame(iaxs[callno]->owner, f); + ast_channel_unlock(iaxs[callno]->owner); } return 0; } @@ -2794,18 +2819,10 @@ static int iax2_queue_frame(int callno, struct ast_frame *f) */ static int iax2_queue_hangup(int callno) { - for (;;) { - if (iaxs[callno] && iaxs[callno]->owner) { - if (ast_channel_trylock(iaxs[callno]->owner)) { - /* Avoid deadlock by pausing and trying again */ - DEADLOCK_AVOIDANCE(&iaxsl[callno]); - } else { - ast_queue_hangup(iaxs[callno]->owner); - ast_channel_unlock(iaxs[callno]->owner); - break; - } - } else - break; + iax2_lock_owner(callno); + if (iaxs[callno] && iaxs[callno]->owner) { + ast_queue_hangup(iaxs[callno]->owner); + ast_channel_unlock(iaxs[callno]->owner); } return 0; } @@ -2826,18 +2843,10 @@ static int iax2_queue_hangup(int callno) static int iax2_queue_control_data(int callno, enum ast_control_frame_type control, const void *data, size_t datalen) { - for (;;) { - if (iaxs[callno] && iaxs[callno]->owner) { - if (ast_channel_trylock(iaxs[callno]->owner)) { - /* Avoid deadlock by pausing and trying again */ - DEADLOCK_AVOIDANCE(&iaxsl[callno]); - } else { - ast_queue_control_data(iaxs[callno]->owner, control, data, datalen); - ast_channel_unlock(iaxs[callno]->owner); - break; - } - } else - break; + iax2_lock_owner(callno); + if (iaxs[callno] && iaxs[callno]->owner) { + ast_queue_control_data(iaxs[callno]->owner, control, data, datalen); + ast_channel_unlock(iaxs[callno]->owner); } return 0; } @@ -4015,6 +4024,12 @@ static int schedule_delivery(struct iax_frame *fr, int updatehistory, int fromtr return -1; } + iax2_lock_owner(fr->callno); + if (!iaxs[fr->callno]) { + /* The call dissappeared so discard this frame that we could not send. */ + iax2_frame_free(fr); + return -1; + } if ((owner = iaxs[fr->callno]->owner)) bridge = ast_bridged_channel(owner); @@ -4023,6 +4038,8 @@ static int schedule_delivery(struct iax_frame *fr, int updatehistory, int fromtr if ( (!ast_test_flag(iaxs[fr->callno], IAX_FORCEJITTERBUF)) && owner && bridge && (bridge->tech->properties & AST_CHAN_TP_WANTSJITTER) ) { jb_frame frame; + ast_channel_unlock(owner); + /* deliver any frames in the jb */ while (jb_getall(iaxs[fr->callno]->jb, &frame) == JB_OK) { __do_deliver(frame.data); @@ -4041,6 +4058,9 @@ static int schedule_delivery(struct iax_frame *fr, int updatehistory, int fromtr __do_deliver(fr); return -1; } + if (owner) { + ast_channel_unlock(owner); + } /* insert into jitterbuffer */ /* TODO: Perhaps we could act immediately if it's not droppable and late */ @@ -9578,6 +9598,7 @@ static int socket_process(struct iax2_thread *thread) if (f.frametype == AST_FRAME_IAX) { if (iax_parse_ies(&ies, thread->buf + sizeof(struct ast_iax2_full_hdr), f.datalen)) { ast_log(LOG_WARNING, "Undecodable frame received from '%s'\n", ast_inet_ntoa(sin.sin_addr)); + ast_variables_destroy(ies.vars); return 1; } f.data.ptr = NULL; @@ -9597,6 +9618,7 @@ static int socket_process(struct iax2_thread *thread) if (!dcallno && iax2_allow_new(f.frametype, f.subclass, 1)) { /* only set NEW_ALLOW if calltoken checks out */ if (handle_call_token(fh, &ies, &sin, fd)) { + ast_variables_destroy(ies.vars); return 1; } @@ -9614,6 +9636,7 @@ static int socket_process(struct iax2_thread *thread) /* Don't know anything about it yet */ f.frametype = AST_FRAME_NULL; f.subclass = 0; + memset(&ies, 0, sizeof(ies)); } if (!fr->callno) { @@ -9637,6 +9660,7 @@ static int socket_process(struct iax2_thread *thread) } else if (f.frametype == AST_FRAME_IAX && (f.subclass == IAX_COMMAND_REGREQ || f.subclass == IAX_COMMAND_REGREL)) { send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_REGREJ, ntohl(fh->ts), fh->iseqno + 1, fd, NULL); } + ast_variables_destroy(ies.vars); return 1; } } @@ -9659,11 +9683,13 @@ static int socket_process(struct iax2_thread *thread) } if (fr->callno > 0) ast_mutex_unlock(&iaxsl[fr->callno]); + ast_variables_destroy(ies.vars); return 1; } if (ast_test_flag(iaxs[fr->callno], IAX_ENCRYPTED) && !decrypted) { if (decrypt_frame(fr->callno, fh, &f, &res)) { ast_log(LOG_NOTICE, "Packet Decrypt Failed!\n"); + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -9751,6 +9777,7 @@ static int socket_process(struct iax2_thread *thread) /* Send a VNAK requesting retransmission */ iax2_vnak(fr->callno); } + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -9816,6 +9843,7 @@ static int socket_process(struct iax2_thread *thread) iaxs[fr->callno]->rseqno = fr->iseqno; else { /* Stop processing now */ + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -9828,6 +9856,7 @@ static int socket_process(struct iax2_thread *thread) ((f.subclass != IAX_COMMAND_TXACC) && (f.subclass != IAX_COMMAND_TXCNT)))) { /* Only messages we accept from a transfer host are TXACC and TXCNT */ + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -9841,6 +9870,7 @@ static int socket_process(struct iax2_thread *thread) if (ast_test_flag(iaxs[fr->callno], IAX_DELAYPBXSTART)) { ast_clear_flag(iaxs[fr->callno], IAX_DELAYPBXSTART); if (!ast_iax2_new(fr->callno, AST_STATE_RING, iaxs[fr->callno]->chosenformat)) { + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -9850,6 +9880,13 @@ static int socket_process(struct iax2_thread *thread) struct ast_datastore *variablestore = NULL; struct ast_variable *var, *prev = NULL; AST_LIST_HEAD(, ast_var_t) *varlist; + + iax2_lock_owner(fr->callno); + if (!iaxs[fr->callno]) { + ast_variables_destroy(ies.vars); + ast_mutex_unlock(&iaxsl[fr->callno]); + return 1; + } if ((c = iaxs[fr->callno]->owner)) { varlist = ast_calloc(1, sizeof(*varlist)); variablestore = ast_datastore_alloc(&iax2_variable_datastore_info, NULL); @@ -9886,6 +9923,7 @@ static int socket_process(struct iax2_thread *thread) ast_free(varlist); } } + ast_channel_unlock(c); } else { /* No channel yet, so transfer the variables directly over to the pvt, * for later inheritance. */ @@ -9915,14 +9953,11 @@ static int socket_process(struct iax2_thread *thread) iaxs[fr->callno]->voiceformat = f.subclass; ast_debug(1, "Ooh, voice format changed to %d\n", f.subclass); if (iaxs[fr->callno]->owner) { - int orignative; -retryowner: - if (ast_channel_trylock(iaxs[fr->callno]->owner)) { - DEADLOCK_AVOIDANCE(&iaxsl[fr->callno]); - if (iaxs[fr->callno] && iaxs[fr->callno]->owner) goto retryowner; - } + iax2_lock_owner(fr->callno); if (iaxs[fr->callno]) { if (iaxs[fr->callno]->owner) { + int orignative; + orignative = iaxs[fr->callno]->owner->nativeformats; iaxs[fr->callno]->owner->nativeformats = f.subclass; if (iaxs[fr->callno]->owner->readformat) @@ -9994,22 +10029,32 @@ retryowner: ast_set_flag(iaxs[fr->callno], IAX_QUELCH); if (ies.musiconhold) { - if (iaxs[fr->callno]->owner && ast_bridged_channel(iaxs[fr->callno]->owner)) { + iax2_lock_owner(fr->callno); + if (!iaxs[fr->callno] || !iaxs[fr->callno]->owner) { + break; + } + if (ast_bridged_channel(iaxs[fr->callno]->owner)) { const char *moh_suggest = iaxs[fr->callno]->mohsuggest; + + /* + * We already hold the owner lock so we do not + * need to check iaxs[fr->callno] after it returns. + */ iax2_queue_control_data(fr->callno, AST_CONTROL_HOLD, S_OR(moh_suggest, NULL), !ast_strlen_zero(moh_suggest) ? strlen(moh_suggest) + 1 : 0); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } } + ast_channel_unlock(iaxs[fr->callno]->owner); } } break; case IAX_COMMAND_UNQUELCH: if (ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED)) { - /* Generate Manager Unhold event, if necessary*/ + iax2_lock_owner(fr->callno); + if (!iaxs[fr->callno]) { + break; + } + /* Generate Manager Unhold event, if necessary */ if (iaxs[fr->callno]->owner && ast_test_flag(iaxs[fr->callno], IAX_QUELCH)) { manager_event(EVENT_FLAG_CALL, "Hold", "Status: Off\r\n" @@ -10020,13 +10065,17 @@ retryowner: } ast_clear_flag(iaxs[fr->callno], IAX_QUELCH); - if (iaxs[fr->callno]->owner && ast_bridged_channel(iaxs[fr->callno]->owner)) { + if (!iaxs[fr->callno]->owner) { + break; + } + if (ast_bridged_channel(iaxs[fr->callno]->owner)) { + /* + * We already hold the owner lock so we do not + * need to check iaxs[fr->callno] after it returns. + */ iax2_queue_control_data(fr->callno, AST_CONTROL_UNHOLD, NULL, 0); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } } + ast_channel_unlock(iaxs[fr->callno]->owner); } break; case IAX_COMMAND_TXACC: @@ -10054,8 +10103,7 @@ retryowner: check_provisioning(&sin, fd, ies.serviceident, ies.provver); ast_mutex_lock(&iaxsl[fr->callno]); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } } /* If we're in trunk mode, do it now, and update the trunk number in our frame before continuing */ @@ -10092,8 +10140,7 @@ retryowner: ast_mutex_lock(&iaxsl[fr->callno]); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } } else exists = 0; @@ -10106,8 +10153,7 @@ retryowner: iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_NO_ROUTE_DESTINATION); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } if (authdebug) ast_log(LOG_NOTICE, "Rejected connect attempt from %s, request '%s@%s' does not exist\n", ast_inet_ntoa(sin.sin_addr), iaxs[fr->callno]->exten, iaxs[fr->callno]->context); @@ -10153,8 +10199,7 @@ retryowner: iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } if (authdebug) { if(ast_test_flag(iaxs[fr->callno], IAX_CODEC_NOCAP)) @@ -10198,8 +10243,7 @@ retryowner: ast_log(LOG_ERROR, "No best format in 0x%x???\n", iaxs[fr->callno]->peercapability & iaxs[fr->callno]->capability); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } if (authdebug) ast_log(LOG_NOTICE, "Rejected connect attempt from %s, requested/capability 0x%x/0x%x incompatible with our capability 0x%x.\n", ast_inet_ntoa(sin.sin_addr), iaxs[fr->callno]->peerformat, iaxs[fr->callno]->peercapability, iaxs[fr->callno]->capability); @@ -10250,10 +10294,6 @@ retryowner: iaxs[fr->callno]->encmethods = 0; if (!authenticate_request(fr->callno) && iaxs[fr->callno]) ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_AUTHENTICATED); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } break; case IAX_COMMAND_DPREQ: /* Request status in the dialplan */ @@ -10301,40 +10341,54 @@ retryowner: case IAX_COMMAND_TRANSFER: { struct ast_channel *bridged_chan; + struct ast_channel *owner; - if (iaxs[fr->callno]->owner && (bridged_chan = ast_bridged_channel(iaxs[fr->callno]->owner)) && ies.called_number) { - /* Set BLINDTRANSFER channel variables */ - + iax2_lock_owner(fr->callno); + if (!iaxs[fr->callno]) { + /* Initiating call went away before we could transfer. */ + break; + } + owner = iaxs[fr->callno]->owner; + bridged_chan = owner ? ast_bridged_channel(owner) : NULL; + if (bridged_chan && ies.called_number) { ast_mutex_unlock(&iaxsl[fr->callno]); - pbx_builtin_setvar_helper(iaxs[fr->callno]->owner, "BLINDTRANSFER", bridged_chan->name); - ast_mutex_lock(&iaxsl[fr->callno]); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } - pbx_builtin_setvar_helper(bridged_chan, "BLINDTRANSFER", iaxs[fr->callno]->owner->name); + /* Set BLINDTRANSFER channel variables */ + pbx_builtin_setvar_helper(owner, "BLINDTRANSFER", bridged_chan->name); + pbx_builtin_setvar_helper(bridged_chan, "BLINDTRANSFER", owner->name); + if (!strcmp(ies.called_number, ast_parking_ext())) { - struct ast_channel *saved_channel = iaxs[fr->callno]->owner; - ast_mutex_unlock(&iaxsl[fr->callno]); - if (iax_park(bridged_chan, saved_channel)) { - ast_log(LOG_WARNING, "Failed to park call on '%s'\n", bridged_chan->name); - } else { - ast_debug(1, "Parked call on '%s'\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name); + ast_debug(1, "Parking call '%s'\n", bridged_chan->name); + if (iax_park(bridged_chan, owner)) { + ast_log(LOG_WARNING, "Failed to park call '%s'\n", + bridged_chan->name); } ast_mutex_lock(&iaxsl[fr->callno]); } else { - if (ast_async_goto(bridged_chan, iaxs[fr->callno]->context, ies.called_number, 1)) - ast_log(LOG_WARNING, "Async goto of '%s' to '%s@%s' failed\n", bridged_chan->name, - ies.called_number, iaxs[fr->callno]->context); - else { - ast_debug(1, "Async goto of '%s' to '%s@%s' started\n", bridged_chan->name, - ies.called_number, iaxs[fr->callno]->context); + ast_mutex_lock(&iaxsl[fr->callno]); + + if (iaxs[fr->callno]) { + if (ast_async_goto(bridged_chan, iaxs[fr->callno]->context, + ies.called_number, 1)) { + ast_log(LOG_WARNING, + "Async goto of '%s' to '%s@%s' failed\n", + bridged_chan->name, ies.called_number, + iaxs[fr->callno]->context); + } else { + ast_debug(1, "Async goto of '%s' to '%s@%s' started\n", + bridged_chan->name, ies.called_number, + iaxs[fr->callno]->context); + } + } else { + /* Initiating call went away before we could transfer. */ } } } else { ast_debug(1, "Async goto not applicable on call %d\n", fr->callno); } + if (owner) { + ast_channel_unlock(owner); + } break; } @@ -10363,31 +10417,24 @@ retryowner: iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } if (authdebug) ast_log(LOG_NOTICE, "Rejected call to %s, format 0x%x incompatible with our capability 0x%x.\n", ast_inet_ntoa(sin.sin_addr), iaxs[fr->callno]->peerformat, iaxs[fr->callno]->capability); } else { ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED); - if (iaxs[fr->callno]->owner) { + iax2_lock_owner(fr->callno); + if (iaxs[fr->callno] && iaxs[fr->callno]->owner) { /* Switch us to use a compatible format */ iaxs[fr->callno]->owner->nativeformats = iaxs[fr->callno]->peerformat; ast_verb(3, "Format for call is %s\n", ast_getformatname(iaxs[fr->callno]->owner->nativeformats)); -retryowner2: - if (ast_channel_trylock(iaxs[fr->callno]->owner)) { - DEADLOCK_AVOIDANCE(&iaxsl[fr->callno]); - if (iaxs[fr->callno] && iaxs[fr->callno]->owner) goto retryowner2; - } - - if (iaxs[fr->callno] && iaxs[fr->callno]->owner) { - /* Setup read/write formats properly. */ - if (iaxs[fr->callno]->owner->writeformat) - ast_set_write_format(iaxs[fr->callno]->owner, iaxs[fr->callno]->owner->writeformat); - if (iaxs[fr->callno]->owner->readformat) - ast_set_read_format(iaxs[fr->callno]->owner, iaxs[fr->callno]->owner->readformat); - ast_channel_unlock(iaxs[fr->callno]->owner); - } + + /* Setup read/write formats properly. */ + if (iaxs[fr->callno]->owner->writeformat) + ast_set_write_format(iaxs[fr->callno]->owner, iaxs[fr->callno]->owner->writeformat); + if (iaxs[fr->callno]->owner->readformat) + ast_set_read_format(iaxs[fr->callno]->owner, iaxs[fr->callno]->owner->readformat); + ast_channel_unlock(iaxs[fr->callno]->owner); } } if (iaxs[fr->callno]) { @@ -10401,10 +10448,6 @@ retryowner2: case IAX_COMMAND_POKE: /* Send back a pong packet with the original timestamp */ send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_PONG, fr->ts, NULL, 0, -1); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } break; case IAX_COMMAND_PING: { @@ -10504,10 +10547,6 @@ retryowner2: ies.username ? ies.username : "<unknown>", ast_inet_ntoa(iaxs[fr->callno]->addr.sin_addr)); iax2_queue_frame(fr->callno, &hangup_fr); } - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } break; case IAX_COMMAND_AUTHREP: /* For security, always ack immediately */ @@ -10538,8 +10577,7 @@ retryowner2: iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_NO_ROUTE_DESTINATION); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } } else { /* Select an appropriate format */ @@ -10588,8 +10626,7 @@ retryowner2: iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } } else { /* Pick one... */ @@ -10632,8 +10669,7 @@ retryowner2: iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } } } @@ -10725,8 +10761,7 @@ immediatedial: iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_NO_ROUTE_DESTINATION); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } } else { ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED); @@ -10791,16 +10826,14 @@ immediatedial: send_command_immediate(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_ACK, fr->ts, NULL, 0,fr->iseqno); if (register_verify(fr->callno, &sin, &ies)) { if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } /* Send delayed failure */ auth_fail(fr->callno, IAX_COMMAND_REGREJ); break; } if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } if ((ast_strlen_zero(iaxs[fr->callno]->secret) && ast_strlen_zero(iaxs[fr->callno]->inkeys)) || ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_AUTHENTICATED)) { @@ -10810,25 +10843,16 @@ immediatedial: if (update_registry(&sin, fr->callno, ies.devicetype, fd, ies.refresh)) ast_log(LOG_WARNING, "Registry error\n"); if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; + break; } if (ies.provverpres && ies.serviceident && sin.sin_addr.s_addr) { ast_mutex_unlock(&iaxsl[fr->callno]); check_provisioning(&sin, fd, ies.serviceident, ies.provver); ast_mutex_lock(&iaxsl[fr->callno]); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } } break; } registry_authrequest(fr->callno); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } break; case IAX_COMMAND_REGACK: if (iax2_ack_registry(&ies, &sin, fr->callno)) @@ -10856,10 +10880,6 @@ immediatedial: iax_ie_append_str(&ied0, IAX_IE_CAUSE, "No authority found"); iax_ie_append_byte(&ied0, IAX_IE_CAUSECODE, AST_CAUSE_FACILITY_NOT_SUBSCRIBED); send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_REJECT, 0, ied0.buf, ied0.pos, -1); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } } break; case IAX_COMMAND_TXREJ: @@ -10982,10 +11002,6 @@ immediatedial: send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_FWDATA, 0, ied0.buf, ied0.pos, -1); else send_command(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_FWDATA, 0, ied0.buf, ied0.pos, -1); - if (!iaxs[fr->callno]) { - ast_mutex_unlock(&iaxsl[fr->callno]); - return 1; - } break; case IAX_COMMAND_CALLTOKEN: { @@ -11044,6 +11060,7 @@ immediatedial: else { ast_log(LOG_WARNING, "Received mini frame before first full video frame\n"); iax2_vnak(fr->callno); + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -11066,12 +11083,14 @@ immediatedial: else { ast_debug(1, "Received mini frame before first full voice frame\n"); iax2_vnak(fr->callno); + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } f.datalen = res - sizeof(struct ast_iax2_mini_hdr); if (f.datalen < 0) { ast_log(LOG_WARNING, "Datalen < 0?\n"); + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -11089,6 +11108,7 @@ immediatedial: } /* Don't pass any packets until we're started */ if (!ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED)) { + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -11129,6 +11149,7 @@ immediatedial: } /* Always run again */ + ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; } @@ -13876,6 +13897,10 @@ static int load_module(void) iax_set_output(iax_debug_output); iax_set_error(iax_error_output); jb_setoutput(jb_error_output, jb_warning_output, NULL); + + if ((timer = ast_timer_open())) { + ast_timer_set_rate(timer, trunkfreq); + } if (set_config(config, 0) == -1) { if (timer) { @@ -13896,10 +13921,6 @@ static int load_module(void) ast_manager_register( "IAXnetstats", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_netstats, "Show IAX Netstats" ); ast_manager_register( "IAXregistry", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_registry, "Show IAX registrations"); - if ((timer = ast_timer_open())) { - ast_timer_set_rate(timer, trunkfreq); - } - if (ast_channel_register(&iax2_tech)) { ast_log(LOG_ERROR, "Unable to register channel class %s\n", "IAX2"); __unload_module(); diff --git a/channels/chan_local.c b/channels/chan_local.c index 62568ca57..778654a1a 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -49,10 +49,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/manager.h" #include "asterisk/stringfields.h" #include "asterisk/devicestate.h" +#include "asterisk/astobj2.h" static const char tdesc[] = "Local Proxy Channel Driver"; #define IS_OUTBOUND(a,b) (a == b->chan ? 1 : 0) +/* right now we are treating the locals astobj2 container as a + * list. If there is ever a reason to make this more efficient + * increasing the bucket size would help. */ +static const int BUCKET_SIZE = 1; + +static struct ao2_container *locals; static struct ast_jb_conf g_jb_conf = { .flags = 0, @@ -105,7 +112,6 @@ static const struct ast_channel_tech local_tech = { }; struct local_pvt { - ast_mutex_t lock; /* Channel private lock */ unsigned int flags; /* Private flags */ char context[AST_MAX_CONTEXT]; /* Context to call */ char exten[AST_MAX_EXTENSION]; /* Extension to call */ @@ -118,15 +124,11 @@ struct local_pvt { AST_LIST_ENTRY(local_pvt) list; /* Next entity */ }; -#define LOCAL_GLARE_DETECT (1 << 0) /*!< Detect glare on hangup */ -#define LOCAL_CANCEL_QUEUE (1 << 1) /*!< Cancel queue */ -#define LOCAL_ALREADY_MASQED (1 << 2) /*!< Already masqueraded */ -#define LOCAL_LAUNCHED_PBX (1 << 3) /*!< PBX was launched */ -#define LOCAL_NO_OPTIMIZATION (1 << 4) /*!< Do not optimize using masquerading */ -#define LOCAL_BRIDGE (1 << 5) /*!< Report back the "true" channel as being bridged to */ -#define LOCAL_MOH_PASSTHRU (1 << 6) /*!< Pass through music on hold start/stop frames */ - -static AST_LIST_HEAD_STATIC(locals, local_pvt); +#define LOCAL_ALREADY_MASQED (1 << 0) /*!< Already masqueraded */ +#define LOCAL_LAUNCHED_PBX (1 << 1) /*!< PBX was launched */ +#define LOCAL_NO_OPTIMIZATION (1 << 2) /*!< Do not optimize using masquerading */ +#define LOCAL_BRIDGE (1 << 3) /*!< Report back the "true" channel as being bridged to */ +#define LOCAL_MOH_PASSTHRU (1 << 4) /*!< Pass through music on hold start/stop frames */ static int local_setoption(struct ast_channel *chan, int option, void * data, int datalen) { @@ -157,7 +159,7 @@ startover: return -1; } - while (ast_mutex_trylock(&p->lock)) { + while (ao2_trylock(p)) { ast_channel_unlock(chan); sched_yield(); ast_channel_lock(chan); @@ -172,14 +174,14 @@ startover: otherchan = (write_info->chan == p->owner) ? p->chan : p->owner; if (!otherchan || otherchan == write_info->chan) { - ast_mutex_unlock(&p->lock); + ao2_unlock(p); ast_channel_unlock(chan); ast_log(LOG_WARNING, "Could not update other side of %s, other side went away.\n", chan->name); return 0; } if (ast_channel_trylock(otherchan)) { - ast_mutex_unlock(&p->lock); + ao2_unlock(p); ast_channel_unlock(chan); goto startover; } @@ -187,7 +189,7 @@ startover: res = write_info->write_fn(otherchan, write_info->function, write_info->data, write_info->value); ast_channel_unlock(otherchan); - ast_mutex_unlock(&p->lock); + ao2_unlock(p); ast_channel_unlock(chan); return res; @@ -200,6 +202,7 @@ static int local_devicestate(void *data) char *context = NULL, *opts = NULL; int res; struct local_pvt *lp; + struct ao2_iterator it; if (!(context = strchr(exten, '@'))) { ast_log(LOG_WARNING, "Someone used Local/%s somewhere without a @context. This is bad.\n", exten); @@ -219,28 +222,21 @@ static int local_devicestate(void *data) return AST_DEVICE_INVALID; res = AST_DEVICE_NOT_INUSE; - AST_LIST_LOCK(&locals); - AST_LIST_TRAVERSE(&locals, lp, list) { + + it = ao2_iterator_init(locals, 0); + while ((lp = ao2_iterator_next(&it))) { if (!strcmp(exten, lp->exten) && !strcmp(context, lp->context) && lp->owner) { res = AST_DEVICE_INUSE; + ao2_ref(lp, -1); break; } + ao2_ref(lp, -1); } - AST_LIST_UNLOCK(&locals); + ao2_iterator_destroy(&it); return res; } -/*! - * \note Assumes the pvt is no longer in the pvts list - */ -static struct local_pvt *local_pvt_destroy(struct local_pvt *pvt) -{ - ast_mutex_destroy(&pvt->lock); - ast_free(pvt); - return NULL; -} - /*! \brief Return the bridged channel of a Local channel */ static struct ast_channel *local_bridgedchannel(struct ast_channel *chan, struct ast_channel *bridge) { @@ -253,7 +249,7 @@ static struct ast_channel *local_bridgedchannel(struct ast_channel *chan, struct return NULL; } - ast_mutex_lock(&p->lock); + ao2_lock(p); if (ast_test_flag(p, LOCAL_BRIDGE)) { /* Find the opposite channel */ @@ -267,7 +263,7 @@ static struct ast_channel *local_bridgedchannel(struct ast_channel *chan, struct } } - ast_mutex_unlock(&p->lock); + ao2_unlock(p); return bridged; } @@ -287,17 +283,19 @@ static int local_queryoption(struct ast_channel *ast, int option, void *data, in return -1; } - ast_mutex_lock(&p->lock); + ao2_lock(p); chan = IS_OUTBOUND(ast, p) ? p->owner : p->chan; try_again: if (!chan) { - ast_mutex_unlock(&p->lock); + ao2_unlock(p); return -1; } if (ast_channel_trylock(chan)) { - DEADLOCK_AVOIDANCE(&p->lock); + ao2_unlock(p); + sched_yield(); + ao2_lock(p); chan = IS_OUTBOUND(ast, p) ? p->owner : p->chan; goto try_again; } @@ -305,25 +303,35 @@ try_again: bridged = ast_bridged_channel(chan); if (!bridged) { /* can't query channel unless we are bridged */ - ast_mutex_unlock(&p->lock); + ao2_unlock(p); ast_channel_unlock(chan); return -1; } if (ast_channel_trylock(bridged)) { ast_channel_unlock(chan); - DEADLOCK_AVOIDANCE(&p->lock); + ao2_unlock(p); + sched_yield(); + ao2_lock(p); chan = IS_OUTBOUND(ast, p) ? p->owner : p->chan; goto try_again; } res = ast_channel_queryoption(bridged, option, data, datalen, 0); - ast_mutex_unlock(&p->lock); + ao2_unlock(p); ast_channel_unlock(chan); ast_channel_unlock(bridged); return res; } +/*! \brief queue a frame on a to either the p->owner or p->chan + * + * \note the local_pvt MUST have it's ref count bumped before entering this function and + * decremented after this function is called. This is a side effect of the deadlock + * avoidance that is necessary to lock 2 channels and a tech_pvt. Without a ref counted + * local_pvt, it is impossible to guarantee it will not be destroyed by another thread + * during deadlock avoidance. + */ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_frame *f, struct ast_channel *us, int us_locked) { @@ -341,41 +349,24 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra return 0; } - /* Set glare detection */ - ast_set_flag(p, LOCAL_GLARE_DETECT); - /* Ensure that we have both channels locked */ while (other && ast_channel_trylock(other)) { int res; - if ((res = ast_mutex_unlock(&p->lock))) { + if ((res = ao2_unlock(p))) { ast_log(LOG_ERROR, "chan_local bug! '&p->lock' was not locked when entering local_queue_frame! (%s)\n", strerror(res)); return -1; } if (us && us_locked) { do { CHANNEL_DEADLOCK_AVOIDANCE(us); - } while (ast_mutex_trylock(&p->lock)); + } while (ao2_trylock(p)); } else { usleep(1); - ast_mutex_lock(&p->lock); + ao2_lock(p); } other = isoutbound ? p->owner : p->chan; } - /* Since glare detection only occurs within this function, and because - * a pvt flag cannot be set without having the pvt lock, this is the only - * location where we could detect a cancelling of the queue. */ - if (ast_test_flag(p, LOCAL_CANCEL_QUEUE)) { - /* We had a glare on the hangup. Forget all this business, - return and destroy p. */ - ast_mutex_unlock(&p->lock); - p = local_pvt_destroy(p); - if (other) { - ast_channel_unlock(other); - } - return -1; - } - if (other) { if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_RINGING) { ast_setstate(other, AST_STATE_RINGING); @@ -384,8 +375,6 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra ast_channel_unlock(other); } - ast_clear_flag(p, LOCAL_GLARE_DETECT); - return 0; } @@ -398,16 +387,18 @@ static int local_answer(struct ast_channel *ast) if (!p) return -1; - ast_mutex_lock(&p->lock); + ao2_lock(p); + ao2_ref(p, 1); isoutbound = IS_OUTBOUND(ast, p); if (isoutbound) { /* Pass along answer since somebody answered us */ struct ast_frame answer = { AST_FRAME_CONTROL, AST_CONTROL_ANSWER }; res = local_queue_frame(p, isoutbound, &answer, ast, 1); - } else + } else { ast_log(LOG_WARNING, "Huh? Local is being asked to answer?\n"); - if (!res) - ast_mutex_unlock(&p->lock); + } + ao2_unlock(p); + ao2_ref(p, -1); return res; } @@ -498,7 +489,8 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f) return -1; /* Just queue for delivery to the other side */ - ast_mutex_lock(&p->lock); + ao2_lock(p); + ao2_ref(p, 1); /* ref for local_queue_frame */ isoutbound = IS_OUTBOUND(ast, p); if (isoutbound && f && (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO)) check_bridge(p); @@ -508,8 +500,9 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f) ast_debug(1, "Not posting to queue since already masked on '%s'\n", ast->name); res = 0; } - if (!res) - ast_mutex_unlock(&p->lock); + ao2_unlock(p); + ao2_ref(p, -1); + return res; } @@ -520,18 +513,27 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) if (!p) return -1; - ast_mutex_lock(&p->lock); + ao2_lock(p); if ((p->owner != oldchan) && (p->chan != oldchan)) { ast_log(LOG_WARNING, "Old channel wasn't %p but was %p/%p\n", oldchan, p->owner, p->chan); - ast_mutex_unlock(&p->lock); + ao2_unlock(p); return -1; } if (p->owner == oldchan) p->owner = newchan; else p->chan = newchan; - ast_mutex_unlock(&p->lock); + + /* Do not let a masquerade cause a Local channel to be bridged to itself! */ + if (!ast_check_hangup(newchan) && (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner)) { + ast_log(LOG_WARNING, "You can not bridge a Local channel to itself!\n"); + ao2_unlock(p); + ast_queue_hangup(newchan); + return -1; + } + + ao2_unlock(p); return 0; } @@ -545,6 +547,8 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da if (!p) return -1; + ao2_ref(p, 1); /* ref for local_queue_frame */ + /* If this is an MOH hold or unhold, do it on the Local channel versus real channel */ if (!ast_test_flag(p, LOCAL_MOH_PASSTHRU) && condition == AST_CONTROL_HOLD) { ast_moh_start(ast, data, NULL); @@ -552,15 +556,16 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da ast_moh_stop(ast); } else { /* Queue up a frame representing the indication as a control frame */ - ast_mutex_lock(&p->lock); + ao2_lock(p); isoutbound = IS_OUTBOUND(ast, p); f.subclass = condition; f.data.ptr = (void*)data; f.datalen = datalen; - if (!(res = local_queue_frame(p, isoutbound, &f, ast, 1))) - ast_mutex_unlock(&p->lock); + res = local_queue_frame(p, isoutbound, &f, ast, 1); + ao2_unlock(p); } + ao2_ref(p, -1); return res; } @@ -574,11 +579,13 @@ static int local_digit_begin(struct ast_channel *ast, char digit) if (!p) return -1; - ast_mutex_lock(&p->lock); + ao2_ref(p, 1); /* ref for local_queue_frame */ + ao2_lock(p); isoutbound = IS_OUTBOUND(ast, p); f.subclass = digit; - if (!(res = local_queue_frame(p, isoutbound, &f, ast, 0))) - ast_mutex_unlock(&p->lock); + res = local_queue_frame(p, isoutbound, &f, ast, 0); + ao2_unlock(p); + ao2_ref(p, -1); return res; } @@ -593,12 +600,14 @@ static int local_digit_end(struct ast_channel *ast, char digit, unsigned int dur if (!p) return -1; - ast_mutex_lock(&p->lock); + ao2_lock(p); + ao2_ref(p, 1); /* ref for local_queue_frame */ isoutbound = IS_OUTBOUND(ast, p); f.subclass = digit; f.len = duration; - if (!(res = local_queue_frame(p, isoutbound, &f, ast, 0))) - ast_mutex_unlock(&p->lock); + res = local_queue_frame(p, isoutbound, &f, ast, 0); + ao2_unlock(p); + ao2_ref(p, -1); return res; } @@ -613,12 +622,14 @@ static int local_sendtext(struct ast_channel *ast, const char *text) if (!p) return -1; - ast_mutex_lock(&p->lock); + ao2_lock(p); + ao2_ref(p, 1); /* ref for local_queue_frame */ isoutbound = IS_OUTBOUND(ast, p); f.data.ptr = (char *) text; f.datalen = strlen(text) + 1; - if (!(res = local_queue_frame(p, isoutbound, &f, ast, 0))) - ast_mutex_unlock(&p->lock); + res = local_queue_frame(p, isoutbound, &f, ast, 0); + ao2_unlock(p); + ao2_ref(p, -1); return res; } @@ -632,13 +643,15 @@ static int local_sendhtml(struct ast_channel *ast, int subclass, const char *dat if (!p) return -1; - ast_mutex_lock(&p->lock); + ao2_lock(p); + ao2_ref(p, 1); /* ref for local_queue_frame */ isoutbound = IS_OUTBOUND(ast, p); f.subclass = subclass; f.data.ptr = (char *)data; f.datalen = datalen; - if (!(res = local_queue_frame(p, isoutbound, &f, ast, 0))) - ast_mutex_unlock(&p->lock); + res = local_queue_frame(p, isoutbound, &f, ast, 0); + ao2_unlock(p); + ao2_ref(p, -1); return res; } @@ -647,14 +660,14 @@ static int local_sendhtml(struct ast_channel *ast, int subclass, const char *dat static int local_call(struct ast_channel *ast, char *dest, int timeout) { struct local_pvt *p = ast->tech_pvt; - int res; + int res = 0; struct ast_var_t *varptr = NULL, *new; size_t len, namelen; if (!p) return -1; - - ast_mutex_lock(&p->lock); + + ao2_lock(p); /* * Note that cid_num and cid_name aren't passed in the ast_channel_alloc @@ -677,7 +690,7 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout) if (!ast_exists_extension(NULL, p->chan->context, p->chan->exten, 1, p->owner->cid.cid_num)) { ast_log(LOG_NOTICE, "No such extension/context %s@%s while calling Local channel\n", p->chan->exten, p->chan->context); - ast_mutex_unlock(&p->lock); + ao2_unlock(p); return -1; } @@ -703,7 +716,7 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout) if (!(res = ast_pbx_start(p->chan))) ast_set_flag(p, LOCAL_LAUNCHED_PBX); - ast_mutex_unlock(&p->lock); + ao2_unlock(p); return res; } @@ -714,12 +727,15 @@ static int local_hangup(struct ast_channel *ast) int isoutbound; struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP, .data.uint32 = ast->hangupcause }; struct ast_channel *ochan = NULL; - int glaredetect = 0, res = 0; if (!p) return -1; - ast_mutex_lock(&p->lock); + /* we MUST give the tech_pvt a ref here since we are unlocking the + * channel during deadlock avoidance. */ + ao2_ref(p, 1); + + ao2_lock(p); isoutbound = IS_OUTBOUND(ast, p); @@ -733,74 +749,88 @@ static int local_hangup(struct ast_channel *ast) if ((status) && (p->owner)) { /* Deadlock avoidance */ while (p->owner && ast_channel_trylock(p->owner)) { - ast_mutex_unlock(&p->lock); + ao2_unlock(p); if (p->chan) { ast_channel_unlock(p->chan); } - usleep(1); + sched_yield(); if (p->chan) { ast_channel_lock(p->chan); } - ast_mutex_lock(&p->lock); + ao2_lock(p); } if (p->owner) { pbx_builtin_setvar_helper(p->owner, "CHANLOCALSTATUS", status); ast_channel_unlock(p->owner); } } + if (!p->chan) { + /* chan was == to ast and was !NULL before deadlock avoidance started, if chan + * is NULL now, then we should bail because that channel + * hungup already. This is possible because we let go of the + * lock given to the ast channel passed to this function during + * deadlock avoidance. */ + ao2_unlock(p); + ao2_ref(p, -1); + return 0; + } p->chan = NULL; ast_clear_flag(p, LOCAL_LAUNCHED_PBX); ast_module_user_remove(p->u_chan); } else { ast_module_user_remove(p->u_owner); while (p->chan && ast_channel_trylock(p->chan)) { - ast_mutex_unlock(&p->lock); + ao2_unlock(p); if (p->owner) { ast_channel_unlock(p->owner); } - usleep(1); + sched_yield(); if (p->owner) { ast_channel_lock(p->owner); } - ast_mutex_lock(&p->lock); + ao2_lock(p); } - - p->owner = NULL; if (p->chan) { ast_queue_hangup(p->chan); ast_channel_unlock(p->chan); } + + if (!p->owner) { + /* owner was == to ast and was !NULL before deadlock avoidance started, if + * owner is NULL now, then we should bail because that channel + * hungup already. This is possible because we let go of the + * lock given to the ast channel passed to this function during + * deadlock avoidance. */ + ao2_unlock(p); + ao2_ref(p, -1); + return 0; + } + p->owner = NULL; } - + ast->tech_pvt = NULL; - + if (!p->owner && !p->chan) { - /* Okay, done with the private part now, too. */ - glaredetect = ast_test_flag(p, LOCAL_GLARE_DETECT); - /* If we have a queue holding, don't actually destroy p yet, but - let local_queue do it. */ - if (glaredetect) - ast_set_flag(p, LOCAL_CANCEL_QUEUE); + ao2_unlock(p); + /* Remove from list */ - AST_LIST_LOCK(&locals); - AST_LIST_REMOVE(&locals, p, list); - AST_LIST_UNLOCK(&locals); - ast_mutex_unlock(&p->lock); - /* And destroy */ - if (!glaredetect) { - p = local_pvt_destroy(p); - } + ao2_unlink(locals, p); + ao2_ref(p, -1); return 0; } - if (p->chan && !ast_test_flag(p, LOCAL_LAUNCHED_PBX)) + if (p->chan && !ast_test_flag(p, LOCAL_LAUNCHED_PBX)) { /* Need to actually hangup since there is no PBX */ ochan = p->chan; - else - res = local_queue_frame(p, isoutbound, &f, NULL, 1); - if (!res) - ast_mutex_unlock(&p->lock); - if (ochan) + } else { + local_queue_frame(p, isoutbound, &f, NULL, 1); + } + + ao2_unlock(p); + if (ochan) { ast_hangup(ochan); + } + + ao2_ref(p, -1); return 0; } @@ -810,11 +840,11 @@ static struct local_pvt *local_alloc(const char *data, int format) struct local_pvt *tmp = NULL; char *c = NULL, *opts = NULL; - if (!(tmp = ast_calloc(1, sizeof(*tmp)))) + if (!(tmp = ao2_alloc(sizeof(*tmp), NULL))) { return NULL; + } /* Initialize private structure information */ - ast_mutex_init(&tmp->lock); ast_copy_string(tmp->exten, data, sizeof(tmp->exten)); memcpy(&tmp->jb_conf, &g_jb_conf, sizeof(tmp->jb_conf)); @@ -858,14 +888,11 @@ static struct local_pvt *local_alloc(const char *data, int format) } else { #endif /* Add to list */ - AST_LIST_LOCK(&locals); - AST_LIST_INSERT_HEAD(&locals, tmp, list); - AST_LIST_UNLOCK(&locals); + ao2_link(locals, tmp); #if 0 } #endif - - return tmp; + return tmp; /* this is returned with a ref */ } /*! \brief Start new local channel */ @@ -941,11 +968,9 @@ static struct ast_channel *local_request(const char *type, int format, void *dat /* Allocate a new private structure and then Asterisk channel */ if ((p = local_alloc(data, format))) { if (!(chan = local_new(p, AST_STATE_DOWN))) { - AST_LIST_LOCK(&locals); - AST_LIST_REMOVE(&locals, p, list); - AST_LIST_UNLOCK(&locals); - p = local_pvt_destroy(p); + ao2_unlink(locals, p); } + ao2_ref(p, -1); /* kill the ref from the alloc */ } return chan; @@ -955,6 +980,7 @@ static struct ast_channel *local_request(const char *type, int format, void *dat static char *locals_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { struct local_pvt *p = NULL; + struct ao2_iterator it; switch (cmd) { case CLI_INIT: @@ -970,16 +996,19 @@ static char *locals_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args * if (a->argc != 3) return CLI_SHOWUSAGE; - AST_LIST_LOCK(&locals); - if (!AST_LIST_EMPTY(&locals)) { - AST_LIST_TRAVERSE(&locals, p, list) { - ast_mutex_lock(&p->lock); - ast_cli(a->fd, "%s -- %s@%s\n", p->owner ? p->owner->name : "<unowned>", p->exten, p->context); - ast_mutex_unlock(&p->lock); - } - } else + if (ao2_container_count(locals) == 0) { ast_cli(a->fd, "No local channels in use\n"); - AST_LIST_UNLOCK(&locals); + return RESULT_SUCCESS; + } + + it = ao2_iterator_init(locals, 0); + while ((p = ao2_iterator_next(&it))) { + ao2_lock(p); + ast_cli(a->fd, "%s -- %s@%s\n", p->owner ? p->owner->name : "<unowned>", p->exten, p->context); + ao2_unlock(p); + ao2_ref(p, -1); + } + ao2_iterator_destroy(&it); return CLI_SUCCESS; } @@ -988,12 +1017,22 @@ static struct ast_cli_entry cli_local[] = { AST_CLI_DEFINE(locals_show, "List status of local channels"), }; +static int locals_cmp_cb(void *obj, void *arg, int flags) +{ + return (obj == arg) ? CMP_MATCH : 0; +} + /*! \brief Load module into PBX, register channel */ static int load_module(void) { + if (!(locals = ao2_container_alloc(BUCKET_SIZE, NULL, locals_cmp_cb))) { + return AST_MODULE_LOAD_FAILURE; + } + /* Make sure we can register our channel type */ if (ast_channel_register(&local_tech)) { ast_log(LOG_ERROR, "Unable to register channel class 'Local'\n"); + ao2_ref(locals, -1); return AST_MODULE_LOAD_FAILURE; } ast_cli_register_multiple(cli_local, sizeof(cli_local) / sizeof(struct ast_cli_entry)); @@ -1004,21 +1043,21 @@ static int load_module(void) static int unload_module(void) { struct local_pvt *p = NULL; + struct ao2_iterator it; /* First, take us out of the channel loop */ ast_cli_unregister_multiple(cli_local, sizeof(cli_local) / sizeof(struct ast_cli_entry)); ast_channel_unregister(&local_tech); - if (!AST_LIST_LOCK(&locals)) { - /* Hangup all interfaces if they have an owner */ - AST_LIST_TRAVERSE(&locals, p, list) { - if (p->owner) - ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD); + + it = ao2_iterator_init(locals, 0); + while ((p = ao2_iterator_next(&it))) { + if (p->owner) { + ast_softhangup(p->owner, AST_SOFTHANGUP_APPUNLOAD); } - AST_LIST_UNLOCK(&locals); - } else { - ast_log(LOG_WARNING, "Unable to lock the monitor\n"); - return -1; - } + ao2_ref(p, -1); + } + ao2_iterator_destroy(&it); + ao2_ref(locals, -1); return 0; } diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d38e0ee59..310c0dd22 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3102,6 +3102,9 @@ cleanup: static int peer_is_marked(void *peerobj, void *arg, int flags) { struct sip_peer *peer = peerobj; + if (peer->the_mark && peer->pokeexpire != -1) { + AST_SCHED_DEL(sched, peer->pokeexpire); + } return peer->the_mark ? CMP_MATCH : 0; } @@ -4008,9 +4011,21 @@ static int __sip_autodestruct(const void *data) /* Reset schedule ID */ p->autokillid = -1; + + /* + * Lock both the pvt and the channel safely so that we can queue up a frame. + */ + sip_pvt_lock(p); + while (p->owner && ast_channel_trylock(p->owner)) { + sip_pvt_unlock(p); + sched_yield(); + sip_pvt_lock(p); + } + if (p->owner) { ast_log(LOG_WARNING, "Autodestruct on dialog '%s' with owner in place (Method: %s)\n", p->callid, sip_methods[p->method].text); ast_queue_hangup_with_cause(p->owner, AST_CAUSE_PROTOCOL_ERROR); + ast_channel_unlock(p->owner); } else if (p->refer && !p->alreadygone) { ast_debug(3, "Finally hanging up channel after transfer: %s\n", p->callid); transmit_request_with_auth(p, SIP_BYE, 0, XMIT_RELIABLE, 1); @@ -4024,7 +4039,11 @@ static int __sip_autodestruct(const void *data) /* sip_destroy(p); */ /* Go ahead and destroy dialog. All attempts to recover is done */ /* sip_destroy also absorbs the reference */ } + + sip_pvt_unlock(p); + dialog_unref(p, "The ref to a dialog passed to this sched callback is going out of scope; unref it."); + return 0; } @@ -4606,6 +4625,12 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin, else if (sip_cfg.rtsave_sysname) syslabel = "regserver"; + /* XXX IMPORTANT: Anytime you add a new parameter to be updated, you + * must also add it to contrib/scripts/asterisk.ldap-schema, + * contrib/scripts/asterisk.ldif, + * and to configs/res_ldap.conf.sample as described in + * bugs 15156 and 15895 + */ if (fc) { ast_update_realtime(tablename, "name", peername, "ipaddr", ipaddr, "port", port, "regseconds", regseconds, @@ -6441,7 +6466,7 @@ static int sip_senddigit_end(struct ast_channel *ast, char digit, unsigned int d break; case SIP_DTMF_RFC2833: if (p->rtp) - ast_rtp_senddigit_end(p->rtp, digit); + ast_rtp_senddigit_end_with_duration(p->rtp, digit, duration); break; case SIP_DTMF_INBAND: res = -1; /* Tell Asterisk to stop inband indications */ @@ -6822,9 +6847,14 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit * we should decode the uri before storing it in the channel, but leave it encoded in the sip_pvt * structure so that there aren't issues when forming URI's */ - decoded_exten = ast_strdupa(i->exten); - ast_uri_decode(decoded_exten); - ast_copy_string(tmp->exten, decoded_exten, sizeof(tmp->exten)); + if (ast_exists_extension(NULL, i->context, i->exten, 1, i->cid_num)) { + /* encoded in dialplan, so keep extension encoded */ + ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten)); + } else { + decoded_exten = ast_strdupa(i->exten); + ast_uri_decode(decoded_exten); + ast_copy_string(tmp->exten, decoded_exten, sizeof(tmp->exten)); + } /* Don't use ast_set_callerid() here because it will * generate an unnecessary NewCallerID event */ @@ -8053,6 +8083,35 @@ static int find_sdp(struct sip_request *req) return FALSE; } +/*! \brief Change hold state for a call */ +static void change_hold_state(struct sip_pvt *dialog, struct sip_request *req, int holdstate, int sendonly) +{ + if (sip_cfg.notifyhold && (!holdstate || !ast_test_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD))) + sip_peer_hold(dialog, holdstate); + if (sip_cfg.callevents) + manager_event(EVENT_FLAG_CALL, "Hold", + "Status: %s\r\n" + "Channel: %s\r\n" + "Uniqueid: %s\r\n", + holdstate ? "On" : "Off", + dialog->owner->name, + dialog->owner->uniqueid); + append_history(dialog, holdstate ? "Hold" : "Unhold", "%s", req->data->str); + if (!holdstate) { /* Put off remote hold */ + ast_clear_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD); /* Clear both flags */ + return; + } + /* No address for RTP, we're on hold */ + + if (sendonly == 1) /* One directional hold (sendonly/recvonly) */ + ast_set_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD_ONEDIR); + else if (sendonly == 2) /* Inactive stream */ + ast_set_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD_INACTIVE); + else + ast_set_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD_ACTIVE); + return; +} + enum media_type { SDP_AUDIO, SDP_VIDEO, @@ -8670,22 +8729,10 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action ast_queue_control(p->owner, AST_CONTROL_UNHOLD); /* Activate a re-invite */ ast_queue_frame(p->owner, &ast_null_frame); - /* Queue Manager Unhold event */ - append_history(p, "Unhold", "%s", req->data->str); - if (sip_cfg.callevents) - manager_event(EVENT_FLAG_CALL, "Hold", - "Status: Off\r\n" - "Channel: %s\r\n" - "Uniqueid: %s\r\n", - p->owner->name, - p->owner->uniqueid); - if (sip_cfg.notifyhold) - sip_peer_hold(p, FALSE); - ast_clear_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD); /* Clear both flags */ + change_hold_state(p, req, FALSE, sendonly); } else if (!(sin.sin_addr.s_addr || vsin.sin_addr.s_addr || isin.sin_addr.s_addr || tsin.sin_addr.s_addr) || (sendonly && sendonly != -1)) { - int already_on_hold = ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD); ast_queue_control_data(p->owner, AST_CONTROL_HOLD, S_OR(p->mohsuggest, NULL), !ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0); @@ -8694,24 +8741,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action /* RTCP needs to go ahead, even if we're on hold!!! */ /* Activate a re-invite */ ast_queue_frame(p->owner, &ast_null_frame); - /* Queue Manager Hold event */ - append_history(p, "Hold", "%s", req->data->str); - if (sip_cfg.callevents && !ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) { - manager_event(EVENT_FLAG_CALL, "Hold", - "Status: On\r\n" - "Channel: %s\r\n" - "Uniqueid: %s\r\n", - p->owner->name, - p->owner->uniqueid); - } - if (sendonly == 1) /* One directional hold (sendonly/recvonly) */ - ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_ONEDIR); - else if (sendonly == 2) /* Inactive stream */ - ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_INACTIVE); - else - ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_ACTIVE); - if (sip_cfg.notifyhold && !already_on_hold) - sip_peer_hold(p, TRUE); + change_hold_state(p, req, TRUE, sendonly); } return 0; @@ -12193,11 +12223,22 @@ static int expire_register(const void *data) static int sip_poke_peer_s(const void *data) { struct sip_peer *peer = (struct sip_peer *)data; + struct sip_peer *foundpeer; peer->pokeexpire = -1; - sip_poke_peer(peer, 0); + foundpeer = ao2_find(peers, peer, OBJ_POINTER); + if (!foundpeer) { + unref_peer(peer, "removing poke peer ref"); + return 0; + } else if (foundpeer->name != peer->name) { + unref_peer(foundpeer, "removing above peer ref"); + unref_peer(peer, "removing poke peer ref"); + return 0; + } + unref_peer(foundpeer, "removing above peer ref"); + sip_poke_peer(peer, 0); unref_peer(peer, "removing poke peer ref"); return 0; @@ -13530,24 +13571,37 @@ static int get_destination(struct sip_pvt *p, struct sip_request *oreq) if (sip_debug_test_pvt(p)) ast_verbose("Looking for %s in %s (domain %s)\n", uri, p->context, p->domain); + /* Since extensions.conf can have unescaped characters, try matching a + * decoded uri in addition to the non-decoded uri. */ + decoded_uri = ast_strdupa(uri); + ast_uri_decode(decoded_uri); + /* If this is a subscription we actually just need to see if a hint exists for the extension */ if (req->method == SIP_SUBSCRIBE) { char hint[AST_MAX_EXTENSION]; - return (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, p->exten) ? 0 : -1); + int which = 0; + if (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, uri) || + (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, decoded_uri) && (which = 1))) { + if (!oreq) { + ast_string_field_set(p, exten, which ? decoded_uri : uri); + } + return 0; + } else { + return -1; + } } else { - decoded_uri = ast_strdupa(uri); - ast_uri_decode(decoded_uri); + int which = 0; /* Check the dialplan for the username part of the request URI, the domain will be stored in the SIPDOMAIN variable - Since extensions.conf can have unescaped characters, try matching a decoded - uri in addition to the non-decoded uri Return 0 if we have a matching extension */ - if (ast_exists_extension(NULL, p->context, uri, 1, S_OR(p->cid_num, from)) || ast_exists_extension(NULL, p->context, decoded_uri, 1, S_OR(p->cid_num, from)) || + if (ast_exists_extension(NULL, p->context, uri, 1, S_OR(p->cid_num, from)) || + (ast_exists_extension(NULL, p->context, decoded_uri, 1, S_OR(p->cid_num, from)) && (which = 1)) || !strcmp(decoded_uri, ast_pickup_ext())) { - if (!oreq) - ast_string_field_set(p, exten, decoded_uri); + if (!oreq) { + ast_string_field_set(p, exten, which ? decoded_uri : uri); + } return 0; - } + } } /* Return 1 for pickup extension or overlap dialling support (if we support it) */ @@ -16267,7 +16321,7 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_ ast_cli(a->fd, " Update: %s\n", cli_yesno(sip_cfg.peer_rtupdate)); ast_cli(a->fd, " Ignore Reg. Expire: %s\n", cli_yesno(sip_cfg.ignore_regexpire)); ast_cli(a->fd, " Save sys. name: %s\n", cli_yesno(sip_cfg.rtsave_sysname)); - ast_cli(a->fd, " Auto Clear: %d\n", sip_cfg.rtautoclear); + ast_cli(a->fd, " Auto Clear: %d (%s)\n", sip_cfg.rtautoclear, ast_test_flag(&global_flags[1], SIP_PAGE2_RTAUTOCLEAR) ? "Enabled" : "Disabled"); } ast_cli(a->fd, "\n----\n"); return CLI_SUCCESS; @@ -17683,11 +17737,12 @@ static void check_pendings(struct sip_pvt *p) { if (ast_test_flag(&p->flags[0], SIP_PENDINGBYE)) { /* if we can't BYE, then this is really a pending CANCEL */ - if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA) + if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA) { + p->invitestate = INV_CANCELLED; transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE); /* Actually don't destroy us yet, wait for the 487 on our original INVITE, but do set an autodestruct just in case we never get it. */ - else { + } else { /* We have a pending outbound invite, don't send something new in-transaction */ if (p->pendinginvite) @@ -18627,6 +18682,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ handle_response_refer(p, resp, rest, req, seqno); } else if (sipmethod == SIP_SUBSCRIBE) { handle_response_subscribe(p, resp, rest, req, seqno); + } else if (sipmethod == SIP_NOTIFY) { + pvt_set_needdestroy(p, "received 481 response"); } else if (sipmethod == SIP_BYE) { /* The other side has no transaction to bye, just assume it's all right then */ @@ -18826,6 +18883,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ handle_response_invite(p, resp, rest, req, seqno); } else if (sipmethod == SIP_BYE) { pvt_set_needdestroy(p, "received 481 response"); + } else if (sipmethod == SIP_NOTIFY) { + pvt_set_needdestroy(p, "received 481 response"); } else if (sipdebug) { ast_debug(1, "Remote host can't match request %s to call '%s'. Giving up\n", sip_methods[sipmethod].text, p->callid); } @@ -20120,6 +20179,15 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int } else { p->jointcapability = p->capability; ast_debug(1, "Hm.... No sdp for the moment\n"); + /* Some devices signal they want to be put off hold by sending a re-invite + *without* an SDP, which is supposed to mean "Go back to your state" + and since they put os on remote hold, we go back to off hold */ + if (ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) { + ast_queue_control(p->owner, AST_CONTROL_UNHOLD); + /* Activate a re-invite */ + ast_queue_frame(p->owner, &ast_null_frame); + change_hold_state(p, req, FALSE, 0); + } } if (p->do_history) /* This is a response, note what it was for */ append_history(p, "ReInv", "Re-invite received"); @@ -20238,7 +20306,8 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int /* Initialize our tag */ make_our_tag(p->tag, sizeof(p->tag)); - /* First invitation - create the channel */ + /* First invitation - create the channel. Allocation + * failures are handled below. */ c = sip_new(p, AST_STATE_DOWN, S_OR(p->peername, NULL)); *recount = 1; @@ -20398,7 +20467,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int if (!req->ignore && p) p->lastinvite = seqno; - if (replace_id) { /* Attended transfer or call pickup - we're the target */ + if (c && replace_id) { /* Attended transfer or call pickup - we're the target */ if (!ast_strlen_zero(pickup.exten)) { append_history(p, "Xfer", "INVITE/Replace received"); @@ -21351,7 +21420,6 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, const char *eventheader = get_header(req, "Event"); /* Get Event package name */ int resubscribe = (p->subscribed != NONE); char *temp, *event; - struct ao2_iterator i; if (p->initreq.headers) { /* We already have a dialog */ @@ -21652,7 +21720,6 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, ao2_unlock(p->relatedpeer); } } else { - struct sip_pvt *p_old; if ((firststate = ast_extension_state(NULL, p->context, p->exten)) < 0) { @@ -21667,40 +21734,8 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, append_history(p, "Subscribestatus", "%s", ast_extension_state2str(firststate)); /* hide the 'complete' exten/context in the refer_to field for later display */ ast_string_field_build(p, subscribeuri, "%s@%s", p->exten, p->context); + /* Deleted the slow iteration of all sip dialogs to find old subscribes from this peer for exten@context */ - /* remove any old subscription from this peer for the same exten/context, - as the peer has obviously forgotten about it and it's wasteful to wait - for it to expire and send NOTIFY messages to the peer only to have them - ignored (or generate errors) - */ - i = ao2_iterator_init(dialogs, 0); - while ((p_old = ao2_t_iterator_next(&i, "iterate thru dialogs"))) { - if (p_old == p) { - ao2_t_ref(p_old, -1, "toss dialog ptr from iterator_next before continue"); - continue; - } - if (p_old->initreq.method != SIP_SUBSCRIBE) { - ao2_t_ref(p_old, -1, "toss dialog ptr from iterator_next before continue"); - continue; - } - if (p_old->subscribed == NONE) { - ao2_t_ref(p_old, -1, "toss dialog ptr from iterator_next before continue"); - continue; - } - sip_pvt_lock(p_old); - if (!strcmp(p_old->username, p->username)) { - if (!strcmp(p_old->exten, p->exten) && - !strcmp(p_old->context, p->context)) { - pvt_set_needdestroy(p_old, "replacing subscription"); - sip_pvt_unlock(p_old); - ao2_t_ref(p_old, -1, "toss dialog ptr from iterator_next before break"); - break; - } - } - sip_pvt_unlock(p_old); - ao2_t_ref(p_old, -1, "toss dialog ptr from iterator_next"); - } - ao2_iterator_destroy(&i); } if (!p->expiry) { pvt_set_needdestroy(p, "forcing expiration"); @@ -21763,9 +21798,13 @@ static int handle_request_register(struct sip_pvt *p, struct sip_request *req, s return res; } -/*! \brief Handle incoming SIP requests (methods) -\note This is where all incoming requests go first */ -/* called with p and p->owner locked */ +/*! + * \brief Handle incoming SIP requests (methods) + * \note + * This is where all incoming requests go first. + * \note + * called with p and p->owner locked + */ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct sockaddr_in *sin, int *recount, int *nounlock) { /* Called with p->lock held, as well as p->owner->lock if appropriate, keeping things @@ -21857,7 +21896,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so } else { ast_debug(1, "Ignoring too old SIP packet packet %d (expecting >= %d)\n", seqno, p->icseq); if (req->method != SIP_ACK) - transmit_response(p, "503 Server error", req); /* We must respond according to RFC 3261 sec 12.2 */ + transmit_response(p, "500 Server error", req); /* We must respond according to RFC 3261 sec 12.2 */ return -1; } } else if (p->icseq && @@ -22232,8 +22271,8 @@ static int handle_request_do(struct sip_request *req, struct sockaddr_in *sin) if (p->owner && !nounlock) ast_channel_unlock(p->owner); sip_pvt_unlock(p); - ast_mutex_unlock(&netlock); ao2_t_ref(p, -1, "throw away dialog ptr from find_call at end of routine"); /* p is gone after the return */ + ast_mutex_unlock(&netlock); return 1; } @@ -25217,6 +25256,7 @@ static int reload_config(enum channelreloadreason reason) if (sipsock < 0) { ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno)); ast_config_destroy(cfg); + ast_mutex_unlock(&netlock); return -1; } else { /* Allow SIP clients on the same host to access us: */ diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index dd0f7466d..dd3f963ed 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -4894,17 +4894,21 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession if ((sub && sub->owner) && (sub->owner->_state == AST_STATE_UP)){ c = sub->owner; - if (!ast_masq_park_call(ast_bridged_channel(c), c, 0, &extout)) { - snprintf(message, sizeof(message), "Call Parked at: %d", extout); - transmit_displaynotify(d, message, 10); + if (ast_bridged_channel(c)) { + if (!ast_masq_park_call(ast_bridged_channel(c), c, 0, &extout)) { + snprintf(message, sizeof(message), "Call Parked at: %d", extout); + transmit_displaynotify(d, message, 10); + } else { + transmit_displaynotify(d, "Call Park failed", 10); + } } else { - transmit_displaynotify(d, "Call Park failed", 10); + transmit_displaynotify(d, "Call Park not available", 10); } } else { transmit_displaynotify(d, "Call Park not available", 10); } - } break; + } case STIMULUS_DND: if (skinnydebug) ast_verb(1, "Received Stimulus: DND (%d/%d)\n", instance, callreference); @@ -5984,17 +5988,21 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse if ((sub && sub->owner) && (sub->owner->_state == AST_STATE_UP)){ c = sub->owner; - if (!ast_masq_park_call(ast_bridged_channel(c), c, 0, &extout)) { - snprintf(message, sizeof(message), "Call Parked at: %d", extout); - transmit_displaynotify(d, message, 10); + if (ast_bridged_channel(c)) { + if (!ast_masq_park_call(ast_bridged_channel(c), c, 0, &extout)) { + snprintf(message, sizeof(message), "Call Parked at: %d", extout); + transmit_displaynotify(d, message, 10); + } else { + transmit_displaynotify(d, "Call Park failed", 10); + } } else { - transmit_displaynotify(d, "Call Park failed", 10); + transmit_displaynotify(d, "Call Park not available", 10); } } else { transmit_displaynotify(d, "Call Park not available", 10); } - } break; + } case SOFTKEY_JOIN: if (skinnydebug) ast_verb(1, "Received Softkey Event: Join(%d/%d)\n", instance, callreference); diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index efdf83cbf..4716bf289 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -92,10 +92,10 @@ struct codec_dahdi_pvt { }; /* Only used by a decoder */ -static int ulawtolin(struct ast_trans_pvt *pvt) +static int ulawtolin(struct ast_trans_pvt *pvt, int samples) { struct codec_dahdi_pvt *dahdip = pvt->pvt; - int i = dahdip->required_samples; + int i = samples; uint8_t *src = &dahdip->ulaw_buffer[0]; int16_t *dst = pvt->outbuf.i16 + pvt->datalen; @@ -334,7 +334,7 @@ static struct ast_frame *dahdi_decoder_frameout(struct ast_trans_pvt *pvt) } } else { if (dahdip->softslin) { - ulawtolin(pvt); + ulawtolin(pvt, res); pvt->f.datalen = res * 2; } else { pvt->f.datalen = res; @@ -346,7 +346,7 @@ static struct ast_frame *dahdi_decoder_frameout(struct ast_trans_pvt *pvt) pvt->f.offset = AST_FRIENDLY_OFFSET; pvt->f.src = pvt->t->name; pvt->f.data.ptr = pvt->outbuf.c; - pvt->f.samples = dahdip->required_samples; + pvt->f.samples = res; ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR); pvt->samples = 0; diff --git a/configs/cdr_pgsql.conf.sample b/configs/cdr_pgsql.conf.sample index 0784c7b08..8986b26ca 100644 --- a/configs/cdr_pgsql.conf.sample +++ b/configs/cdr_pgsql.conf.sample @@ -7,3 +7,4 @@ ;password=password ;user=postgres ;table=cdr ;SQL table where CDRs will be inserted +;encoding=LATIN9 ; Encoding of logged characters in Asterisk diff --git a/configs/gtalk.conf.sample b/configs/gtalk.conf.sample index ad089b208..bae8e11a1 100644 --- a/configs/gtalk.conf.sample +++ b/configs/gtalk.conf.sample @@ -1,20 +1,18 @@ ;[general] -;context=default ;;Context to dump call into -;bindaddr=0.0.0.0 ;;Address to bind to -;allowguest=yes ;;Allow calls from people not in - ;;list of peers -; -;[guest] ;;special account for options on guest account -;disallow=all +;context=default ; Context to dump call into +;bindaddr=0.0.0.0 ; Address to bind to +;allowguest=yes ; Allow calls from people not in list of peers + +;[guest] ; special account for options on guest account +;disallow=all ;allow=ulaw ;context=guest -; + ;[ogorman] -;username=ogorman@gmail.com ;;username of the peer your - ;;calling or accepting calls from +;username=ogorman@gmail.com ; username of the peer your + ; calling or accepting calls from ;disallow=all ;allow=ulaw -;context=default -;connection=asterisk ;;client or component in jabber.conf - ;;for the call to leave on. -; +;context=default +;connection=asterisk ; client or component in jabber.conf for the + ; call to leave on. diff --git a/configs/jabber.conf.sample b/configs/jabber.conf.sample index 6cfb755bd..4e815ef83 100644 --- a/configs/jabber.conf.sample +++ b/configs/jabber.conf.sample @@ -1,23 +1,19 @@ [general] -;debug=yes ;;Turn on debugging by default. -;autoprune=yes ;;Auto remove users from buddy list. Depending on your - ;;setup (ie, using your personal Gtalk account for a test) - ;;you might lose your contacts list. Default is 'no'. -;autoregister=yes ;;Auto register users from buddy list. +;debug=yes ; Enable debugging (disabled by default). +;autoprune=yes ; Auto remove users from buddy list. Depending on your + ; setup (ie, using your personal Gtalk account for a test) + ; you might lose your contacts list. Default is 'no'. +;autoregister=yes ; Auto register users from buddy list. -;[asterisk] ;;label -;type=client ;;Client or Component connection -;serverhost=astjab.org ;;Route to server for example, - ;; talk.google.com -;username=asterisk@astjab.org/asterisk ;;Username with optional resource. -;secret=blah ;;Password -;priority=1 ;;Resource priority -;port=5222 ;;Port to use defaults to 5222 -;usetls=yes ;;Use tls or not -;usesasl=yes ;;Use sasl or not -;buddy=mogorman@astjab.org ;;Manual addition of buddy to list. -;status=available ;;One of: chat, available, away, - ;; xaway, or dnd -;statusmessage="I am available" ;;Have custom status message for - ;;Asterisk. -;timeout=100 ;;Timeout on the message stack. +;[asterisk] +;type=client ; Client or Component connection +;serverhost=astjab.org ; Route to server for example, talk.google.com +;username=asterisk@astjab.org/asterisk ; Username with optional resource. +;secret=blah ; Password +;priority=1 ; Resource priority +;port=5222 ; Port to use defaults to 5222 +;usetls=yes ; Use tls or not +;usesasl=yes ; Use sasl or not +;buddy=mogorman@astjab.org ; Manual addition of buddy to list. +;statusmessage="I am available" ; Have custom status message for Asterisk +;timeout=100 ; Timeout on the message stack. diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample index 79c1ba82e..acb7da980 100644 --- a/configs/manager.conf.sample +++ b/configs/manager.conf.sample @@ -85,8 +85,8 @@ bindaddr = 0.0.0.0 ; management commands, such as Shutdown, Restart, and Reload. ; call - Information about channels and ability to set information in a ; running channel. -; log - Logging information. Read-only. -; verbose - Verbose information. Read-only. +; log - Logging information. Read-only. (Defined but not yet used.) +; verbose - Verbose information. Read-only. (Defined but not yet used.) ; agent - Information about queues and agents and ability to add queue ; members to a queue. ; user - Permission to send and receive UserEvent. diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample index 8ccc851e4..c7d2b1859 100644 --- a/configs/musiconhold.conf.sample +++ b/configs/musiconhold.conf.sample @@ -31,7 +31,7 @@ ; ; The path specified can be either an absolute path (starts with '/'), ; or a relative path; relative paths are interpreted as being relative -; to the 'astvarlibdir' in asterisk.conf, which defaults to +; to the 'astdatalibdir' in asterisk.conf, which defaults to ; /var/lib/asterisk. ; ; NOTE: diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample index cb1acec42..c09b76e46 100644 --- a/configs/phoneprov.conf.sample +++ b/configs/phoneprov.conf.sample @@ -36,11 +36,25 @@ default_profile=polycom ; The default profile to use if none specified in users. ; CALLERID (cid_number) ; VOCIEMAIL_EXTEN (vmexten) ; EXTENSION_LENGTH (localextenlength) +; LINE +; LINEKEYS ; Built-in variables and the options in phoneprov.conf that they come from ; SERVER (server) ; SERVER_PORT (serverport) + +; Built-in variables for managing timezones and daylight savings time. +; TZOFFSET +; DST_ENABLE +; DST_START_MONTH +; DST_START_MDAY +; DST_START_HOUR +; DST_END_MONTH +; DST_END_MDAY +; DST_END_HOUR +; TIMEZONE + [polycom] staticdir => configs/ ; Sub directory of AST_DATA_DIR/phoneprov that static files reside ; in. This allows a request to /phoneprov/sip.cfg to pull the file diff --git a/configs/res_ldap.conf.sample b/configs/res_ldap.conf.sample index b02045f15..739e4ba11 100644 --- a/configs/res_ldap.conf.sample +++ b/configs/res_ldap.conf.sample @@ -9,6 +9,10 @@ ; extensions = ldap,"dc=myDomain,dc=myDomainExt",extensions ; sip.conf = ldap,"dc=myDomain,dc=myDomainExt",config +; ********************************************************************************* +; NOTE: res_ldap.conf should be chmod 600 because it contains the plain-text LDAP +; password to an account with WRITE access to the asterisk configuration. +; ********************************************************************************* [_general] ; @@ -18,8 +22,8 @@ ;port=389 ;url=ldap://ldap3.mydomain.com:3890 ;protocol=3 ; Version of the LDAP protocol to use; default is 3. -;basedn=MyRootDN ; Base DN -;user=MyDN ; Bind DN +;basedn=dc=example,dc=tld ; Base DN +;user=cn=asterisk,dc=example,dc=tld ; Bind DN ;pass=MyPassword ; Bind password ; Configuration Table @@ -56,7 +60,15 @@ additionalFilter=(objectClass=AstExtension) ; Sip Users Table ; [sip] -name = cn +name = cn ; We use the "cn" as the default value for name on the line above + ; because objectClass=AsteriskSIPUser does not include a uid as an allowed field + ; If your entry combines other objectClasses and uid is available, you may + ; prefer to change the line to be name = uid, especially if your LDAP entries + ; contain spaces in the cn field. + ; You may also find it appropriate to use something completely different. + ; This is possible by changing the line above to name = AstAccountName (or whatever you + ; prefer). + ; amaflags = AstAccountAMAFlags callgroup = AstAccountCallGroup callerid = AstAccountCallerID @@ -70,7 +82,10 @@ fullcontact = gecos host = AstAccountHost insecure = AstAccountInsecure mailbox = AstAccountMailbox -md5secret = realmedPassword +md5secret = AstAccountRealmedPassword ; Must be an MD5 hash. Field value can start with + ; {md5} but it is not required. + ; Generate the password via the md5sum command, e.g. + ; echo "my_password" | md5sum nat = AstAccountNAT deny = AstAccountDeny permit = AstAccountPermit @@ -105,7 +120,10 @@ fullcontact = AstAccountFullContact fullcontact = gecos host = AstAccountHost mailbox = AstAccountMailbox -md5secret = realmedPassword +md5secret = AstAccountRealmedPassword ; Must be an MD5 hash. Field value can start with + ; {md5} but it is not required. + ; Generate the password via the md5sum command, e.g. + ; echo "my_password" | md5sum deny = AstAccountDeny permit = AstAccountPermit port = AstAccountPort @@ -141,7 +159,10 @@ fullcontact = gecos host = AstAccountHost insecure = AstAccountInsecure mailbox = AstAccountMailbox -md5secret = realmedPassword +md5secret = AstAccountRealmedPassword ; Must be an MD5 hash. Field value can start with + ; {md5} but it is not required. + ; Generate the password via the md5sum command, e.g. + ; echo "my_password" | md5sum nat = AstAccountNAT deny = AstAccountDeny permit = AstAccountPermit @@ -1,65 +1,88 @@ #! /bin/sh -# From configure.ac Revision: 284593 . +# From configure.ac Revision: 290201 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for asterisk 1.6.2. +# Generated by GNU Autoconf 2.65 for asterisk 1.6.2. # # Report bugs to <https://issues.asterisk.org>. # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. # # "Asterisk" -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -68,20 +91,18 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -92,354 +113,322 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: https://issues.asterisk.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 fi - fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status -fi +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit -fi +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -456,8 +445,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -467,49 +455,40 @@ test \$exitcode = 0") || { exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -517,7 +496,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -534,12 +513,12 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -553,8 +532,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 </dev/null 6>&1 +test -n "$DJDIR" || exec 7<&0 </dev/null +exec 6>&1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -572,7 +551,6 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='asterisk' @@ -580,6 +558,7 @@ PACKAGE_TARNAME='asterisk' PACKAGE_VERSION='1.6.2' PACKAGE_STRING='asterisk 1.6.2' PACKAGE_BUGREPORT='https://issues.asterisk.org' +PACKAGE_URL='' ac_unique_file="main/asterisk.c" # Factoring default headers for most tests. @@ -622,427 +601,501 @@ ac_default_prefix=/usr/local ac_default_prefix=/usr/local ac_default_prefix=/usr ac_header_list= -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -CONFIG_CFLAGS -CONFIG_LDFLAGS -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -CPP -GREP -EGREP -BUILD_PLATFORM -BUILD_CPU -BUILD_VENDOR -BUILD_OS -HOST_PLATFORM -HOST_CPU -HOST_VENDOR -HOST_OS -OSARCH -PBX_WINARCH -UNAME -PBX_OSREV -CXX -LD -RANLIB -CXXFLAGS -ac_ct_CXX -CXXCPP -SED -AWK -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -LN_S -GNU_MAKE -STRIP -ac_ct_STRIP -AR -ac_ct_AR -SHA1SUM -ac_ct_SHA1SUM -GNU_LD -BISON -FLEX -FIND -COMPRESS -BASENAME -DIRNAME -LN -DOT -WGET -CURL -RUBBER -CATDVI -KPATHSEA -XMLSTARLET -FETCH -DOWNLOAD -PBX_BISON -PBX_FLEX -SOXMIX -MD5 -acx_pthread_config -PTHREAD_CC -PTHREAD_LIBS -PTHREAD_CFLAGS -AST_DEVMODE -ALSA_LIB -ALSA_INCLUDE -ALSA_DIR -PBX_ALSA -FFMPEG_LIB -FFMPEG_INCLUDE -FFMPEG_DIR -PBX_FFMPEG -CAP_LIB -CAP_INCLUDE -CAP_DIR -PBX_CAP -CURSES_LIB -CURSES_INCLUDE -CURSES_DIR -PBX_CURSES -CRYPTO_LIB -CRYPTO_INCLUDE -CRYPTO_DIR -PBX_CRYPTO -DAHDI_LIB -DAHDI_INCLUDE -DAHDI_DIR -PBX_DAHDI -BKTR_LIB -BKTR_INCLUDE -BKTR_DIR -PBX_BKTR -GSM_LIB -GSM_INCLUDE -GSM_DIR -PBX_GSM -GTK_LIB -GTK_INCLUDE -GTK_DIR -PBX_GTK -GTK2_LIB -GTK2_INCLUDE -GTK2_DIR -PBX_GTK2 -GMIME_LIB -GMIME_INCLUDE -GMIME_DIR -PBX_GMIME -OPENH323_LIB -OPENH323_INCLUDE -OPENH323_DIR -PBX_OPENH323 -HOARD_LIB -HOARD_INCLUDE -HOARD_DIR -PBX_HOARD -ICONV_LIB -ICONV_INCLUDE -ICONV_DIR -PBX_ICONV -IKSEMEL_LIB -IKSEMEL_INCLUDE -IKSEMEL_DIR -PBX_IKSEMEL -IMAP_TK_LIB -IMAP_TK_INCLUDE -IMAP_TK_DIR -PBX_IMAP_TK -INOTIFY_LIB -INOTIFY_INCLUDE -INOTIFY_DIR -PBX_INOTIFY -IODBC_LIB -IODBC_INCLUDE -IODBC_DIR -PBX_IODBC -ISDNNET_LIB -ISDNNET_INCLUDE -ISDNNET_DIR -PBX_ISDNNET -JACK_LIB -JACK_INCLUDE -JACK_DIR -PBX_JACK -LDAP_LIB -LDAP_INCLUDE -LDAP_DIR -PBX_LDAP -PBX_CURL -_libcurl_config -CURL_INCLUDE -CURL_LIB -LIBXML2_LIB -LIBXML2_INCLUDE -LIBXML2_DIR -PBX_LIBXML2 -LTDL_LIB -LTDL_INCLUDE -LTDL_DIR -PBX_LTDL -LUA_LIB -LUA_INCLUDE -LUA_DIR -PBX_LUA -MISDN_LIB -MISDN_INCLUDE -MISDN_DIR -PBX_MISDN -NBS_LIB -NBS_INCLUDE -NBS_DIR -PBX_NBS -NCURSES_LIB -NCURSES_INCLUDE -NCURSES_DIR -PBX_NCURSES -NETSNMP_LIB -NETSNMP_INCLUDE -NETSNMP_DIR -PBX_NETSNMP -NEWT_LIB -NEWT_INCLUDE -NEWT_DIR -PBX_NEWT -OGG_LIB -OGG_INCLUDE -OGG_DIR -PBX_OGG -OPENAIS_LIB -OPENAIS_INCLUDE -OPENAIS_DIR -PBX_OPENAIS -OPENR2_LIB -OPENR2_INCLUDE -OPENR2_DIR -PBX_OPENR2 -OSPTK_LIB -OSPTK_INCLUDE -OSPTK_DIR -PBX_OSPTK -OSS_LIB -OSS_INCLUDE -OSS_DIR -PBX_OSS -PGSQL_LIB -PGSQL_INCLUDE -PGSQL_DIR -PBX_PGSQL -POPT_LIB -POPT_INCLUDE -POPT_DIR -PBX_POPT -PORTAUDIO_LIB -PORTAUDIO_INCLUDE -PORTAUDIO_DIR -PBX_PORTAUDIO -PRI_LIB -PRI_INCLUDE -PRI_DIR -PBX_PRI -PRI_INBANDDISCONNECT_LIB -PRI_INBANDDISCONNECT_INCLUDE -PRI_INBANDDISCONNECT_DIR -PBX_PRI_INBANDDISCONNECT -PWLIB_LIB -PWLIB_INCLUDE -PWLIB_DIR -PBX_PWLIB -RADIUS_LIB -RADIUS_INCLUDE -RADIUS_DIR -PBX_RADIUS -RESAMPLE_LIB -RESAMPLE_INCLUDE -RESAMPLE_DIR -PBX_RESAMPLE -SDL_LIB -SDL_INCLUDE -SDL_DIR -PBX_SDL -SDL_IMAGE_LIB -SDL_IMAGE_INCLUDE -SDL_IMAGE_DIR -PBX_SDL_IMAGE -SOUNDS_CACHE_DIR -SPANDSP_LIB -SPANDSP_INCLUDE -SPANDSP_DIR -PBX_SPANDSP -SS7_LIB -SS7_INCLUDE -SS7_DIR -PBX_SS7 -SPEEX_LIB -SPEEX_INCLUDE -SPEEX_DIR -PBX_SPEEX -SPEEX_PREPROCESS_LIB -SPEEX_PREPROCESS_INCLUDE -SPEEX_PREPROCESS_DIR -PBX_SPEEX_PREPROCESS -SPEEXDSP_LIB -SPEEXDSP_INCLUDE -SPEEXDSP_DIR -PBX_SPEEXDSP -SQLITE_LIB -SQLITE_INCLUDE -SQLITE_DIR -PBX_SQLITE -SQLITE3_LIB -SQLITE3_INCLUDE -SQLITE3_DIR -PBX_SQLITE3 -OPENSSL_LIB -OPENSSL_INCLUDE -OPENSSL_DIR -PBX_OPENSSL -SUPPSERV_LIB -SUPPSERV_INCLUDE -SUPPSERV_DIR -PBX_SUPPSERV -FREETDS_LIB -FREETDS_INCLUDE -FREETDS_DIR -PBX_FREETDS -TERMCAP_LIB -TERMCAP_INCLUDE -TERMCAP_DIR -PBX_TERMCAP -TIMERFD_LIB -TIMERFD_INCLUDE -TIMERFD_DIR -PBX_TIMERFD -TINFO_LIB -TINFO_INCLUDE -TINFO_DIR -PBX_TINFO -TONEZONE_LIB -TONEZONE_INCLUDE -TONEZONE_DIR -PBX_TONEZONE -UNIXODBC_LIB -UNIXODBC_INCLUDE -UNIXODBC_DIR -PBX_UNIXODBC -USB_LIB -USB_INCLUDE -USB_DIR -PBX_USB -VORBIS_LIB -VORBIS_INCLUDE -VORBIS_DIR -PBX_VORBIS -VPB_LIB -VPB_INCLUDE -VPB_DIR -PBX_VPB -X11_LIB -X11_INCLUDE -X11_DIR -PBX_X11 -ZLIB_LIB -ZLIB_INCLUDE -ZLIB_DIR -PBX_ZLIB -ALLOCA -LIBOBJS -PBX_WORKING_FORK -POW_LIB -HAS_POLL -PBX_PTHREAD_RWLOCK_INITIALIZER -PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -GC_CFLAGS -GC_LDFLAGS -AST_DECLARATION_AFTER_STATEMENT -AST_FORTIFY_SOURCE -AST_NO_STRICT_OVERFLOW -AST_SHADOW_WARNINGS -PBX_IP_MTU_DISCOVER -PBX_DAHDI_HALF_FULL -GSM_INTERNAL -CONFIG_LIBXML2 -PBX_MISDN_FAC_RESULT -PBX_MISDN_FAC_ERROR -CONFIG_NETSNMP -PG_CONFIG -PTLIB_CONFIG -PWLIBDIR -PWLIB_INCDIR -PWLIB_LIBDIR -PWLIB_PLATFORM -OPENH323DIR -OPENH323_INCDIR -OPENH323_LIBDIR -OPENH323_SUFFIX -OPENH323_BUILD -PBX_AIS -AIS_INCLUDE -AIS_LIB -CONFIG_GMIME -EDITLINE_LIB -PBX_H323 -PBX_IXJUSER -CONFIG_SDL +ac_subst_vars='LTLIBOBJS +PBX_GENERIC_ODBC +GENERIC_ODBC_INCLUDE +GENERIC_ODBC_LIB CONFIG_GTK +CONFIG_SDL +PBX_IXJUSER +PBX_H323 +EDITLINE_LIB +CONFIG_GMIME +AIS_LIB +AIS_INCLUDE +PBX_AIS +OPENH323_BUILD +OPENH323_SUFFIX +OPENH323_LIBDIR +OPENH323_INCDIR +OPENH323DIR +PWLIB_PLATFORM +PWLIB_LIBDIR +PWLIB_INCDIR +PWLIBDIR +PTLIB_CONFIG +PG_CONFIG +CONFIG_NETSNMP +PBX_MISDN_FAC_ERROR +PBX_MISDN_FAC_RESULT +CONFIG_LIBXML2 +GSM_INTERNAL +PBX_DAHDI_HALF_FULL PKGCONFIG -GENERIC_ODBC_LIB -GENERIC_ODBC_INCLUDE -PBX_GENERIC_ODBC -LTLIBOBJS' +PBX_IP_MTU_DISCOVER +AST_SHADOW_WARNINGS +AST_NO_STRICT_OVERFLOW +AST_FORTIFY_SOURCE +AST_DECLARATION_AFTER_STATEMENT +GC_LDFLAGS +GC_CFLAGS +PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +PBX_PTHREAD_RWLOCK_INITIALIZER +HAS_POLL +POW_LIB +PBX_WORKING_FORK +LIBOBJS +ALLOCA +PBX_ZLIB +ZLIB_DIR +ZLIB_INCLUDE +ZLIB_LIB +PBX_X11 +X11_DIR +X11_INCLUDE +X11_LIB +PBX_VPB +VPB_DIR +VPB_INCLUDE +VPB_LIB +PBX_VORBIS +VORBIS_DIR +VORBIS_INCLUDE +VORBIS_LIB +PBX_USB +USB_DIR +USB_INCLUDE +USB_LIB +PBX_UNIXODBC +UNIXODBC_DIR +UNIXODBC_INCLUDE +UNIXODBC_LIB +PBX_TONEZONE +TONEZONE_DIR +TONEZONE_INCLUDE +TONEZONE_LIB +PBX_TINFO +TINFO_DIR +TINFO_INCLUDE +TINFO_LIB +PBX_TIMERFD +TIMERFD_DIR +TIMERFD_INCLUDE +TIMERFD_LIB +PBX_TERMCAP +TERMCAP_DIR +TERMCAP_INCLUDE +TERMCAP_LIB +PBX_FREETDS +FREETDS_DIR +FREETDS_INCLUDE +FREETDS_LIB +PBX_SUPPSERV +SUPPSERV_DIR +SUPPSERV_INCLUDE +SUPPSERV_LIB +PBX_OPENSSL +OPENSSL_DIR +OPENSSL_INCLUDE +OPENSSL_LIB +PBX_SQLITE3 +SQLITE3_DIR +SQLITE3_INCLUDE +SQLITE3_LIB +PBX_SQLITE +SQLITE_DIR +SQLITE_INCLUDE +SQLITE_LIB +PBX_SPEEXDSP +SPEEXDSP_DIR +SPEEXDSP_INCLUDE +SPEEXDSP_LIB +PBX_SPEEX_PREPROCESS +SPEEX_PREPROCESS_DIR +SPEEX_PREPROCESS_INCLUDE +SPEEX_PREPROCESS_LIB +PBX_SPEEX +SPEEX_DIR +SPEEX_INCLUDE +SPEEX_LIB +PBX_SS7 +SS7_DIR +SS7_INCLUDE +SS7_LIB +PBX_SPANDSP +SPANDSP_DIR +SPANDSP_INCLUDE +SPANDSP_LIB +SOUNDS_CACHE_DIR +PBX_SDL_IMAGE +SDL_IMAGE_DIR +SDL_IMAGE_INCLUDE +SDL_IMAGE_LIB +PBX_SDL +SDL_DIR +SDL_INCLUDE +SDL_LIB +PBX_RESAMPLE +RESAMPLE_DIR +RESAMPLE_INCLUDE +RESAMPLE_LIB +PBX_RADIUS +RADIUS_DIR +RADIUS_INCLUDE +RADIUS_LIB +PBX_PWLIB +PWLIB_DIR +PWLIB_INCLUDE +PWLIB_LIB +PBX_PRI_INBANDDISCONNECT +PRI_INBANDDISCONNECT_DIR +PRI_INBANDDISCONNECT_INCLUDE +PRI_INBANDDISCONNECT_LIB +PBX_PRI +PRI_DIR +PRI_INCLUDE +PRI_LIB +PBX_PORTAUDIO +PORTAUDIO_DIR +PORTAUDIO_INCLUDE +PORTAUDIO_LIB +PBX_POPT +POPT_DIR +POPT_INCLUDE +POPT_LIB +PBX_PGSQL +PGSQL_DIR +PGSQL_INCLUDE +PGSQL_LIB +PBX_OSS +OSS_DIR +OSS_INCLUDE +OSS_LIB +PBX_OSPTK +OSPTK_DIR +OSPTK_INCLUDE +OSPTK_LIB +PBX_OPENR2 +OPENR2_DIR +OPENR2_INCLUDE +OPENR2_LIB +PBX_OPENAIS +OPENAIS_DIR +OPENAIS_INCLUDE +OPENAIS_LIB +PBX_OGG +OGG_DIR +OGG_INCLUDE +OGG_LIB +PBX_NEWT +NEWT_DIR +NEWT_INCLUDE +NEWT_LIB +PBX_NETSNMP +NETSNMP_DIR +NETSNMP_INCLUDE +NETSNMP_LIB +PBX_NCURSES +NCURSES_DIR +NCURSES_INCLUDE +NCURSES_LIB +PBX_NBS +NBS_DIR +NBS_INCLUDE +NBS_LIB +PBX_MISDN +MISDN_DIR +MISDN_INCLUDE +MISDN_LIB +PBX_LUA +LUA_DIR +LUA_INCLUDE +LUA_LIB +PBX_LTDL +LTDL_DIR +LTDL_INCLUDE +LTDL_LIB +PBX_LIBXML2 +LIBXML2_DIR +LIBXML2_INCLUDE +LIBXML2_LIB +CURL_LIB +CURL_INCLUDE +_libcurl_config +PBX_CURL +PBX_LDAP +LDAP_DIR +LDAP_INCLUDE +LDAP_LIB +PBX_JACK +JACK_DIR +JACK_INCLUDE +JACK_LIB +PBX_ISDNNET +ISDNNET_DIR +ISDNNET_INCLUDE +ISDNNET_LIB +PBX_IODBC +IODBC_DIR +IODBC_INCLUDE +IODBC_LIB +PBX_INOTIFY +INOTIFY_DIR +INOTIFY_INCLUDE +INOTIFY_LIB +PBX_IMAP_TK +IMAP_TK_DIR +IMAP_TK_INCLUDE +IMAP_TK_LIB +PBX_IKSEMEL +IKSEMEL_DIR +IKSEMEL_INCLUDE +IKSEMEL_LIB +PBX_ICONV +ICONV_DIR +ICONV_INCLUDE +ICONV_LIB +PBX_HOARD +HOARD_DIR +HOARD_INCLUDE +HOARD_LIB +PBX_OPENH323 +OPENH323_DIR +OPENH323_INCLUDE +OPENH323_LIB +PBX_GMIME +GMIME_DIR +GMIME_INCLUDE +GMIME_LIB +PBX_GTK2 +GTK2_DIR +GTK2_INCLUDE +GTK2_LIB +PBX_GTK +GTK_DIR +GTK_INCLUDE +GTK_LIB +PBX_GSM +GSM_DIR +GSM_INCLUDE +GSM_LIB +PBX_BKTR +BKTR_DIR +BKTR_INCLUDE +BKTR_LIB +PBX_DAHDI +DAHDI_DIR +DAHDI_INCLUDE +DAHDI_LIB +PBX_CRYPTO +CRYPTO_DIR +CRYPTO_INCLUDE +CRYPTO_LIB +PBX_CURSES +CURSES_DIR +CURSES_INCLUDE +CURSES_LIB +PBX_CAP +CAP_DIR +CAP_INCLUDE +CAP_LIB +PBX_FFMPEG +FFMPEG_DIR +FFMPEG_INCLUDE +FFMPEG_LIB +PBX_ALSA +ALSA_DIR +ALSA_INCLUDE +ALSA_LIB +AST_DEVMODE +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +acx_pthread_config +MD5 +SOXMIX +PBX_FLEX +PBX_BISON +DOWNLOAD +FETCH +XMLSTARLET +KPATHSEA +CATDVI +RUBBER +CURL +WGET +DOT +LN +DIRNAME +BASENAME +COMPRESS +FIND +FLEX +CMP +BISON +GNU_LD +ac_ct_SHA1SUM +SHA1SUM +ac_ct_AR +AR +ac_ct_STRIP +STRIP +GNU_MAKE +LN_S +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +AWK +SED +CXXCPP +ac_ct_CXX +CXXFLAGS +RANLIB +LD +CXX +PBX_OSREV +UNAME +PBX_WINARCH +OSARCH +HOST_OS +HOST_VENDOR +HOST_CPU +HOST_PLATFORM +BUILD_OS +BUILD_VENDOR +BUILD_CPU +BUILD_PLATFORM +EGREP +GREP +CPP +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +CONFIG_LDFLAGS +CONFIG_CFLAGS +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_gnu_ld +enable_dev_mode +with_asound +with_avcodec +with_cap +with_curses +with_crypto +with_dahdi +with_execinfo +with_gsm +with_gtk +with_gtk2 +with_gmime +with_h323 +with_hoard +with_iconv +with_iksemel +with_imap +with_inotify +with_iodbc +with_isdnnet +with_jack +with_ldap +with_libcurl +with_libxml2 +with_ltdl +with_lua +with_misdn +with_nbs +with_ncurses +with_netsnmp +with_newt +with_ogg +with_openais +with_openr2 +with_osptk +with_oss +with_postgres +with_popt +with_portaudio +with_pri +with_pwlib +with_radius +with_resample +with_sdl +with_SDL_image +with_sounds_cache +with_spandsp +with_ss7 +with_speex +with_speexdsp +with_sqlite +with_sqlite3 +with_ssl +with_suppserv +with_tds +with_termcap +with_timerfd +with_tinfo +with_tonezone +with_unixodbc +with_usb +with_vorbis +with_vpb +with_x11 +with_z +enable_largefile +enable_internal_poll +enable_xmldoc +' ac_precious_vars='build_alias host_alias target_alias @@ -1061,6 +1114,8 @@ CXXCPP' # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -1159,13 +1214,20 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1178,13 +1240,20 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1375,22 +1444,36 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1410,25 +1493,25 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1437,23 +1520,36 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -# Be sure to have absolute directory names. +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1467,7 +1563,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1483,23 +1579,21 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1526,13 +1620,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1580,9 +1672,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1592,25 +1684,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/asterisk] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/asterisk] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1628,6 +1720,7 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-dev-mode Turn on developer mode @@ -1713,7 +1806,7 @@ Some influential environment variables: LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> LIBS libraries to pass to the linker, e.g. -l<library> - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor CXX C++ compiler command @@ -1731,15 +1824,17 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1775,7 +1870,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1785,10 +1880,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF asterisk configure 1.6.2 -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.65 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -1796,12 +1890,904 @@ gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to https://issues.asterisk.org ## +## ------------------------------------------ ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case <limits.h> declares $2. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_member + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include <stdio.h> +#include <stdlib.h> +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 <conftest.val; ac_retval=0 +else + ac_retval=1 +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f conftest.val + + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_compute_int + +# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES +# --------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_cxx_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to https://issues.asterisk.org ## +## ------------------------------------------ ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_cxx_check_header_mongrel + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_link + +# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES +# --------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_cxx_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_cxx_check_header_compile cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by asterisk $as_me 1.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1837,8 +2823,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1872,12 +2858,12 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1893,13 +2879,13 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1924,12 +2910,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1958,9 +2945,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1975,9 +2962,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1993,87 +2980,95 @@ _ASBOX echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -ac_header_list="$ac_header_list utime.h" +as_fn_append ac_header_list " stdlib.h" +as_fn_append ac_header_list " unistd.h" +as_fn_append ac_header_list " sys/param.h" +as_fn_append ac_header_list " utime.h" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2084,68 +3079,56 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2158,24 +3141,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # cross-compile macros ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2189,35 +3164,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2233,28 +3200,24 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2276,24 +3239,16 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ac_aux_dir= for ac_dir in `pwd` "$srcdir"/`pwd`; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`pwd\` \"$srcdir\"/\`pwd\`" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \`pwd\` \"$srcdir\"/\`pwd\`" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \`pwd\` \"$srcdir\"/\`pwd\`" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2325,12 +3280,6 @@ CONFIG_LDFLAGS="${LDFLAGS}" ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h" - -cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2339,10 +3288,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2352,25 +3301,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2379,10 +3328,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2392,25 +3341,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2418,12 +3367,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2436,10 +3381,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2449,25 +3394,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2476,10 +3421,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2490,18 +3435,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2520,11 +3465,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2535,10 +3480,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2548,25 +3493,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2579,10 +3524,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2592,25 +3537,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2622,12 +3567,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2637,51 +3578,37 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2693,42 +3620,38 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2738,14 +3661,14 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2764,78 +3687,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2843,37 +3730,90 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2885,51 +3825,46 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2943,54 +3878,34 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3001,34 +3916,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3039,35 +3931,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3078,42 +3947,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3129,18 +3974,14 @@ else CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> @@ -3197,31 +4038,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3232,17 +4051,19 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3256,15 +4077,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -3278,11 +4099,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -3291,76 +4108,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -3372,8 +4147,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3383,11 +4158,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -3396,83 +4167,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -3482,45 +4210,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -3532,77 +4255,61 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -3614,75 +4321,31 @@ case `"$ac_path_EGREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" - -{ echo "$as_me:$LINENO: checking for AIX" >&5 -echo $ECHO_N "checking for AIX... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef _AIX - yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 -_ACEOF - -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -rm -f conftest* - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> @@ -3697,47 +4360,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3747,18 +4386,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3768,14 +4403,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> @@ -3802,113 +4433,36 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -3916,181 +4470,34 @@ fi done -if test "${ac_cv_header_minix_config_h+set}" = set; then - { echo "$as_me:$LINENO: checking for minix/config.h" >&5 -echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5 -echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <minix/config.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5 -echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <minix/config.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for minix/config.h" >&5 -echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_minix_config_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; } - -fi -if test $ac_cv_header_minix_config_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +if test "x$ac_cv_header_minix_config_h" = x""yes; then : MINIX=yes else MINIX= fi -if test "$MINIX" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 -_ACEOF - -fi - - - + if test "$MINIX" = yes; then +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h +$as_echo "#define _MINIX 1" >>confdefs.h + fi - { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 -echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 @@ -4103,47 +4510,25 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_safe_to_define___extensions__=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_safe_to_define___extensions__=no + ac_cv_safe_to_define___extensions__=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 -echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } test $ac_cv_safe_to_define___extensions__ = yes && - cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _POSIX_PTHREAD_SEMANTICS 1 -_ACEOF + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _TANDEM_SOURCE 1 -_ACEOF + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h # note- does not work on FreeBSD @@ -4168,14 +4553,10 @@ case "${host_os}" in ;; darwin*) -cat >>confdefs.h <<\_ACEOF -#define AST_POLL_COMPAT 1 -_ACEOF +$as_echo "#define AST_POLL_COMPAT 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define _DARWIN_UNLIMITED_SELECT 1 -_ACEOF +$as_echo "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h ;; *) @@ -4255,10 +4636,10 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}uname", so it can be a program name with args. set dummy ${ac_tool_prefix}uname; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_UNAME+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_UNAME+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $UNAME in [\\/]* | ?:[\\/]*) @@ -4270,14 +4651,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4285,11 +4666,11 @@ esac fi UNAME=$ac_cv_path_UNAME if test -n "$UNAME"; then - { echo "$as_me:$LINENO: result: $UNAME" >&5 -echo "${ECHO_T}$UNAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5 +$as_echo "$UNAME" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4298,10 +4679,10 @@ if test -z "$ac_cv_path_UNAME"; then ac_pt_UNAME=$UNAME # Extract the first word of "uname", so it can be a program name with args. set dummy uname; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_UNAME+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_UNAME+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_UNAME in [\\/]* | ?:[\\/]*) @@ -4313,14 +4694,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_UNAME="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4328,11 +4709,11 @@ esac fi ac_pt_UNAME=$ac_cv_path_ac_pt_UNAME if test -n "$ac_pt_UNAME"; then - { echo "$as_me:$LINENO: result: $ac_pt_UNAME" >&5 -echo "${ECHO_T}$ac_pt_UNAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_UNAME" >&5 +$as_echo "$ac_pt_UNAME" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_UNAME" = x; then @@ -4340,12 +4721,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac UNAME=$ac_pt_UNAME @@ -4363,18 +4740,16 @@ fi - - # cross-compile checks if test "${cross_compiling}" = "yes"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4384,25 +4759,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4411,10 +4786,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -4424,25 +4799,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -4450,12 +4825,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4467,10 +4838,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args. set dummy ${ac_tool_prefix}g++; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -4480,25 +4851,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="${ac_tool_prefix}g++" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4507,10 +4878,10 @@ if test -z "$ac_cv_prog_CXX"; then ac_ct_CXX=$CXX # Extract the first word of "g++", so it can be a program name with args. set dummy g++; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -4520,25 +4891,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="g++" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CXX" = x; then @@ -4546,12 +4917,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -4563,10 +4930,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$LD"; then ac_cv_prog_LD="$LD" # Let the user override the test. @@ -4576,25 +4943,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LD="${ac_tool_prefix}ld" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4603,10 +4970,10 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LD"; then ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. @@ -4616,25 +4983,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_LD="ld" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5 -echo "${ECHO_T}$ac_ct_LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LD" >&5 +$as_echo "$ac_ct_LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LD" = x; then @@ -4642,12 +5009,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LD=$ac_ct_LD @@ -4659,10 +5022,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -4672,25 +5035,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4699,10 +5062,10 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -4712,25 +5075,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -4738,12 +5101,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -4763,10 +5122,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4776,25 +5135,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4803,10 +5162,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -4816,25 +5175,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -4842,12 +5201,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4860,10 +5215,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4873,25 +5228,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4900,10 +5255,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4914,18 +5269,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -4944,11 +5299,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4959,10 +5314,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4972,25 +5327,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5003,10 +5358,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -5016,25 +5371,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5046,12 +5401,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5061,56 +5412,42 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5124,54 +5461,34 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5182,34 +5499,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5220,35 +5514,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5259,42 +5530,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -5310,18 +5557,14 @@ else CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> @@ -5378,31 +5621,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -5413,17 +5634,19 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5445,10 +5668,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -5458,25 +5681,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5489,10 +5712,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -5502,25 +5725,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5532,12 +5755,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -5547,49 +5766,36 @@ fi fi fi # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5603,54 +5809,34 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5661,34 +5847,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5699,35 +5862,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5738,42 +5878,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -5800,15 +5916,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -5822,11 +5938,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -5835,76 +5947,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -5916,8 +5986,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -5927,11 +5997,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -5940,83 +6006,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -6030,11 +6053,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CXXCPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" @@ -6048,11 +6071,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -6061,76 +6080,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -6142,8 +6119,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -6153,11 +6130,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -6166,83 +6139,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -6253,10 +6183,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # This macro is just copied into our local acinclude.m4 from libtool.m4 so that # the developers regenerating the configure script don't have to install libtool. -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do @@ -6264,40 +6194,35 @@ else done echo "$ac_script" | sed 99q >conftest.sed $as_unset ac_script || ac_script= - # Extract the first word of "sed gsed" to use in msg output -if test -z "$SED"; then -set dummy sed gsed; ac_prog_name=$2 -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$SED"; then ac_path_SED_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue - # Check for GNU ac_path_SED and select it if it is found. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo '' >> "conftest.nl" + $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -6309,52 +6234,42 @@ case `"$ac_path_SED" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_SED_found && break 3 + $ac_path_SED_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -SED="$ac_cv_path_SED" -if test -z "$SED"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_SED"; then + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else ac_cv_path_SED=$SED fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -echo "${ECHO_T}$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_prog_egrep+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a | (grep -E '(a|b)') >/dev/null 2>&1 then ac_cv_prog_egrep='grep -E' else ac_cv_prog_egrep='egrep' fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_egrep" >&5 +$as_echo "$ac_cv_prog_egrep" >&6; } EGREP=$ac_cv_prog_egrep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -6363,8 +6278,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -6393,14 +6308,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -6430,19 +6345,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in @@ -6454,8 +6367,8 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld # note, does not work on FreeBSD @@ -6463,10 +6376,10 @@ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -6476,25 +6389,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6514,22 +6427,23 @@ done # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -6547,17 +6461,29 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac -done + + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -6570,8 +6496,8 @@ fi INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -6581,24 +6507,24 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -6608,25 +6534,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6635,10 +6561,10 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -6648,25 +6574,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -6674,12 +6600,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -6688,10 +6610,10 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -{ echo "$as_me:$LINENO: checking for GNU make" >&5 -echo $ECHO_N "checking for GNU make... $ECHO_C" >&6; } -if test "${ac_cv_GNU_MAKE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5 +$as_echo_n "checking for GNU make... " >&6; } +if test "${ac_cv_GNU_MAKE+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_GNU_MAKE='Not Found' ; ac_cv_GNU_MAKE_VERSION_MAJOR=0 ; @@ -6707,27 +6629,92 @@ else done ; fi -{ echo "$as_me:$LINENO: result: $ac_cv_GNU_MAKE" >&5 -echo "${ECHO_T}$ac_cv_GNU_MAKE" >&6; } ; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_GNU_MAKE" >&5 +$as_echo "$ac_cv_GNU_MAKE" >&6; } ; if test "x$ac_cv_GNU_MAKE" = "xNot Found" ; then - { { echo "$as_me:$LINENO: error: *** Please install GNU make. It is required to build Asterisk!" >&5 -echo "$as_me: error: *** Please install GNU make. It is required to build Asterisk!" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "*** Please install GNU make. It is required to build Asterisk!" "$LINENO" 5 exit 1 fi GNU_MAKE=$ac_cv_GNU_MAKE +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + if test -n "$ac_tool_prefix"; then for ac_prog in strip gstrip do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -6737,25 +6724,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6768,10 +6755,10 @@ if test -z "$STRIP"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -6781,25 +6768,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6811,12 +6798,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -6828,10 +6811,10 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. @@ -6841,25 +6824,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6872,10 +6855,10 @@ if test -z "$AR"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. @@ -6885,25 +6868,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6915,12 +6898,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -6932,10 +6911,10 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_SHA1SUM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_SHA1SUM+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$SHA1SUM"; then ac_cv_prog_SHA1SUM="$SHA1SUM" # Let the user override the test. @@ -6945,25 +6924,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_SHA1SUM="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi SHA1SUM=$ac_cv_prog_SHA1SUM if test -n "$SHA1SUM"; then - { echo "$as_me:$LINENO: result: $SHA1SUM" >&5 -echo "${ECHO_T}$SHA1SUM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHA1SUM" >&5 +$as_echo "$SHA1SUM" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6976,10 +6955,10 @@ if test -z "$SHA1SUM"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_SHA1SUM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_SHA1SUM+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_SHA1SUM"; then ac_cv_prog_ac_ct_SHA1SUM="$ac_ct_SHA1SUM" # Let the user override the test. @@ -6989,25 +6968,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_SHA1SUM="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_SHA1SUM=$ac_cv_prog_ac_ct_SHA1SUM if test -n "$ac_ct_SHA1SUM"; then - { echo "$as_me:$LINENO: result: $ac_ct_SHA1SUM" >&5 -echo "${ECHO_T}$ac_ct_SHA1SUM" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SHA1SUM" >&5 +$as_echo "$ac_ct_SHA1SUM" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7019,12 +6998,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac SHA1SUM=$ac_ct_SHA1SUM @@ -7040,10 +7015,10 @@ fi # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_BISON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_BISON+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $BISON in [\\/]* | ?:[\\/]*) @@ -7055,14 +7030,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_BISON" && ac_cv_path_BISON=":" @@ -7071,20 +7046,61 @@ esac fi BISON=$ac_cv_path_BISON if test -n "$BISON"; then - { echo "$as_me:$LINENO: result: $BISON" >&5 -echo "${ECHO_T}$BISON" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 +$as_echo "$BISON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "cmp", so it can be a program name with args. +set dummy cmp; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CMP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $CMP in + [\\/]* | ?:[\\/]*) + ac_cv_path_CMP="$CMP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_CMP" && ac_cv_path_CMP=":" + ;; +esac +fi +CMP=$ac_cv_path_CMP +if test -n "$CMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5 +$as_echo "$CMP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_FLEX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_FLEX+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $FLEX in [\\/]* | ?:[\\/]*) @@ -7096,14 +7112,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_FLEX" && ac_cv_path_FLEX=":" @@ -7112,20 +7128,20 @@ esac fi FLEX=$ac_cv_path_FLEX if test -n "$FLEX"; then - { echo "$as_me:$LINENO: result: $FLEX" >&5 -echo "${ECHO_T}$FLEX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 +$as_echo "$FLEX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "grep", so it can be a program name with args. set dummy grep; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $GREP in [\\/]* | ?:[\\/]*) @@ -7137,14 +7153,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GREP" && ac_cv_path_GREP=":" @@ -7153,20 +7169,20 @@ esac fi GREP=$ac_cv_path_GREP if test -n "$GREP"; then - { echo "$as_me:$LINENO: result: $GREP" >&5 -echo "${ECHO_T}$GREP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5 +$as_echo "$GREP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "find", so it can be a program name with args. set dummy find; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_FIND+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_FIND+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $FIND in [\\/]* | ?:[\\/]*) @@ -7178,14 +7194,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_FIND" && ac_cv_path_FIND=":" @@ -7194,20 +7210,20 @@ esac fi FIND=$ac_cv_path_FIND if test -n "$FIND"; then - { echo "$as_me:$LINENO: result: $FIND" >&5 -echo "${ECHO_T}$FIND" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5 +$as_echo "$FIND" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "compress", so it can be a program name with args. set dummy compress; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_COMPRESS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_COMPRESS+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $COMPRESS in [\\/]* | ?:[\\/]*) @@ -7219,14 +7235,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_COMPRESS="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_COMPRESS" && ac_cv_path_COMPRESS=":" @@ -7235,20 +7251,20 @@ esac fi COMPRESS=$ac_cv_path_COMPRESS if test -n "$COMPRESS"; then - { echo "$as_me:$LINENO: result: $COMPRESS" >&5 -echo "${ECHO_T}$COMPRESS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPRESS" >&5 +$as_echo "$COMPRESS" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "basename", so it can be a program name with args. set dummy basename; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_BASENAME+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_BASENAME+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $BASENAME in [\\/]* | ?:[\\/]*) @@ -7260,14 +7276,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_BASENAME" && ac_cv_path_BASENAME=":" @@ -7276,20 +7292,20 @@ esac fi BASENAME=$ac_cv_path_BASENAME if test -n "$BASENAME"; then - { echo "$as_me:$LINENO: result: $BASENAME" >&5 -echo "${ECHO_T}$BASENAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5 +$as_echo "$BASENAME" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "dirname", so it can be a program name with args. set dummy dirname; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_DIRNAME+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_DIRNAME+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $DIRNAME in [\\/]* | ?:[\\/]*) @@ -7301,14 +7317,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_DIRNAME" && ac_cv_path_DIRNAME=":" @@ -7317,20 +7333,20 @@ esac fi DIRNAME=$ac_cv_path_DIRNAME if test -n "$DIRNAME"; then - { echo "$as_me:$LINENO: result: $DIRNAME" >&5 -echo "${ECHO_T}$DIRNAME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5 +$as_echo "$DIRNAME" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "sh", so it can be a program name with args. set dummy sh; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_SHELL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_SHELL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $SHELL in [\\/]* | ?:[\\/]*) @@ -7342,14 +7358,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SHELL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_SHELL" && ac_cv_path_SHELL=":" @@ -7358,20 +7374,20 @@ esac fi SHELL=$ac_cv_path_SHELL if test -n "$SHELL"; then - { echo "$as_me:$LINENO: result: $SHELL" >&5 -echo "${ECHO_T}$SHELL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELL" >&5 +$as_echo "$SHELL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "ln", so it can be a program name with args. set dummy ln; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_LN+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $LN in [\\/]* | ?:[\\/]*) @@ -7383,14 +7399,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_LN" && ac_cv_path_LN=":" @@ -7399,20 +7415,20 @@ esac fi LN=$ac_cv_path_LN if test -n "$LN"; then - { echo "$as_me:$LINENO: result: $LN" >&5 -echo "${ECHO_T}$LN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5 +$as_echo "$LN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "dot", so it can be a program name with args. set dummy dot; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_DOT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_DOT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $DOT in [\\/]* | ?:[\\/]*) @@ -7424,14 +7440,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_DOT" && ac_cv_path_DOT=":" @@ -7440,20 +7456,20 @@ esac fi DOT=$ac_cv_path_DOT if test -n "$DOT"; then - { echo "$as_me:$LINENO: result: $DOT" >&5 -echo "${ECHO_T}$DOT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 +$as_echo "$DOT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "wget", so it can be a program name with args. set dummy wget; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_WGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_WGET+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $WGET in [\\/]* | ?:[\\/]*) @@ -7465,14 +7481,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_WGET" && ac_cv_path_WGET=":" @@ -7481,20 +7497,20 @@ esac fi WGET=$ac_cv_path_WGET if test -n "$WGET"; then - { echo "$as_me:$LINENO: result: $WGET" >&5 -echo "${ECHO_T}$WGET" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5 +$as_echo "$WGET" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "curl", so it can be a program name with args. set dummy curl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CURL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CURL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $CURL in [\\/]* | ?:[\\/]*) @@ -7506,14 +7522,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CURL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_CURL" && ac_cv_path_CURL=":" @@ -7522,20 +7538,20 @@ esac fi CURL=$ac_cv_path_CURL if test -n "$CURL"; then - { echo "$as_me:$LINENO: result: $CURL" >&5 -echo "${ECHO_T}$CURL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL" >&5 +$as_echo "$CURL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "rubber", so it can be a program name with args. set dummy rubber; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_RUBBER+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_RUBBER+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $RUBBER in [\\/]* | ?:[\\/]*) @@ -7547,14 +7563,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RUBBER="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_RUBBER" && ac_cv_path_RUBBER=":" @@ -7563,20 +7579,20 @@ esac fi RUBBER=$ac_cv_path_RUBBER if test -n "$RUBBER"; then - { echo "$as_me:$LINENO: result: $RUBBER" >&5 -echo "${ECHO_T}$RUBBER" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBBER" >&5 +$as_echo "$RUBBER" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "catdvi", so it can be a program name with args. set dummy catdvi; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CATDVI+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CATDVI+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $CATDVI in [\\/]* | ?:[\\/]*) @@ -7588,14 +7604,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CATDVI="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_CATDVI" && ac_cv_path_CATDVI=":" @@ -7604,20 +7620,20 @@ esac fi CATDVI=$ac_cv_path_CATDVI if test -n "$CATDVI"; then - { echo "$as_me:$LINENO: result: $CATDVI" >&5 -echo "${ECHO_T}$CATDVI" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CATDVI" >&5 +$as_echo "$CATDVI" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "kpsewhich", so it can be a program name with args. set dummy kpsewhich; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_KPATHSEA+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_KPATHSEA+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $KPATHSEA in [\\/]* | ?:[\\/]*) @@ -7629,14 +7645,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_KPATHSEA="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_KPATHSEA" && ac_cv_path_KPATHSEA=":" @@ -7645,20 +7661,20 @@ esac fi KPATHSEA=$ac_cv_path_KPATHSEA if test -n "$KPATHSEA"; then - { echo "$as_me:$LINENO: result: $KPATHSEA" >&5 -echo "${ECHO_T}$KPATHSEA" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KPATHSEA" >&5 +$as_echo "$KPATHSEA" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "xmlstarlet", so it can be a program name with args. set dummy xmlstarlet; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XMLSTARLET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XMLSTARLET+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $XMLSTARLET in [\\/]* | ?:[\\/]*) @@ -7670,14 +7686,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XMLSTARLET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_XMLSTARLET" && ac_cv_path_XMLSTARLET=":" @@ -7686,11 +7702,11 @@ esac fi XMLSTARLET=$ac_cv_path_XMLSTARLET if test -n "$XMLSTARLET"; then - { echo "$as_me:$LINENO: result: $XMLSTARLET" >&5 -echo "${ECHO_T}$XMLSTARLET" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLSTARLET" >&5 +$as_echo "$XMLSTARLET" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7701,10 +7717,10 @@ else if test "${CURL}" != ":" ; then else # Extract the first word of "fetch", so it can be a program name with args. set dummy fetch; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_FETCH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_FETCH+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $FETCH in [\\/]* | ?:[\\/]*) @@ -7716,14 +7732,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FETCH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_FETCH" && ac_cv_path_FETCH=":" @@ -7732,11 +7748,11 @@ esac fi FETCH=$ac_cv_path_FETCH if test -n "$FETCH"; then - { echo "$as_me:$LINENO: result: $FETCH" >&5 -echo "${ECHO_T}$FETCH" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FETCH" >&5 +$as_echo "$FETCH" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7745,10 +7761,10 @@ fi fi -{ echo "$as_me:$LINENO: checking for bison that supports parse-param" >&5 -echo $ECHO_N "checking for bison that supports parse-param... $ECHO_C" >&6; } -if test "${ac_cv_path_BISON2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison that supports parse-param" >&5 +$as_echo_n "checking for bison that supports parse-param... " >&6; } +if test "${ac_cv_path_BISON2+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$BISON" != "x:" ; then @@ -7780,8 +7796,8 @@ __EOL__ fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_BISON2" >&5 -echo "${ECHO_T}$ac_cv_path_BISON2" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_BISON2" >&5 +$as_echo "$ac_cv_path_BISON2" >&6; } if test "x${ac_cv_path_BISON2}" = "x" ; then BISON=: PBX_BISON=0 @@ -7799,10 +7815,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}soxmix", so it can be a program name with args. set dummy ${ac_tool_prefix}soxmix; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_SOXMIX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_SOXMIX+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$SOXMIX"; then ac_cv_prog_SOXMIX="$SOXMIX" # Let the user override the test. @@ -7812,25 +7828,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_SOXMIX="${ac_tool_prefix}soxmix" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi SOXMIX=$ac_cv_prog_SOXMIX if test -n "$SOXMIX"; then - { echo "$as_me:$LINENO: result: $SOXMIX" >&5 -echo "${ECHO_T}$SOXMIX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOXMIX" >&5 +$as_echo "$SOXMIX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7839,10 +7855,10 @@ if test -z "$ac_cv_prog_SOXMIX"; then ac_ct_SOXMIX=$SOXMIX # Extract the first word of "soxmix", so it can be a program name with args. set dummy soxmix; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_SOXMIX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_SOXMIX+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_SOXMIX"; then ac_cv_prog_ac_ct_SOXMIX="$ac_ct_SOXMIX" # Let the user override the test. @@ -7852,25 +7868,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_SOXMIX="soxmix" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_SOXMIX=$ac_cv_prog_ac_ct_SOXMIX if test -n "$ac_ct_SOXMIX"; then - { echo "$as_me:$LINENO: result: $ac_ct_SOXMIX" >&5 -echo "${ECHO_T}$ac_ct_SOXMIX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SOXMIX" >&5 +$as_echo "$ac_ct_SOXMIX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_SOXMIX" = x; then @@ -7878,12 +7894,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac SOXMIX=$ac_ct_SOXMIX @@ -7894,9 +7906,7 @@ fi if test "${SOXMIX}" != ":" ; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_SOXMIX 1 -_ACEOF +$as_echo "#define HAVE_SOXMIX 1" >>confdefs.h fi @@ -7904,10 +7914,10 @@ for ac_prog in md5 md5sum gmd5sum digest do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_MD5+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_MD5+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$MD5"; then ac_cv_prog_MD5="$MD5" # Let the user override the test. @@ -7917,25 +7927,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MD5="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi MD5=$ac_cv_prog_MD5 if test -n "$MD5"; then - { echo "$as_me:$LINENO: result: $MD5" >&5 -echo "${ECHO_T}$MD5" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MD5" >&5 +$as_echo "$MD5" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7970,13 +7980,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" - { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7994,36 +8000,13 @@ return pthread_join (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } if test x"$acx_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" @@ -8084,23 +8067,23 @@ for flag in $acx_pthread_flags; do case $flag in none) - { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 -echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } ;; -*) - { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 -echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; pthread-config) # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$acx_pthread_config"; then ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. @@ -8110,14 +8093,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_acx_pthread_config="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" @@ -8125,11 +8108,11 @@ fi fi acx_pthread_config=$ac_cv_prog_acx_pthread_config if test -n "$acx_pthread_config"; then - { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5 -echo "${ECHO_T}$acx_pthread_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 +$as_echo "$acx_pthread_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8139,8 +8122,8 @@ fi ;; *) - { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 -echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } PTHREAD_LIBS="-l$flag" ;; esac @@ -8159,11 +8142,7 @@ echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; } # pthread_cleanup_push because it is one of the few pthread # functions on Solaris that doesn't have a non-functional libc stub. # We try pthread_create on general principles. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -8176,40 +8155,17 @@ pthread_t th; pthread_join(th, 0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : acx_pthread_ok=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } if test "x$acx_pthread_ok" = xyes; then break; fi @@ -8227,15 +8183,11 @@ if test "x$acx_pthread_ok" = xyes; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 -echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } attr_name=unknown for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -8246,37 +8198,14 @@ int attr=$attr; return attr; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : attr_name=$attr; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done - { echo "$as_me:$LINENO: result: $attr_name" >&5 -echo "${ECHO_T}$attr_name" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +$as_echo "$attr_name" >&6; } if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then cat >>confdefs.h <<_ACEOF @@ -8285,15 +8214,15 @@ _ACEOF fi - { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 -echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; esac - { echo "$as_me:$LINENO: result: ${flag}" >&5 -echo "${ECHO_T}${flag}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi @@ -8307,10 +8236,10 @@ echo "${ECHO_T}${flag}" >&6; } do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. @@ -8320,25 +8249,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_PTHREAD_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 -echo "${ECHO_T}$PTHREAD_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8360,9 +8289,7 @@ fi # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x"$acx_pthread_ok" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD 1 -_ACEOF +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h : else @@ -8385,13 +8312,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Check whether --enable-dev-mode was given. -if test "${enable_dev_mode+set}" = set; then +if test "${enable_dev_mode+set}" = set; then : enableval=$enable_dev_mode; case "${enableval}" in y|ye|yes) AST_DEVMODE=yes ;; n|no) AST_DEVMODE=no ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-dev-mode" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-dev-mode" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-dev-mode" "$LINENO" 5 ;; esac fi @@ -8413,7 +8338,7 @@ fi PBX_ALSA=0 # Check whether --with-asound was given. -if test "${with_asound+set}" = set; then +if test "${with_asound+set}" = set; then : withval=$with_asound; case ${withval} in n|no) @@ -8440,13 +8365,12 @@ fi - FFMPEG_DESCRIP="Ffmpeg and avcodec" FFMPEG_OPTION="avcodec" PBX_FFMPEG=0 # Check whether --with-avcodec was given. -if test "${with_avcodec+set}" = set; then +if test "${with_avcodec+set}" = set; then : withval=$with_avcodec; case ${withval} in n|no) @@ -8473,13 +8397,12 @@ fi - CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" PBX_CAP=0 # Check whether --with-cap was given. -if test "${with_cap+set}" = set; then +if test "${with_cap+set}" = set; then : withval=$with_cap; case ${withval} in n|no) @@ -8506,13 +8429,12 @@ fi - CURSES_DESCRIP="curses" CURSES_OPTION="curses" PBX_CURSES=0 # Check whether --with-curses was given. -if test "${with_curses+set}" = set; then +if test "${with_curses+set}" = set; then : withval=$with_curses; case ${withval} in n|no) @@ -8539,13 +8461,12 @@ fi - CRYPTO_DESCRIP="OpenSSL Cryptography" CRYPTO_OPTION="crypto" PBX_CRYPTO=0 # Check whether --with-crypto was given. -if test "${with_crypto+set}" = set; then +if test "${with_crypto+set}" = set; then : withval=$with_crypto; case ${withval} in n|no) @@ -8572,13 +8493,12 @@ fi - DAHDI_DESCRIP="DAHDI" DAHDI_OPTION="dahdi" PBX_DAHDI=0 # Check whether --with-dahdi was given. -if test "${with_dahdi+set}" = set; then +if test "${with_dahdi+set}" = set; then : withval=$with_dahdi; case ${withval} in n|no) @@ -8605,7 +8525,6 @@ fi - # BKTR is used for backtrace support on platforms that do not # have it natively. @@ -8614,7 +8533,7 @@ fi PBX_BKTR=0 # Check whether --with-execinfo was given. -if test "${with_execinfo+set}" = set; then +if test "${with_execinfo+set}" = set; then : withval=$with_execinfo; case ${withval} in n|no) @@ -8641,13 +8560,12 @@ fi - GSM_DESCRIP="External GSM" GSM_OPTION="gsm" PBX_GSM=0 # Check whether --with-gsm was given. -if test "${with_gsm+set}" = set; then +if test "${with_gsm+set}" = set; then : withval=$with_gsm; case ${withval} in n|no) @@ -8674,13 +8592,12 @@ fi - GTK_DESCRIP="gtk" GTK_OPTION="gtk" PBX_GTK=0 # Check whether --with-gtk was given. -if test "${with_gtk+set}" = set; then +if test "${with_gtk+set}" = set; then : withval=$with_gtk; case ${withval} in n|no) @@ -8707,13 +8624,12 @@ fi - GTK2_DESCRIP="gtk2" GTK2_OPTION="gtk2" PBX_GTK2=0 # Check whether --with-gtk2 was given. -if test "${with_gtk2+set}" = set; then +if test "${with_gtk2+set}" = set; then : withval=$with_gtk2; case ${withval} in n|no) @@ -8740,13 +8656,12 @@ fi - GMIME_DESCRIP="GMime" GMIME_OPTION="gmime" PBX_GMIME=0 # Check whether --with-gmime was given. -if test "${with_gmime+set}" = set; then +if test "${with_gmime+set}" = set; then : withval=$with_gmime; case ${withval} in n|no) @@ -8773,13 +8688,12 @@ fi - OPENH323_DESCRIP="OpenH323" OPENH323_OPTION="h323" PBX_OPENH323=0 # Check whether --with-h323 was given. -if test "${with_h323+set}" = set; then +if test "${with_h323+set}" = set; then : withval=$with_h323; case ${withval} in n|no) @@ -8806,13 +8720,12 @@ fi - HOARD_DESCRIP="Hoard Memory Allocator" HOARD_OPTION="hoard" PBX_HOARD=0 # Check whether --with-hoard was given. -if test "${with_hoard+set}" = set; then +if test "${with_hoard+set}" = set; then : withval=$with_hoard; case ${withval} in n|no) @@ -8839,13 +8752,12 @@ fi - ICONV_DESCRIP="Iconv" ICONV_OPTION="iconv" PBX_ICONV=0 # Check whether --with-iconv was given. -if test "${with_iconv+set}" = set; then +if test "${with_iconv+set}" = set; then : withval=$with_iconv; case ${withval} in n|no) @@ -8872,13 +8784,12 @@ fi - IKSEMEL_DESCRIP="Iksemel Jabber" IKSEMEL_OPTION="iksemel" PBX_IKSEMEL=0 # Check whether --with-iksemel was given. -if test "${with_iksemel+set}" = set; then +if test "${with_iksemel+set}" = set; then : withval=$with_iksemel; case ${withval} in n|no) @@ -8905,13 +8816,12 @@ fi - IMAP_TK_DESCRIP="UW IMAP Toolkit" IMAP_TK_OPTION="imap" PBX_IMAP_TK=0 # Check whether --with-imap was given. -if test "${with_imap+set}" = set; then +if test "${with_imap+set}" = set; then : withval=$with_imap; case ${withval} in n|no) @@ -8938,13 +8848,12 @@ fi - INOTIFY_DESCRIP="inotify support" INOTIFY_OPTION="inotify" PBX_INOTIFY=0 # Check whether --with-inotify was given. -if test "${with_inotify+set}" = set; then +if test "${with_inotify+set}" = set; then : withval=$with_inotify; case ${withval} in n|no) @@ -8971,13 +8880,12 @@ fi - IODBC_DESCRIP="iODBC" IODBC_OPTION="iodbc" PBX_IODBC=0 # Check whether --with-iodbc was given. -if test "${with_iodbc+set}" = set; then +if test "${with_iodbc+set}" = set; then : withval=$with_iodbc; case ${withval} in n|no) @@ -9004,13 +8912,12 @@ fi - ISDNNET_DESCRIP="ISDN4Linux" ISDNNET_OPTION="isdnnet" PBX_ISDNNET=0 # Check whether --with-isdnnet was given. -if test "${with_isdnnet+set}" = set; then +if test "${with_isdnnet+set}" = set; then : withval=$with_isdnnet; case ${withval} in n|no) @@ -9037,13 +8944,12 @@ fi - JACK_DESCRIP="Jack Audio Connection Kit" JACK_OPTION="jack" PBX_JACK=0 # Check whether --with-jack was given. -if test "${with_jack+set}" = set; then +if test "${with_jack+set}" = set; then : withval=$with_jack; case ${withval} in n|no) @@ -9070,13 +8976,12 @@ fi - LDAP_DESCRIP="OpenLDAP" LDAP_OPTION="ldap" PBX_LDAP=0 # Check whether --with-ldap was given. -if test "${with_ldap+set}" = set; then +if test "${with_ldap+set}" = set; then : withval=$with_ldap; case ${withval} in n|no) @@ -9124,26 +9029,8 @@ fi - - - - - - - - - - - - - - - - - - # Check whether --with-libcurl was given. -if test "${with_libcurl+set}" = set; then +if test "${with_libcurl+set}" = set; then : withval=$with_libcurl; _libcurl_with=$withval else _libcurl_with=yes @@ -9156,10 +9043,10 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -9169,25 +9056,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9204,10 +9091,10 @@ done _libcurl_ldflags="-L$withval/lib" # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path__libcurl_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path__libcurl_config+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $_libcurl_config in [\\/]* | ?:[\\/]*) @@ -9219,14 +9106,14 @@ for as_dir in "$withval/bin" do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path__libcurl_config" && ac_cv_path__libcurl_config=""$withval/bin"" @@ -9235,21 +9122,21 @@ esac fi _libcurl_config=$ac_cv_path__libcurl_config if test -n "$_libcurl_config"; then - { echo "$as_me:$LINENO: result: $_libcurl_config" >&5 -echo "${ECHO_T}$_libcurl_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 +$as_echo "$_libcurl_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path__libcurl_config+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path__libcurl_config+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $_libcurl_config in [\\/]* | ?:[\\/]*) @@ -9261,14 +9148,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -9276,35 +9163,35 @@ esac fi _libcurl_config=$ac_cv_path__libcurl_config if test -n "$_libcurl_config"; then - { echo "$as_me:$LINENO: result: $_libcurl_config" >&5 -echo "${ECHO_T}$_libcurl_config" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5 +$as_echo "$_libcurl_config" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test x$_libcurl_config != "x" ; then - { echo "$as_me:$LINENO: checking for the version of libcurl" >&5 -echo $ECHO_N "checking for the version of libcurl... $ECHO_C" >&6; } -if test "${libcurl_cv_lib_curl_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of libcurl" >&5 +$as_echo_n "checking for the version of libcurl... " >&6; } +if test "${libcurl_cv_lib_curl_version+set}" = set; then : + $as_echo_n "(cached) " >&6 else libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'` fi -{ echo "$as_me:$LINENO: result: $libcurl_cv_lib_curl_version" >&5 -echo "${ECHO_T}$libcurl_cv_lib_curl_version" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5 +$as_echo "$libcurl_cv_lib_curl_version" >&6; } _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` _libcurl_wanted=`echo 7.10.1 | $_libcurl_version_parse` if test $_libcurl_wanted -gt 0 ; then - { echo "$as_me:$LINENO: checking for libcurl >= version 7.10.1" >&5 -echo $ECHO_N "checking for libcurl >= version 7.10.1... $ECHO_C" >&6; } -if test "${libcurl_cv_lib_version_ok+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.10.1" >&5 +$as_echo_n "checking for libcurl >= version 7.10.1... " >&6; } +if test "${libcurl_cv_lib_version_ok+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test $_libcurl_version -ge $_libcurl_wanted ; then @@ -9314,8 +9201,8 @@ else fi fi -{ echo "$as_me:$LINENO: result: $libcurl_cv_lib_version_ok" >&5 -echo "${ECHO_T}$libcurl_cv_lib_version_ok" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5 +$as_echo "$libcurl_cv_lib_version_ok" >&6; } fi if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then @@ -9355,10 +9242,10 @@ echo "${ECHO_T}$libcurl_cv_lib_version_ok" >&6; } # link line (or failing that, "-lcurl") is enough. CURL_LIB=${CURL_LIB-"$_libcurl_ldflags -lcurl"} - { echo "$as_me:$LINENO: checking whether libcurl is usable" >&5 -echo $ECHO_N "checking whether libcurl is usable... $ECHO_C" >&6; } -if test "${libcurl_cv_lib_curl_usable+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libcurl is usable" >&5 +$as_echo_n "checking whether libcurl is usable... " >&6; } +if test "${libcurl_cv_lib_curl_usable+set}" = set; then : + $as_echo_n "(cached) " >&6 else _libcurl_save_cppflags=$CPPFLAGS @@ -9366,11 +9253,7 @@ else _libcurl_save_libs=$LIBS LIBS="$CURL_LIB $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <curl/curl.h> int @@ -9392,34 +9275,13 @@ x=CURLOPT_VERBOSE; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : libcurl_cv_lib_curl_usable=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - libcurl_cv_lib_curl_usable=no + libcurl_cv_lib_curl_usable=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS=$_libcurl_save_cppflags LIBS=$_libcurl_save_libs @@ -9427,8 +9289,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ unset _libcurl_save_libs fi -{ echo "$as_me:$LINENO: result: $libcurl_cv_lib_curl_usable" >&5 -echo "${ECHO_T}$libcurl_cv_lib_curl_usable" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5 +$as_echo "$libcurl_cv_lib_curl_usable" >&6; } if test $libcurl_cv_lib_curl_usable = yes ; then @@ -9440,94 +9302,12 @@ echo "${ECHO_T}$libcurl_cv_lib_curl_usable" >&6; } _libcurl_save_libs=$LIBS LIBS="$LIBS $CURL_LIB" - { echo "$as_me:$LINENO: checking for curl_free" >&5 -echo $ECHO_N "checking for curl_free... $ECHO_C" >&6; } -if test "${ac_cv_func_curl_free+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define curl_free to an innocuous variant, in case <limits.h> declares curl_free. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define curl_free innocuous_curl_free + ac_fn_c_check_func "$LINENO" "curl_free" "ac_cv_func_curl_free" +if test "x$ac_cv_func_curl_free" = x""yes; then : -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char curl_free (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef curl_free - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char curl_free (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_curl_free || defined __stub___curl_free -choke me -#endif - -int -main () -{ -return curl_free (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_curl_free=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_curl_free=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_curl_free" >&5 -echo "${ECHO_T}$ac_cv_func_curl_free" >&6; } -if test $ac_cv_func_curl_free = yes; then - : else -cat >>confdefs.h <<\_ACEOF -#define curl_free free -_ACEOF +$as_echo "#define curl_free free" >>confdefs.h fi @@ -9538,9 +9318,7 @@ fi unset _libcurl_save_libs -cat >>confdefs.h <<\_ACEOF -#define HAVE_CURL 1 -_ACEOF +$as_echo "#define HAVE_CURL 1" >>confdefs.h @@ -9548,10 +9326,10 @@ _ACEOF for _libcurl_feature in $_libcurl_features ; do cat >>confdefs.h <<_ACEOF -#define `echo "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1 +#define `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1 _ACEOF - eval `echo "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes + eval `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes done if test "x$_libcurl_protocols" = "x" ; then @@ -9573,10 +9351,10 @@ _ACEOF for _libcurl_protocol in $_libcurl_protocols ; do cat >>confdefs.h <<_ACEOF -#define `echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1 +#define `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1 _ACEOF - eval `echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes + eval `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes done else unset CURL_LIB @@ -9612,7 +9390,7 @@ _ACEOF PBX_LIBXML2=0 # Check whether --with-libxml2 was given. -if test "${with_libxml2+set}" = set; then +if test "${with_libxml2+set}" = set; then : withval=$with_libxml2; case ${withval} in n|no) @@ -9639,13 +9417,12 @@ fi - LTDL_DESCRIP="libtool" LTDL_OPTION="ltdl" PBX_LTDL=0 # Check whether --with-ltdl was given. -if test "${with_ltdl+set}" = set; then +if test "${with_ltdl+set}" = set; then : withval=$with_ltdl; case ${withval} in n|no) @@ -9672,13 +9449,12 @@ fi - LUA_DESCRIP="Lua" LUA_OPTION="lua" PBX_LUA=0 # Check whether --with-lua was given. -if test "${with_lua+set}" = set; then +if test "${with_lua+set}" = set; then : withval=$with_lua; case ${withval} in n|no) @@ -9705,13 +9481,12 @@ fi - MISDN_DESCRIP="mISDN user" MISDN_OPTION="misdn" PBX_MISDN=0 # Check whether --with-misdn was given. -if test "${with_misdn+set}" = set; then +if test "${with_misdn+set}" = set; then : withval=$with_misdn; case ${withval} in n|no) @@ -9738,13 +9513,12 @@ fi - NBS_DESCRIP="Network Broadcast Sound" NBS_OPTION="nbs" PBX_NBS=0 # Check whether --with-nbs was given. -if test "${with_nbs+set}" = set; then +if test "${with_nbs+set}" = set; then : withval=$with_nbs; case ${withval} in n|no) @@ -9771,13 +9545,12 @@ fi - NCURSES_DESCRIP="ncurses" NCURSES_OPTION="ncurses" PBX_NCURSES=0 # Check whether --with-ncurses was given. -if test "${with_ncurses+set}" = set; then +if test "${with_ncurses+set}" = set; then : withval=$with_ncurses; case ${withval} in n|no) @@ -9804,13 +9577,12 @@ fi - NETSNMP_DESCRIP="Net-SNMP" NETSNMP_OPTION="netsnmp" PBX_NETSNMP=0 # Check whether --with-netsnmp was given. -if test "${with_netsnmp+set}" = set; then +if test "${with_netsnmp+set}" = set; then : withval=$with_netsnmp; case ${withval} in n|no) @@ -9837,13 +9609,12 @@ fi - NEWT_DESCRIP="newt" NEWT_OPTION="newt" PBX_NEWT=0 # Check whether --with-newt was given. -if test "${with_newt+set}" = set; then +if test "${with_newt+set}" = set; then : withval=$with_newt; case ${withval} in n|no) @@ -9870,13 +9641,12 @@ fi - OGG_DESCRIP="OGG" OGG_OPTION="ogg" PBX_OGG=0 # Check whether --with-ogg was given. -if test "${with_ogg+set}" = set; then +if test "${with_ogg+set}" = set; then : withval=$with_ogg; case ${withval} in n|no) @@ -9903,13 +9673,12 @@ fi - OPENAIS_DESCRIP="OpenAIS" OPENAIS_OPTION="openais" PBX_OPENAIS=0 # Check whether --with-openais was given. -if test "${with_openais+set}" = set; then +if test "${with_openais+set}" = set; then : withval=$with_openais; case ${withval} in n|no) @@ -9936,13 +9705,12 @@ fi - OPENR2_DESCRIP="MFR2" OPENR2_OPTION="openr2" PBX_OPENR2=0 # Check whether --with-openr2 was given. -if test "${with_openr2+set}" = set; then +if test "${with_openr2+set}" = set; then : withval=$with_openr2; case ${withval} in n|no) @@ -9969,13 +9737,12 @@ fi - OSPTK_DESCRIP="OSP Toolkit" OSPTK_OPTION="osptk" PBX_OSPTK=0 # Check whether --with-osptk was given. -if test "${with_osptk+set}" = set; then +if test "${with_osptk+set}" = set; then : withval=$with_osptk; case ${withval} in n|no) @@ -10002,13 +9769,12 @@ fi - OSS_DESCRIP="Open Sound System" OSS_OPTION="oss" PBX_OSS=0 # Check whether --with-oss was given. -if test "${with_oss+set}" = set; then +if test "${with_oss+set}" = set; then : withval=$with_oss; case ${withval} in n|no) @@ -10035,13 +9801,12 @@ fi - PGSQL_DESCRIP="PostgreSQL" PGSQL_OPTION="postgres" PBX_PGSQL=0 # Check whether --with-postgres was given. -if test "${with_postgres+set}" = set; then +if test "${with_postgres+set}" = set; then : withval=$with_postgres; case ${withval} in n|no) @@ -10068,13 +9833,12 @@ fi - POPT_DESCRIP="popt" POPT_OPTION="popt" PBX_POPT=0 # Check whether --with-popt was given. -if test "${with_popt+set}" = set; then +if test "${with_popt+set}" = set; then : withval=$with_popt; case ${withval} in n|no) @@ -10101,13 +9865,12 @@ fi - PORTAUDIO_DESCRIP="PortAudio" PORTAUDIO_OPTION="portaudio" PBX_PORTAUDIO=0 # Check whether --with-portaudio was given. -if test "${with_portaudio+set}" = set; then +if test "${with_portaudio+set}" = set; then : withval=$with_portaudio; case ${withval} in n|no) @@ -10134,13 +9897,12 @@ fi - PRI_DESCRIP="ISDN PRI" PRI_OPTION="pri" PBX_PRI=0 # Check whether --with-pri was given. -if test "${with_pri+set}" = set; then +if test "${with_pri+set}" = set; then : withval=$with_pri; case ${withval} in n|no) @@ -10167,7 +9929,6 @@ fi - PRI_INBANDDISCONNECT_DESCRIP="ISDN PRI set_inbanddisconnect" PRI_INBANDDISCONNECT_OPTION=pri @@ -10177,6 +9938,7 @@ for i in ${ac_mandatory_list}; do break fi done +PRI_INBANDDISCONNECT_DIR=${PRI_DIR} PBX_PRI_INBANDDISCONNECT=0 @@ -10186,13 +9948,12 @@ PBX_PRI_INBANDDISCONNECT=0 - PWLIB_DESCRIP="PWlib" PWLIB_OPTION="pwlib" PBX_PWLIB=0 # Check whether --with-pwlib was given. -if test "${with_pwlib+set}" = set; then +if test "${with_pwlib+set}" = set; then : withval=$with_pwlib; case ${withval} in n|no) @@ -10219,13 +9980,12 @@ fi - RADIUS_DESCRIP="Radius Client" RADIUS_OPTION="radius" PBX_RADIUS=0 # Check whether --with-radius was given. -if test "${with_radius+set}" = set; then +if test "${with_radius+set}" = set; then : withval=$with_radius; case ${withval} in n|no) @@ -10252,13 +10012,12 @@ fi - RESAMPLE_DESCRIP="LIBRESAMPLE" RESAMPLE_OPTION="resample" PBX_RESAMPLE=0 # Check whether --with-resample was given. -if test "${with_resample+set}" = set; then +if test "${with_resample+set}" = set; then : withval=$with_resample; case ${withval} in n|no) @@ -10285,13 +10044,12 @@ fi - SDL_DESCRIP="Sdl" SDL_OPTION="sdl" PBX_SDL=0 # Check whether --with-sdl was given. -if test "${with_sdl+set}" = set; then +if test "${with_sdl+set}" = set; then : withval=$with_sdl; case ${withval} in n|no) @@ -10318,13 +10076,12 @@ fi - SDL_IMAGE_DESCRIP="Sdl Image" SDL_IMAGE_OPTION="SDL_image" PBX_SDL_IMAGE=0 # Check whether --with-SDL_image was given. -if test "${with_SDL_image+set}" = set; then +if test "${with_SDL_image+set}" = set; then : withval=$with_SDL_image; case ${withval} in n|no) @@ -10352,9 +10109,8 @@ fi - # Check whether --with-sounds-cache was given. -if test "${with_sounds_cache+set}" = set; then +if test "${with_sounds_cache+set}" = set; then : withval=$with_sounds_cache; case ${withval} in n|no) @@ -10381,7 +10137,7 @@ fi PBX_SPANDSP=0 # Check whether --with-spandsp was given. -if test "${with_spandsp+set}" = set; then +if test "${with_spandsp+set}" = set; then : withval=$with_spandsp; case ${withval} in n|no) @@ -10408,13 +10164,12 @@ fi - SS7_DESCRIP="ISDN SS7" SS7_OPTION="ss7" PBX_SS7=0 # Check whether --with-ss7 was given. -if test "${with_ss7+set}" = set; then +if test "${with_ss7+set}" = set; then : withval=$with_ss7; case ${withval} in n|no) @@ -10441,13 +10196,12 @@ fi - SPEEX_DESCRIP="Speex" SPEEX_OPTION="speex" PBX_SPEEX=0 # Check whether --with-speex was given. -if test "${with_speex+set}" = set; then +if test "${with_speex+set}" = set; then : withval=$with_speex; case ${withval} in n|no) @@ -10474,13 +10228,12 @@ fi - SPEEX_PREPROCESS_DESCRIP="Speex preprocess routines" SPEEX_PREPROCESS_OPTION="speex" PBX_SPEEX_PREPROCESS=0 # Check whether --with-speex was given. -if test "${with_speex+set}" = set; then +if test "${with_speex+set}" = set; then : withval=$with_speex; case ${withval} in n|no) @@ -10507,13 +10260,12 @@ fi - SPEEXDSP_DESCRIP="SpeexDSP" SPEEXDSP_OPTION="speexdsp" PBX_SPEEXDSP=0 # Check whether --with-speexdsp was given. -if test "${with_speexdsp+set}" = set; then +if test "${with_speexdsp+set}" = set; then : withval=$with_speexdsp; case ${withval} in n|no) @@ -10540,7 +10292,6 @@ fi - SPEEX_PREPROCESS_DESCRIP="speex_preprocess_ctl" SPEEX_PREPROCESS_OPTION=speex @@ -10552,13 +10303,12 @@ PBX_SPEEX_PREPROCESS=0 - SQLITE_DESCRIP="SQLite" SQLITE_OPTION="sqlite" PBX_SQLITE=0 # Check whether --with-sqlite was given. -if test "${with_sqlite+set}" = set; then +if test "${with_sqlite+set}" = set; then : withval=$with_sqlite; case ${withval} in n|no) @@ -10585,13 +10335,12 @@ fi - SQLITE3_DESCRIP="SQLite" SQLITE3_OPTION="sqlite3" PBX_SQLITE3=0 # Check whether --with-sqlite3 was given. -if test "${with_sqlite3+set}" = set; then +if test "${with_sqlite3+set}" = set; then : withval=$with_sqlite3; case ${withval} in n|no) @@ -10618,13 +10367,12 @@ fi - OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer" OPENSSL_OPTION="ssl" PBX_OPENSSL=0 # Check whether --with-ssl was given. -if test "${with_ssl+set}" = set; then +if test "${with_ssl+set}" = set; then : withval=$with_ssl; case ${withval} in n|no) @@ -10651,13 +10399,12 @@ fi - SUPPSERV_DESCRIP="mISDN Supplemental Services" SUPPSERV_OPTION="suppserv" PBX_SUPPSERV=0 # Check whether --with-suppserv was given. -if test "${with_suppserv+set}" = set; then +if test "${with_suppserv+set}" = set; then : withval=$with_suppserv; case ${withval} in n|no) @@ -10684,13 +10431,12 @@ fi - FREETDS_DESCRIP="FreeTDS" FREETDS_OPTION="tds" PBX_FREETDS=0 # Check whether --with-tds was given. -if test "${with_tds+set}" = set; then +if test "${with_tds+set}" = set; then : withval=$with_tds; case ${withval} in n|no) @@ -10717,13 +10463,12 @@ fi - TERMCAP_DESCRIP="Termcap" TERMCAP_OPTION="termcap" PBX_TERMCAP=0 # Check whether --with-termcap was given. -if test "${with_termcap+set}" = set; then +if test "${with_termcap+set}" = set; then : withval=$with_termcap; case ${withval} in n|no) @@ -10750,13 +10495,12 @@ fi - TIMERFD_DESCRIP="timerfd" TIMERFD_OPTION="timerfd" PBX_TIMERFD=0 # Check whether --with-timerfd was given. -if test "${with_timerfd+set}" = set; then +if test "${with_timerfd+set}" = set; then : withval=$with_timerfd; case ${withval} in n|no) @@ -10783,13 +10527,12 @@ fi - TINFO_DESCRIP="Term Info" TINFO_OPTION="tinfo" PBX_TINFO=0 # Check whether --with-tinfo was given. -if test "${with_tinfo+set}" = set; then +if test "${with_tinfo+set}" = set; then : withval=$with_tinfo; case ${withval} in n|no) @@ -10816,13 +10559,12 @@ fi - TONEZONE_DESCRIP="tonezone" TONEZONE_OPTION="tonezone" PBX_TONEZONE=0 # Check whether --with-tonezone was given. -if test "${with_tonezone+set}" = set; then +if test "${with_tonezone+set}" = set; then : withval=$with_tonezone; case ${withval} in n|no) @@ -10849,13 +10591,12 @@ fi - UNIXODBC_DESCRIP="unixODBC" UNIXODBC_OPTION="unixodbc" PBX_UNIXODBC=0 # Check whether --with-unixodbc was given. -if test "${with_unixodbc+set}" = set; then +if test "${with_unixodbc+set}" = set; then : withval=$with_unixodbc; case ${withval} in n|no) @@ -10882,13 +10623,12 @@ fi - USB_DESCRIP="usb" USB_OPTION="usb" PBX_USB=0 # Check whether --with-usb was given. -if test "${with_usb+set}" = set; then +if test "${with_usb+set}" = set; then : withval=$with_usb; case ${withval} in n|no) @@ -10915,13 +10655,12 @@ fi - VORBIS_DESCRIP="Vorbis" VORBIS_OPTION="vorbis" PBX_VORBIS=0 # Check whether --with-vorbis was given. -if test "${with_vorbis+set}" = set; then +if test "${with_vorbis+set}" = set; then : withval=$with_vorbis; case ${withval} in n|no) @@ -10948,13 +10687,12 @@ fi - VPB_DESCRIP="Voicetronix API" VPB_OPTION="vpb" PBX_VPB=0 # Check whether --with-vpb was given. -if test "${with_vpb+set}" = set; then +if test "${with_vpb+set}" = set; then : withval=$with_vpb; case ${withval} in n|no) @@ -10981,13 +10719,12 @@ fi - X11_DESCRIP="X11" X11_OPTION="x11" PBX_X11=0 # Check whether --with-x11 was given. -if test "${with_x11+set}" = set; then +if test "${with_x11+set}" = set; then : withval=$with_x11; case ${withval} in n|no) @@ -11014,13 +10751,12 @@ fi - ZLIB_DESCRIP="zlib compression" ZLIB_OPTION="z" PBX_ZLIB=0 # Check whether --with-z was given. -if test "${with_z+set}" = set; then +if test "${with_z+set}" = set; then : withval=$with_z; case ${withval} in n|no) @@ -11047,22 +10783,17 @@ fi - # check for basic system features and functionality before # checking for package libraries # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ echo "$as_me:$LINENO: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if test "${ac_cv_working_alloca_h+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <alloca.h> int @@ -11074,55 +10805,28 @@ char *p = (char *) alloca (2 * sizeof (int)); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_working_alloca_h=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_working_alloca_h=no + ac_cv_working_alloca_h=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA_H 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if test "${ac_cv_func_alloca_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca @@ -11154,43 +10858,20 @@ char *p = (char *) alloca (1); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_alloca_works=no + ac_cv_func_alloca_works=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -11200,21 +10881,15 @@ else ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -cat >>confdefs.h <<\_ACEOF -#define C_ALLOCA 1 -_ACEOF +$as_echo "#define C_ALLOCA 1" >>confdefs.h -{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } -if test "${ac_cv_os_cray+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 +$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } +if test "${ac_cv_os_cray+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined CRAY && ! defined CRAY2 webecray @@ -11224,7 +10899,7 @@ wenotbecray _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then : ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -11232,94 +10907,14 @@ fi rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -11331,19 +10926,15 @@ fi done fi -{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 +$as_echo_n "checking stack direction for C alloca... " >&6; } +if test "${ac_cv_c_stack_direction+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -11366,43 +10957,18 @@ main () return find_stack_direction () < 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_stack_direction=-1 + ac_cv_c_stack_direction=-1 fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction _ACEOF @@ -11410,24 +10976,15 @@ _ACEOF fi - - - - - ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <$ac_hdr> @@ -11441,39 +10998,20 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +eval ac_res=\$$as_ac_Header + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF ac_header_dirent=$ac_hdr; break @@ -11482,17 +11020,13 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - { echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11517,66 +11051,39 @@ for ac_lib in '' dir; do ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_opendir=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then - : +if test "${ac_cv_search_opendir+set}" = set; then : + else ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11601,66 +11108,39 @@ for ac_lib in '' x; do ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_opendir=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then - : +if test "${ac_cv_search_opendir+set}" = set; then : + else ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> @@ -11675,47 +11155,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -11725,18 +11181,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -11746,14 +11198,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> @@ -11780,61 +11228,31 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_wait_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test "${ac_cv_header_sys_wait_h+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/wait.h> @@ -11855,206 +11273,29 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_sys_wait_h=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_sys_wait_h=no + ac_cv_header_sys_wait_h=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +$as_echo "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_WAIT_H 1 -_ACEOF +$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi - - - - - - - - - - - - - - - - - - - - - - - - - for ac_header in arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -12062,146 +11303,14 @@ fi done - - for ac_header in winsock.h winsock2.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -12209,159 +11318,28 @@ fi done -if test "${ac_cv_header_sys_poll_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/poll.h" >&5 -echo $ECHO_N "checking for sys/poll.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_poll_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_poll_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_poll_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/poll.h usability" >&5 -echo $ECHO_N "checking sys/poll.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sys/poll.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_poll_h" = x""yes; then : -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/poll.h presence" >&5 -echo $ECHO_N "checking sys/poll.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/poll.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/poll.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/poll.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/poll.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/poll.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/poll.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/poll.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/poll.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/poll.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/poll.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/poll.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/poll.h" >&5 -echo $ECHO_N "checking for sys/poll.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_poll_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_poll_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_poll_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_poll_h" >&6; } - -fi -if test $ac_cv_header_sys_poll_h = yes; then - : -else - -cat >>confdefs.h <<\_ACEOF -#define AST_POLL_COMPAT 1 -_ACEOF +$as_echo "#define AST_POLL_COMPAT 1" >>confdefs.h fi # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then +if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then @@ -12369,11 +11347,7 @@ else while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -12392,58 +11366,14 @@ main () return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext CC="$CC -n32" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32'; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext break done @@ -12451,23 +11381,19 @@ rm -f core conftest.err conftest.$ac_objext rm -f conftest.$ac_ext fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test "${ac_cv_sys_file_offset_bits+set}" = set; then : + $as_echo_n "(cached) " >&6 else while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -12486,37 +11412,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=no; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include <sys/types.h> @@ -12536,38 +11436,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=64; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) @@ -12576,19 +11454,15 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f conftest* +rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if test "${ac_cv_sys_large_files+set}" = set; then : + $as_echo_n "(cached) " >&6 else while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -12607,37 +11481,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=no; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 #include <sys/types.h> @@ -12657,38 +11505,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=1; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) @@ -12697,22 +11523,18 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f conftest* +rm -rf conftest* fi fi # Checks for typedefs, structures, and compiler characteristics. -{ echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 -echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; } -if test "${ac_cv_header_stdbool_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } +if test "${ac_cv_header_stdbool_h+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdbool.h> @@ -12747,6 +11569,8 @@ cat >>conftest.$ac_ext <<_ACEOF char h[sizeof (_Bool)]; char i[sizeof s.t]; enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ _Bool n[m]; char o[sizeof n == m * sizeof n[0] ? 1 : -1]; char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; @@ -12790,89 +11614,17 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdbool_h=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdbool_h=no + ac_cv_header_stdbool_h=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 -echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; } -{ echo "$as_me:$LINENO: checking for _Bool" >&5 -echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; } -if test "${ac_cv_type__Bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef _Bool ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type__Bool=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type__Bool=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 -echo "${ECHO_T}$ac_cv_type__Bool" >&6; } -if test $ac_cv_type__Bool = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +$as_echo "$ac_cv_header_stdbool_h" >&6; } +ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE__BOOL 1 @@ -12883,22 +11635,16 @@ fi if test $ac_cv_header_stdbool_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_STDBOOL_H 1 -_ACEOF +$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -12958,59 +11704,33 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF +$as_echo "#define const /**/" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +if test "${ac_cv_type_uid_t+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then + $EGREP "uid_t" >/dev/null 2>&1; then : ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no @@ -13018,33 +11738,25 @@ fi rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then -cat >>confdefs.h <<\_ACEOF -#define uid_t int -_ACEOF +$as_echo "#define uid_t int" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF +$as_echo "#define gid_t int" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6; } -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if test "${ac_cv_c_inline+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; @@ -13053,39 +11765,16 @@ $ac_kw foo_t foo () {return 0; } #endif _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_inline=$ac_kw -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6; } - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -13102,61 +11791,9 @@ _ACEOF ;; esac -{ echo "$as_me:$LINENO: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; } -if test "${ac_cv_type_mode_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef mode_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_mode_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_mode_t=no -fi +ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +if test "x$ac_cv_type_mode_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6; } -if test $ac_cv_type_mode_t = yes; then - : else cat >>confdefs.h <<_ACEOF @@ -13165,61 +11802,9 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef off_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_off_t=no -fi +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6; } -if test $ac_cv_type_off_t = yes; then - : else cat >>confdefs.h <<_ACEOF @@ -13228,61 +11813,9 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef pid_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = x""yes; then : - ac_cv_type_pid_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -if test $ac_cv_type_pid_t = yes; then - : else cat >>confdefs.h <<_ACEOF @@ -13291,61 +11824,9 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef size_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_size_t=no -fi +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -if test $ac_cv_type_size_t = yes; then - : else cat >>confdefs.h <<_ACEOF @@ -13354,100 +11835,8 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 -echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; } -if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static struct stat ac_aggr; -if (ac_aggr.st_blksize) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_stat_st_blksize=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static struct stat ac_aggr; -if (sizeof ac_aggr.st_blksize) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_stat_st_blksize=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_stat_st_blksize=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; } -if test $ac_cv_member_struct_stat_st_blksize = yes; then +ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 @@ -13456,16 +11845,12 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if test "${ac_cv_header_time+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/time.h> @@ -13480,53 +11865,27 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_time=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_time=no + ac_cv_header_time=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } -if test "${ac_cv_struct_tm+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +if test "${ac_cv_struct_tm+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <time.h> @@ -13536,58 +11895,32 @@ main () { struct tm tm; int *p = &tm.tm_sec; - return !p; + return !p; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_struct_tm=time.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_struct_tm=sys/time.h + ac_cv_struct_tm=sys/time.h fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -echo "${ECHO_T}$ac_cv_struct_tm" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +$as_echo "$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then -cat >>confdefs.h <<\_ACEOF -#define TM_IN_SYS_TIME 1 -_ACEOF +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for working volatile" >&5 -echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; } -if test "${ac_cv_c_volatile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 +$as_echo_n "checking for working volatile... " >&6; } +if test "${ac_cv_c_volatile+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13601,97 +11934,23 @@ return !x && !y; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_volatile=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_volatile=no + ac_cv_c_volatile=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 -echo "${ECHO_T}$ac_cv_c_volatile" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 +$as_echo "$ac_cv_c_volatile" >&6; } if test $ac_cv_c_volatile = no; then -cat >>confdefs.h <<\_ACEOF -#define volatile -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 -echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; } -if test "${ac_cv_type_ptrdiff_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef ptrdiff_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_ptrdiff_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +$as_echo "#define volatile /**/" >>confdefs.h - ac_cv_type_ptrdiff_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 -echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; } -if test $ac_cv_type_ptrdiff_t = yes; then +ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" +if test "x$ac_cv_type_ptrdiff_t" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTRDIFF_T 1 @@ -13702,164 +11961,27 @@ fi # Checks for library functions. - for ac_header in unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_UNISTD_H 1 _ACEOF fi done -{ echo "$as_me:$LINENO: checking for working chown" >&5 -echo $ECHO_N "checking for working chown... $ECHO_C" >&6; } -if test "${ac_cv_func_chown_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5 +$as_echo_n "checking for working chown... " >&6; } +if test "${ac_cv_func_chown_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_chown_works=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #include <fcntl.h> @@ -13884,65 +12006,35 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_chown_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_chown_works=no + ac_cv_func_chown_works=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - rm -f conftest.chown fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_chown_works" >&5 -echo "${ECHO_T}$ac_cv_func_chown_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_chown_works" >&5 +$as_echo "$ac_cv_func_chown_works" >&6; } if test $ac_cv_func_chown_works = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_CHOWN 1 -_ACEOF +$as_echo "#define HAVE_CHOWN 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking whether closedir returns void" >&5 -echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6; } -if test "${ac_cv_func_closedir_void+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5 +$as_echo_n "checking whether closedir returns void... " >&6; } +if test "${ac_cv_func_closedir_void+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_closedir_void=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #include <$ac_header_dirent> @@ -13958,60 +12050,30 @@ return closedir (opendir (".")) != 0; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_closedir_void=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_closedir_void=yes + ac_cv_func_closedir_void=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 -echo "${ECHO_T}$ac_cv_func_closedir_void" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5 +$as_echo "$ac_cv_func_closedir_void" >&6; } if test $ac_cv_func_closedir_void = yes; then -cat >>confdefs.h <<\_ACEOF -#define CLOSEDIR_VOID 1 -_ACEOF +$as_echo "#define CLOSEDIR_VOID 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking for error_at_line" >&5 -echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6; } -if test "${ac_cv_lib_error_at_line+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +$as_echo_n "checking for error_at_line... " >&6; } +if test "${ac_cv_lib_error_at_line+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <error.h> int @@ -14022,37 +12084,16 @@ error_at_line (0, 0, "", 0, "an error occurred"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_error_at_line=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_error_at_line=no + ac_cv_lib_error_at_line=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5 -echo "${ECHO_T}$ac_cv_lib_error_at_line" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +$as_echo "$ac_cv_lib_error_at_line" >&6; } if test $ac_cv_lib_error_at_line = no; then case " $LIBOBJS " in *" error.$ac_objext "* ) ;; @@ -14062,260 +12103,41 @@ esac fi - for ac_header in vfork.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" +if test "x$ac_cv_header_vfork_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_VFORK_H 1 _ACEOF fi done - - for ac_func in fork vfork -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done if test "x$ac_cv_func_fork" = xyes; then - { echo "$as_me:$LINENO: checking for working fork" >&5 -echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 +$as_echo_n "checking for working fork... " >&6; } +if test "${ac_cv_func_fork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_fork_works=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -14329,42 +12151,18 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_fork_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_fork_works=no + ac_cv_func_fork_works=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 -echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 +$as_echo "$ac_cv_func_fork_works" >&6; } else ac_cv_func_fork_works=$ac_cv_func_fork @@ -14379,24 +12177,20 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - { echo "$as_me:$LINENO: checking for working vfork" >&5 -echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 +$as_echo_n "checking for working vfork... " >&6; } +if test "${ac_cv_func_vfork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_vfork_works=cross else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Thanks to Paul Eggert for this test. */ $ac_includes_default @@ -14488,84 +12282,50 @@ main () } } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_vfork_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_vfork_works=no + ac_cv_func_vfork_works=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 -echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 +$as_echo "$ac_cv_func_vfork_works" >&6; } fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=$ac_cv_func_vfork - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} fi if test "x$ac_cv_func_vfork_works" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_VFORK 1 -_ACEOF +$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h else -cat >>confdefs.h <<\_ACEOF -#define vfork fork -_ACEOF +$as_echo "#define vfork fork" >>confdefs.h fi if test "x$ac_cv_func_fork_works" = xyes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_FORK 1 -_ACEOF +$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h PBX_WORKING_FORK=1 fi -{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_source+set}" = set; then : + $as_echo_n "(cached) " >&6 else while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> /* for off_t */ #include <stdio.h> @@ -14578,39 +12338,12 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_sys_largefile_source=no; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 #include <sys/types.h> /* for off_t */ @@ -14624,40 +12357,17 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_sys_largefile_source=1; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_cv_sys_largefile_source=unknown break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +$as_echo "$ac_cv_sys_largefile_source" >&6; } case $ac_cv_sys_largefile_source in #( no | unknown) ;; *) @@ -14666,37 +12376,31 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f conftest* +rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. if test $ac_cv_sys_largefile_source != unknown; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_FSEEKO 1 -_ACEOF +$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h fi if test $ac_cv_c_compiler_gnu = yes; then - { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; } -if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 +$as_echo_n "checking whether $CC needs -traditional... " >&6; } +if test "${ac_cv_prog_gcc_traditional+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sgtty.h> Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then : ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no @@ -14705,25 +12409,21 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <termio.h> Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then : ac_cv_prog_gcc_traditional=yes fi rm -f conftest* fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 +$as_echo "$ac_cv_prog_gcc_traditional" >&6; } if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi @@ -14733,19 +12433,15 @@ fi # acts exactly like glibc's or not # AC_FUNC_MALLOC # AC_FUNC_REALLOC -{ echo "$as_me:$LINENO: checking for working memcmp" >&5 -echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; } -if test "${ac_cv_func_memcmp_working+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 +$as_echo_n "checking for working memcmp... " >&6; } +if test "${ac_cv_func_memcmp_working+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_memcmp_working=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -14780,42 +12476,18 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_memcmp_working=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_memcmp_working=no + ac_cv_func_memcmp_working=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 +$as_echo "$ac_cv_func_memcmp_working" >&6; } test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in *" memcmp.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" @@ -14825,144 +12497,16 @@ esac -for ac_header in stdlib.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in $ac_header_list +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -14970,112 +12514,32 @@ fi done -for ac_func in getpagesize -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +for ac_func in getpagesize +do : + ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +if test "x$ac_cv_func_getpagesize" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_GETPAGESIZE 1 _ACEOF fi done -{ echo "$as_me:$LINENO: checking for working mmap" >&5 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 +$as_echo_n "checking for working mmap... " >&6; } +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_mmap_fixed_mapped=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default /* malloc might have been renamed as rpl_malloc. */ @@ -15112,11 +12576,6 @@ char *malloc (); /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -/* Assume that all systems that can run configure have sys/param.h. */ -# ifndef HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -# endif - # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ @@ -15151,8 +12610,9 @@ int main () { char *data, *data2, *data3; + const char *cdata2; int i, pagesize; - int fd; + int fd, fd2; pagesize = getpagesize (); @@ -15165,27 +12625,41 @@ main () umask (0); fd = creat ("conftest.mmap", 0600); if (fd < 0) - return 1; + return 2; if (write (fd, data, pagesize) != pagesize) - return 1; + return 3; close (fd); + /* Next, check that the tail of a page is zero-filled. File must have + non-zero length, otherwise we risk SIGBUS for entire page. */ + fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); + if (fd2 < 0) + return 4; + cdata2 = ""; + if (write (fd2, cdata2, 1) != 1) + return 5; + data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + if (data2 == MAP_FAILED) + return 6; + for (i = 0; i < pagesize; ++i) + if (*(data2 + i)) + return 7; + close (fd2); + if (munmap (data2, pagesize)) + return 8; + /* Next, try to mmap the file at a fixed address which already has something else allocated at it. If we can, also make sure that we see the same garbage. */ fd = open ("conftest.mmap", O_RDWR); if (fd < 0) - return 1; - data2 = (char *) malloc (2 * pagesize); - if (!data2) - return 1; - data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); + return 9; if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, 0L)) - return 1; + return 10; for (i = 0; i < pagesize; ++i) if (*(data + i) != *(data2 + i)) - return 1; + return 11; /* Finally, make sure that changes to the mapped area do not percolate back to the file as seen by read(). (This is a bug on @@ -15194,220 +12668,58 @@ main () *(data2 + i) = *(data2 + i) + 1; data3 = (char *) malloc (pagesize); if (!data3) - return 1; + return 12; if (read (fd, data3, pagesize) != pagesize) - return 1; + return 13; for (i = 0; i < pagesize; ++i) if (*(data + i) != *(data3 + i)) - return 1; + return 14; close (fd); return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_mmap_fixed_mapped=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_mmap_fixed_mapped=no + ac_cv_func_mmap_fixed_mapped=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 +$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } if test $ac_cv_func_mmap_fixed_mapped = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP 1 -_ACEOF +$as_echo "#define HAVE_MMAP 1" >>confdefs.h fi -rm -f conftest.mmap - - +rm -f conftest.mmap conftest.txt for ac_header in sys/select.h sys/socket.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done -{ echo "$as_me:$LINENO: checking types of arguments for select" >&5 -echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6; } -if test "${ac_cv_func_select_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 +$as_echo_n "checking types of arguments for select... " >&6; } +if test "${ac_cv_func_select_args+set}" = set; then : + $as_echo_n "(cached) " >&6 else for ac_arg234 in 'fd_set *' 'int *' 'void *'; do for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #ifdef HAVE_SYS_SELECT_H @@ -15427,31 +12739,9 @@ extern int select ($ac_arg1, return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done done @@ -15460,8 +12750,8 @@ done : ${ac_cv_func_select_args='int,int *,struct timeval *'} fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5 -echo "${ECHO_T}$ac_cv_func_select_args" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 +$as_echo "$ac_cv_func_select_args" >&6; } ac_save_IFS=$IFS; IFS=',' set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` IFS=$ac_save_IFS @@ -15483,203 +12773,19 @@ _ACEOF rm -f conftest* -{ echo "$as_me:$LINENO: checking for function prototypes" >&5 -echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; } -if test "$ac_cv_prog_cc_c89" != no; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define PROTOTYPES 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define __PROTOTYPES 1 -_ACEOF - -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -{ echo "$as_me:$LINENO: checking whether setvbuf arguments are reversed" >&5 -echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6; } -if test "${ac_cv_func_setvbuf_reversed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_func_setvbuf_reversed+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_func_setvbuf_reversed=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdio.h> -# ifdef PROTOTYPES - int (setvbuf) (FILE *, int, char *, size_t); -# endif -int -main () -{ -char buf; return setvbuf (stdout, _IOLBF, &buf, 1); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdio.h> -# ifdef PROTOTYPES - int (setvbuf) (FILE *, int, char *, size_t); -# endif -int -main () -{ -char buf; return setvbuf (stdout, &buf, _IOLBF, 1); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - # It compiles and links either way, so it must not be declared - # with a prototype and most likely this is a K&R C compiler. - # Try running it. - if test "$cross_compiling" = yes; then - : # Assume setvbuf is not reversed when cross-compiling. -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -/* This call has the arguments reversed. - A reversed system may check and see that the address of buf - is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ - char buf; - if (setvbuf (stdout, _IOLBF, &buf, 1) != 0) - return 1; - putchar ('\r'); - return 0; /* Non-reversed systems SEGV here. */ - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_setvbuf_reversed=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - ac_cv_func_setvbuf_reversed=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_setvbuf_reversed" >&5 -echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6; } -if test $ac_cv_func_setvbuf_reversed = yes; then -cat >>confdefs.h <<\_ACEOF -#define SETVBUF_REVERSED 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <signal.h> @@ -15692,64 +12798,40 @@ return *(signal (0, 0)) (0) == 1; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_type_signal=int else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void + ac_cv_type_signal=void fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal _ACEOF -{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : + $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_lstat_dereferences_slashed_symlink=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int main () { struct stat sbuf; - /* Linux will dereference the symlink and fail. + /* Linux will dereference the symlink and fail, as required by POSIX. That is better in the sense that it means we will not have to compile and use the lstat wrapper. */ return lstat ("conftest.sym/", &sbuf) == 0; @@ -15757,39 +12839,15 @@ struct stat sbuf; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_lstat_dereferences_slashed_symlink=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no + ac_cv_func_lstat_dereferences_slashed_symlink=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - else # If the `ln -s' command failed, then we probably don't even # have an lstat function. @@ -15798,8 +12856,8 @@ fi rm -f conftest.sym conftest.file fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 +$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && @@ -15808,7 +12866,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then +if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then case " $LIBOBJS " in *" lstat.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS lstat.$ac_objext" @@ -15817,19 +12875,15 @@ esac fi -{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 +$as_echo_n "checking whether stat accepts an empty string... " >&6; } +if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_stat_empty_string_bug=yes else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -15841,42 +12895,18 @@ struct stat sbuf; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_stat_empty_string_bug=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_stat_empty_string_bug=yes + ac_cv_func_stat_empty_string_bug=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 +$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } if test $ac_cv_func_stat_empty_string_bug = yes; then case " $LIBOBJS " in *" stat.$ac_objext "* ) ;; @@ -15891,19 +12921,15 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for working strcoll" >&5 -echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6; } -if test "${ac_cv_func_strcoll_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5 +$as_echo_n "checking for working strcoll... " >&6; } +if test "${ac_cv_func_strcoll_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_strcoll_works=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -15916,155 +12942,42 @@ return (strcoll ("abc", "def") >= 0 || return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_strcoll_works=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_strcoll_works=no + ac_cv_func_strcoll_works=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5 -echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5 +$as_echo "$ac_cv_func_strcoll_works" >&6; } if test $ac_cv_func_strcoll_works = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_STRCOLL 1 -_ACEOF +$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h fi - for ac_func in strftime -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +if test "x$ac_cv_func_strftime" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_STRFTIME 1 _ACEOF else # strftime is in -lintl on SCO UNIX. -{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_strftime+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 +$as_echo_n "checking for strftime in -lintl... " >&6; } +if test "${ac_cv_lib_intl_strftime+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16082,42 +12995,19 @@ return strftime (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_strftime=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_strftime=no + ac_cv_lib_intl_strftime=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } -if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRFTIME 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 +$as_echo "$ac_cv_lib_intl_strftime" >&6; } +if test "x$ac_cv_lib_intl_strftime" = x""yes; then : + $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h LIBS="-lintl $LIBS" fi @@ -16125,19 +13015,15 @@ fi fi done -{ echo "$as_me:$LINENO: checking for working strnlen" >&5 -echo $ECHO_N "checking for working strnlen... $ECHO_C" >&6; } -if test "${ac_cv_func_strnlen_working+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5 +$as_echo_n "checking for working strnlen... " >&6; } +if test "${ac_cv_func_strnlen_working+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_strnlen_working=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -16163,42 +13049,18 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_strnlen_working=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_strnlen_working=no + ac_cv_func_strnlen_working=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_strnlen_working" >&5 -echo "${ECHO_T}$ac_cv_func_strnlen_working" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5 +$as_echo "$ac_cv_func_strnlen_working" >&6; } test $ac_cv_func_strnlen_working = no && case " $LIBOBJS " in *" strnlen.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" @@ -16206,19 +13068,15 @@ test $ac_cv_func_strnlen_working = no && case " $LIBOBJS " in esac -{ echo "$as_me:$LINENO: checking for working strtod" >&5 -echo $ECHO_N "checking for working strtod... $ECHO_C" >&6; } -if test "${ac_cv_func_strtod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 +$as_echo_n "checking for working strtod... " >&6; } +if test "${ac_cv_func_strtod+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_strtod=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default @@ -16251,42 +13109,18 @@ main() } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_strtod=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_strtod=no + ac_cv_func_strtod=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5 -echo "${ECHO_T}$ac_cv_func_strtod" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 +$as_echo "$ac_cv_func_strtod" >&6; } if test $ac_cv_func_strtod = no; then case " $LIBOBJS " in *" strtod.$ac_objext "* ) ;; @@ -16294,101 +13128,20 @@ if test $ac_cv_func_strtod = no; then ;; esac -{ echo "$as_me:$LINENO: checking for pow" >&5 -echo $ECHO_N "checking for pow... $ECHO_C" >&6; } -if test "${ac_cv_func_pow+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define pow to an innocuous variant, in case <limits.h> declares pow. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define pow innocuous_pow - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pow (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef pow - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_pow || defined __stub___pow -choke me -#endif - -int -main () -{ -return pow (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_pow=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_pow=no -fi +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" +if test "x$ac_cv_func_pow" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5 -echo "${ECHO_T}$ac_cv_func_pow" >&6; } if test $ac_cv_func_pow = no; then - { echo "$as_me:$LINENO: checking for pow in -lm" >&5 -echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; } -if test "${ac_cv_lib_m_pow+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 +$as_echo_n "checking for pow in -lm... " >&6; } +if test "${ac_cv_lib_m_pow+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -16406,43 +13159,22 @@ return pow (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_pow=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_pow=no + ac_cv_lib_m_pow=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 -echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; } -if test $ac_cv_lib_m_pow = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 +$as_echo "$ac_cv_lib_m_pow" >&6; } +if test "x$ac_cv_lib_m_pow" = x""yes; then : POW_LIB=-lm else - { echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5 -echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 +$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} fi fi @@ -16452,174 +13184,17 @@ fi - -for ac_header in $ac_header_list -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - - -{ echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 -echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; } -if test "${ac_cv_func_utime_null+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5 +$as_echo_n "checking whether utime accepts a null argument... " >&6; } +if test "${ac_cv_func_utime_null+set}" = set; then : + $as_echo_n "(cached) " >&6 else rm -f conftest.data; >conftest.data # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. -if test "$cross_compiling" = yes; then - ac_cv_func_utime_null=no +if test "$cross_compiling" = yes; then : + ac_cv_func_utime_null='guessing yes' else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #ifdef HAVE_UTIME_H @@ -16638,228 +13213,38 @@ struct stat s, t; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_utime_null=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_utime_null=no + ac_cv_func_utime_null=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 -echo "${ECHO_T}$ac_cv_func_utime_null" >&6; } -if test $ac_cv_func_utime_null = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5 +$as_echo "$ac_cv_func_utime_null" >&6; } +if test "x$ac_cv_func_utime_null" != xno; then + ac_cv_func_utime_null=yes -cat >>confdefs.h <<\_ACEOF -#define HAVE_UTIME_NULL 1 -_ACEOF +$as_echo "#define HAVE_UTIME_NULL 1" >>confdefs.h fi rm -f conftest.data - for ac_func in vprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -{ echo "$as_me:$LINENO: checking for _doprnt" >&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; } -if test "${ac_cv_func__doprnt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define _doprnt innocuous__doprnt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef _doprnt - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _doprnt (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub__doprnt || defined __stub____doprnt -choke me -#endif - -int -main () -{ -return _doprnt (); - ; - return 0; -} +#define HAVE_VPRINTF 1 _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func__doprnt=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func__doprnt=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -echo "${ECHO_T}$ac_cv_func__doprnt" >&6; } -if test $ac_cv_func__doprnt = yes; then +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h fi @@ -16867,149 +13252,14 @@ fi done - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -17017,19 +13267,14 @@ done # BSD might not have exp2, and/or log2 - -{ echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 -echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6; } -if test "${ac_cv_lib_m_sqrt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +$as_echo_n "checking for sqrt in -lm... " >&6; } +if test "${ac_cv_lib_m_sqrt+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -17047,39 +13292,18 @@ return sqrt (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_sqrt=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_m_sqrt=no + ac_cv_lib_m_sqrt=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 -echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6; } -if test $ac_cv_lib_m_sqrt = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 +$as_echo "$ac_cv_lib_m_sqrt" >&6; } +if test "x$ac_cv_lib_m_sqrt" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF @@ -17088,150 +13312,23 @@ _ACEOF fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for ac_func in exp2l log2l exp10l log10l sinl cosl tanl asinl acosl atanl atan2l powl sqrtl rintl expl logl remainderl fmodl roundl truncl floorl ceill exp2 log2 exp10 log10 sin cos tan asin acos atan atan2 pow rint exp log remainder fmod round trunc floor ceil -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done -{ echo "$as_me:$LINENO: checking for timersub in time.h" >&5 -echo $ECHO_N "checking for timersub in time.h... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timersub in time.h" >&5 +$as_echo_n "checking for timersub in time.h... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/time.h> int @@ -17242,192 +13339,36 @@ struct timeval *a; timersub(a, a, a); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIMERSUB 1 -_ACEOF - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -if test "${ac_cv_header_sys_poll_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/poll.h" >&5 -echo $ECHO_N "checking for sys/poll.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_poll_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_poll_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_poll_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/poll.h usability" >&5 -echo $ECHO_N "checking sys/poll.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sys/poll.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +$as_echo "#define HAVE_TIMERSUB 1" >>confdefs.h -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/poll.h presence" >&5 -echo $ECHO_N "checking sys/poll.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/poll.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - ac_header_preproc=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/poll.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/poll.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/poll.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/poll.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/poll.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/poll.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/poll.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/poll.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/poll.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/poll.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/poll.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/poll.h" >&5 -echo $ECHO_N "checking for sys/poll.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_poll_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_poll_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_poll_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_poll_h" >&6; } - -fi -if test $ac_cv_header_sys_poll_h = yes; then +ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_poll_h" = x""yes; then : HAS_POLL=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_POLL_H 1 -_ACEOF +$as_echo "#define HAVE_SYS_POLL_H 1" >>confdefs.h fi # Check whether --enable-internal-poll was given. -if test "${enable_internal_poll+set}" = set; then +if test "${enable_internal_poll+set}" = set; then : enableval=$enable_internal_poll; case "${enableval}" in y|ye|yes) HAS_POLL="";; n|no) HAS_POLL="${HAS_POLL}" ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-internal-poll" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-internal-poll" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-internal-poll" "$LINENO" 5 ;; esac fi @@ -17437,191 +13378,26 @@ fi # https support (in main/http.c) uses funopen on BSD systems, # fopencookie on linux - - for ac_func in funopen fopencookie -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi done - for ac_func in inet_aton -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +do : + ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" +if test "x$ac_cv_func_inet_aton" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_INET_ATON 1 _ACEOF fi @@ -17629,13 +13405,9 @@ done # check if we have IP_PKTINFO constant defined -{ echo "$as_me:$LINENO: checking for IP_PKTINFO" >&5 -echo $ECHO_N "checking for IP_PKTINFO... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IP_PKTINFO" >&5 +$as_echo_n "checking for IP_PKTINFO... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <netinet/in.h> int @@ -17646,55 +13418,28 @@ int pi = IP_PKTINFO; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_PKTINFO 1 -_ACEOF +$as_echo "#define HAVE_PKTINFO 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext # some systems already have gethostbyname_r so we don't need to build ours in main/utils.c -{ echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5 -echo $ECHO_N "checking for library containing gethostbyname_r... $ECHO_C" >&6; } -if test "${ac_cv_search_gethostbyname_r+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname_r" >&5 +$as_echo_n "checking for library containing gethostbyname_r... " >&6; } +if test "${ac_cv_search_gethostbyname_r+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -17719,62 +13464,35 @@ for ac_lib in '' socket nsl; do ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_gethostbyname_r=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_gethostbyname_r+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_gethostbyname_r+set}" = set; then : break fi done -if test "${ac_cv_search_gethostbyname_r+set}" = set; then - : +if test "${ac_cv_search_gethostbyname_r+set}" = set; then : + else ac_cv_search_gethostbyname_r=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname_r" >&5 -echo "${ECHO_T}$ac_cv_search_gethostbyname_r" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname_r" >&5 +$as_echo "$ac_cv_search_gethostbyname_r" >&6; } ac_res=$ac_cv_search_gethostbyname_r -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ echo "$as_me:$LINENO: checking for gethostbyname_r with 6 arguments" >&5 -echo $ECHO_N "checking for gethostbyname_r with 6 arguments... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r with 6 arguments" >&5 +$as_echo_n "checking for gethostbyname_r with 6 arguments... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <netdb.h> @@ -17786,50 +13504,23 @@ struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETHOSTBYNAME_R_6 1 -_ACEOF +$as_echo "#define HAVE_GETHOSTBYNAME_R_6 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -{ echo "$as_me:$LINENO: checking for gethostbyname_r with 5 arguments" >&5 -echo $ECHO_N "checking for gethostbyname_r with 5 arguments... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r with 5 arguments" >&5 +$as_echo_n "checking for gethostbyname_r with 5 arguments... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <netdb.h> @@ -17841,174 +13532,22 @@ struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETHOSTBYNAME_R_5 1 -_ACEOF - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -if test "${ac_cv_header_byteswap_h+set}" = set; then - { echo "$as_me:$LINENO: checking for byteswap.h" >&5 -echo $ECHO_N "checking for byteswap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_byteswap_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_byteswap_h" >&5 -echo "${ECHO_T}$ac_cv_header_byteswap_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking byteswap.h usability" >&5 -echo $ECHO_N "checking byteswap.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <byteswap.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - ac_header_compiler=no -fi +$as_echo "#define HAVE_GETHOSTBYNAME_R_5 1" >>confdefs.h -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking byteswap.h presence" >&5 -echo $ECHO_N "checking byteswap.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <byteswap.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - ac_header_preproc=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: byteswap.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: byteswap.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: byteswap.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: byteswap.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: byteswap.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: byteswap.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: byteswap.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: byteswap.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: byteswap.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: byteswap.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: byteswap.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: byteswap.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: byteswap.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: byteswap.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: byteswap.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: byteswap.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for byteswap.h" >&5 -echo $ECHO_N "checking for byteswap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_byteswap_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_byteswap_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_byteswap_h" >&5 -echo "${ECHO_T}$ac_cv_header_byteswap_h" >&6; } - -fi -if test $ac_cv_header_byteswap_h = yes; then +ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" +if test "x$ac_cv_header_byteswap_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BYTESWAP_H 1 @@ -18018,13 +13557,9 @@ fi -{ echo "$as_me:$LINENO: checking for __swap16 variant of <sys/endian.h> byteswapping macros" >&5 -echo $ECHO_N "checking for __swap16 variant of <sys/endian.h> byteswapping macros... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __swap16 variant of <sys/endian.h> byteswapping macros" >&5 +$as_echo_n "checking for __swap16 variant of <sys/endian.h> byteswapping macros... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/endian.h> int @@ -18035,50 +13570,23 @@ int a = 1; int b = __swap16(a); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_ENDIAN_SWAP16 1 -_ACEOF +$as_echo "#define HAVE_SYS_ENDIAN_SWAP16 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -{ echo "$as_me:$LINENO: checking for bswap16 variant of <sys/endian.h> byteswapping macros" >&5 -echo $ECHO_N "checking for bswap16 variant of <sys/endian.h> byteswapping macros... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16 variant of <sys/endian.h> byteswapping macros" >&5 +$as_echo_n "checking for bswap16 variant of <sys/endian.h> byteswapping macros... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/endian.h> int @@ -18089,67 +13597,40 @@ int a = 1; int b = bswap16(a); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_ENDIAN_BSWAP16 1 -_ACEOF +$as_echo "#define HAVE_SYS_ENDIAN_BSWAP16 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "${cross_compiling}" = "no"; then - { echo "$as_me:$LINENO: checking for /dev/urandom" >&5 -echo $ECHO_N "checking for /dev/urandom... $ECHO_C" >&6; } -if test "${ac_cv_file__dev_urandom+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/urandom" >&5 +$as_echo_n "checking for /dev/urandom... " >&6; } +if test "${ac_cv_file__dev_urandom+set}" = set; then : + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/dev/urandom"; then ac_cv_file__dev_urandom=yes else ac_cv_file__dev_urandom=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__dev_urandom" >&5 -echo "${ECHO_T}$ac_cv_file__dev_urandom" >&6; } -if test $ac_cv_file__dev_urandom = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_urandom" >&5 +$as_echo "$ac_cv_file__dev_urandom" >&6; } +if test "x$ac_cv_file__dev_urandom" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_DEV_URANDOM 1 -_ACEOF +$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h fi @@ -18157,21 +13638,17 @@ fi if test "x${PBX_PTHREAD_RWLOCK_INITIALIZER}" != "x1"; then - { echo "$as_me:$LINENO: checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h" >&5 -echo $ECHO_N "checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h" >&5 +$as_echo_n "checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${PTHREAD_RWLOCK_INITIALIZER_DIR}" != "x"; then PTHREAD_RWLOCK_INITIALIZER_INCLUDE="-I${PTHREAD_RWLOCK_INITIALIZER_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${PTHREAD_RWLOCK_INITIALIZER_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <pthread.h> + #include <pthread.h> int main () { @@ -18186,55 +13663,29 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_PTHREAD_RWLOCK_INITIALIZER=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RWLOCK_INITIALIZER 1 -_ACEOF +$as_echo "#define HAVE_PTHREAD_RWLOCK_INITIALIZER 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi -{ echo "$as_me:$LINENO: checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h" >&5 -echo $ECHO_N "checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h" >&5 +$as_echo_n "checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -18245,50 +13696,23 @@ int a = PTHREAD_RWLOCK_PREFER_WRITER_NP; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP 1 -_ACEOF +$as_echo "#define HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -{ echo "$as_me:$LINENO: checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h" >&5 -echo $ECHO_N "checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h" >&5 +$as_echo_n "checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -18299,54 +13723,27 @@ int a = PTHREAD_MUTEX_RECURSIVE_NP; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_MUTEX_RECURSIVE_NP 1 -_ACEOF +$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE_NP 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -{ echo "$as_me:$LINENO: checking for pthread_rwlock_timedwrlock() in pthread.h" >&5 -echo $ECHO_N "checking for pthread_rwlock_timedwrlock() in pthread.h... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_rwlock_timedwrlock() in pthread.h" >&5 +$as_echo_n "checking for pthread_rwlock_timedwrlock() in pthread.h... " >&6; } save_LIBS="$LIBS" save_CFLAGS="$CFLAGS" LIBS="$PTHREAD_LIBS $LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> #include <time.h> @@ -18359,62 +13756,35 @@ pthread_rwlock_t foo; struct timespec bar; pthread_rwlock_timedwrlock(&foo, &bar } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_pthread_rwlock_timedwrlock="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_cv_pthread_rwlock_timedwrlock="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK 1 -_ACEOF +$as_echo "#define HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK 1" >>confdefs.h fi -{ echo "$as_me:$LINENO: checking if PTHREAD_ONCE_INIT needs braces" >&5 -echo $ECHO_N "checking if PTHREAD_ONCE_INIT needs braces... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_ONCE_INIT needs braces" >&5 +$as_echo_n "checking if PTHREAD_ONCE_INIT needs braces... " >&6; } saved_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -Werror -Wmissing-braces" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> void empty(){} @@ -18427,67 +13797,41 @@ pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty); } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_cv_pthread_once_needsbraces="no" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_pthread_once_needsbraces="yes" fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="${saved_CFLAGS}" if test "${ac_cv_pthread_once_needsbraces}" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define PTHREAD_ONCE_INIT_NEEDS_BRACES 1 -_ACEOF +$as_echo "#define PTHREAD_ONCE_INIT_NEEDS_BRACES 1" >>confdefs.h fi if test "x${PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}" != "x1"; then - { echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h" >&5 -echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h" >&5 +$as_echo_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_DIR}" != "x"; then PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_INCLUDE="-I${PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <pthread.h> + #include <pthread.h> int main () { @@ -18502,42 +13846,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP 1 -_ACEOF +$as_echo "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -18546,13 +13868,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Can we compare a mutex to its initial value? # Generally yes on OpenBSD/FreeBSD and no on Mac OS X. -{ echo "$as_me:$LINENO: checking whether we can compare a mutex to its initial value" >&5 -echo $ECHO_N "checking whether we can compare a mutex to its initial value... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compare a mutex to its initial value" >&5 +$as_echo_n "checking whether we can compare a mutex to its initial value... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int @@ -18567,42 +13885,19 @@ pthread_mutex_t lock; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define CAN_COMPARE_MUTEX_TO_INIT_VALUE 1 -_ACEOF +$as_echo "#define CAN_COMPARE_MUTEX_TO_INIT_VALUE 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext #if test "${cross_compiling}" = "no"; #then @@ -18619,13 +13914,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ #) #fi -{ echo "$as_me:$LINENO: checking for compiler atomic operations" >&5 -echo $ECHO_N "checking for compiler atomic operations... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler atomic operations" >&5 +$as_echo_n "checking for compiler atomic operations... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -18636,57 +13927,30 @@ int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_GCC_ATOMICS 1 -_ACEOF +$as_echo "#define HAVE_GCC_ATOMICS 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext # glibc, AFAIK, is the only C library that makes printing a NULL to a string safe. -{ echo "$as_me:$LINENO: checking if your system printf is NULL-safe." >&5 -echo $ECHO_N "checking if your system printf is NULL-safe.... $ECHO_C" >&6; } -if test "$cross_compiling" = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system printf is NULL-safe." >&5 +$as_echo_n "checking if your system printf is NULL-safe.... " >&6; } +if test "$cross_compiling" = yes; then : # It's unlikely an embedded system will have this. - { echo "$as_me:$LINENO: result: unknown" >&5 -echo "${ECHO_T}unknown" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 +$as_echo "unknown" >&6; } else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int @@ -18697,59 +13961,29 @@ printf("%s", NULL) return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_NULLSAFE_PRINTF 1 -_ACEOF +$as_echo "#define HAVE_NULLSAFE_PRINTF 1" >>confdefs.h - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -{ echo "$as_me:$LINENO: checking if we can increase the maximum select-able file descriptor" >&5 -echo $ECHO_N "checking if we can increase the maximum select-able file descriptor... $ECHO_C" >&6; } -if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: result: cross-compile" >&5 -echo "${ECHO_T}cross-compile" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can increase the maximum select-able file descriptor" >&5 +$as_echo_n "checking if we can increase the maximum select-able file descriptor... " >&6; } +if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5 +$as_echo "cross-compile" >&6; } else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> @@ -18783,60 +14017,29 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_VARIABLE_FDSET 1 -_ACEOF +$as_echo "#define HAVE_VARIABLE_FDSET 1" >>confdefs.h else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - if test "${ac_cv_have_variable_fdset}x" = "0x"; then - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run test program while cross compiling +See \`config.log' for more details." "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> @@ -18851,56 +14054,26 @@ if (getuid() != 0) { exit(1); } return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -cat >>confdefs.h <<\_ACEOF -#define CONFIGURE_RAN_AS_ROOT 1 -_ACEOF +if ac_fn_c_try_run "$LINENO"; then : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +$as_echo "#define CONFIGURE_RAN_AS_ROOT 1" >>confdefs.h fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: checking for compiler 'attribute pure' support" >&5 -echo $ECHO_N "checking for compiler 'attribute pure' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute pure' support" >&5 +$as_echo_n "checking for compiler 'attribute pure' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;} int @@ -18911,46 +14084,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_pure 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -18961,39 +14110,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_pure 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19001,18 +14130,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute malloc' support" >&5 -echo $ECHO_N "checking for compiler 'attribute malloc' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute malloc' support" >&5 +$as_echo_n "checking for compiler 'attribute malloc' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19023,46 +14148,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_malloc 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19073,39 +14174,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_malloc 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19113,18 +14194,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute const' support" >&5 -echo $ECHO_N "checking for compiler 'attribute const' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute const' support" >&5 +$as_echo_n "checking for compiler 'attribute const' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19135,46 +14212,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_const 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19185,39 +14238,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_const 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19225,18 +14258,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute unused' support" >&5 -echo $ECHO_N "checking for compiler 'attribute unused' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute unused' support" >&5 +$as_echo_n "checking for compiler 'attribute unused' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19247,46 +14276,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_unused 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19297,39 +14302,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_unused 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19337,18 +14322,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute always_inline' support" >&5 -echo $ECHO_N "checking for compiler 'attribute always_inline' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute always_inline' support" >&5 +$as_echo_n "checking for compiler 'attribute always_inline' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19359,46 +14340,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_always_inline 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19409,39 +14366,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_always_inline 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19449,18 +14386,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute deprecated' support" >&5 -echo $ECHO_N "checking for compiler 'attribute deprecated' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute deprecated' support" >&5 +$as_echo_n "checking for compiler 'attribute deprecated' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19471,46 +14404,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_deprecated 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19521,39 +14430,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_deprecated 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19561,18 +14450,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute sentinel' support" >&5 -echo $ECHO_N "checking for compiler 'attribute sentinel' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute sentinel' support" >&5 +$as_echo_n "checking for compiler 'attribute sentinel' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((sentinel)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19583,46 +14468,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_sentinel 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19633,39 +14494,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_sentinel 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19673,18 +14514,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute warn_unused_result' support" >&5 -echo $ECHO_N "checking for compiler 'attribute warn_unused_result' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute warn_unused_result' support" >&5 +$as_echo_n "checking for compiler 'attribute warn_unused_result' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((warn_unused_result)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19695,46 +14532,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_warn_unused_result 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19745,39 +14558,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_warn_unused_result 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19785,18 +14578,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute weak' support" >&5 -echo $ECHO_N "checking for compiler 'attribute weak' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute weak' support" >&5 +$as_echo_n "checking for compiler 'attribute weak' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((weak)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19807,46 +14596,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_weak 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19857,39 +14622,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_weak 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19897,18 +14642,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute weak_import' support" >&5 -echo $ECHO_N "checking for compiler 'attribute weak_import' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute weak_import' support" >&5 +$as_echo_n "checking for compiler 'attribute weak_import' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((weak_import)) *test(void *muffin, ...) {return (void *) 0;} int @@ -19919,46 +14660,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_weak_import 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int @@ -19969,39 +14686,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_weak_import 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -20009,18 +14706,14 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for compiler 'attribute alias' support" >&5 -echo $ECHO_N "checking for compiler 'attribute alias' support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute alias' support" >&5 +$as_echo_n "checking for compiler 'attribute alias' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "xalias("foo")" = "x" then -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((alias)) *test(void *muffin, ...) {return (void *) 0;} int @@ -20031,46 +14724,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_alias 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((alias("foo"))) *test(void *muffin, ...) {return (void *) 0;} int @@ -20081,39 +14750,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF #define HAVE_ATTRIBUTE_alias 1 _ACEOF else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -20121,15 +14770,11 @@ CFLAGS="$saved_CFLAGS" -{ echo "$as_me:$LINENO: checking for -ffunction-sections support" >&5 -echo $ECHO_N "checking for -ffunction-sections support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ffunction-sections support" >&5 +$as_echo_n "checking for -ffunction-sections support... " >&6; } saved_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -ffunction-sections" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -20140,34 +14785,14 @@ int x = 1; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } saved_LDFLAGS="${LDFLAGS}" LDFLAGS="${LDFLAGS} -Wl,--gc-sections" - { echo "$as_me:$LINENO: checking for --gc-sections support" >&5 -echo $ECHO_N "checking for --gc-sections support... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --gc-sections support" >&5 +$as_echo_n "checking for --gc-sections support... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -20178,113 +14803,84 @@ int x = 1; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } GC_CFLAGS="-ffunction-sections" GC_LDFLAGS="-Wl,--gc-sections" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="${saved_LDFLAGS}" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="${saved_CFLAGS}" -{ echo "$as_me:$LINENO: checking for -Wdeclaration-after-statement support" >&5 -echo $ECHO_N "checking for -Wdeclaration-after-statement support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wdeclaration-after-statement support" >&5 +$as_echo_n "checking for -Wdeclaration-after-statement support... " >&6; } if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } AST_DECLARATION_AFTER_STATEMENT=-Wdeclaration-after-statement else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } AST_DECLARATION_AFTER_STATEMENT= fi -{ echo "$as_me:$LINENO: checking for _FORTIFY_SOURCE support" >&5 -echo $ECHO_N "checking for _FORTIFY_SOURCE support... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE support" >&5 +$as_echo_n "checking for _FORTIFY_SOURCE support... " >&6; } if $(${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } AST_FORTIFY_SOURCE=-D_FORTIFY_SOURCE=2 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } AST_FORTIFY_SOURCE= fi -{ echo "$as_me:$LINENO: checking for -fno-strict-overflow" >&5 -echo $ECHO_N "checking for -fno-strict-overflow... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-strict-overflow" >&5 +$as_echo_n "checking for -fno-strict-overflow... " >&6; } if $(${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } AST_NO_STRICT_OVERFLOW=-fno-strict-overflow else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } AST_NO_STRICT_OVERFLOW= fi -{ echo "$as_me:$LINENO: checking for -Wshadow" >&5 -echo $ECHO_N "checking for -Wshadow... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wshadow" >&5 +$as_echo_n "checking for -Wshadow... " >&6; } if $(${CC} -Wshadow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } AST_SHADOW_WARNINGS=-Wshadow else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } AST_SHADOW_WARNINGS= fi -{ echo "$as_me:$LINENO: checking for sysinfo" >&5 -echo $ECHO_N "checking for sysinfo... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo" >&5 +$as_echo_n "checking for sysinfo... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/sysinfo.h> int @@ -20295,54 +14891,27 @@ struct sysinfo sys_info; int uptime = sys_info.uptime return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYSINFO 1 -_ACEOF +$as_echo "#define HAVE_SYSINFO 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -{ echo "$as_me:$LINENO: checking for library containing res_9_ninit" >&5 -echo $ECHO_N "checking for library containing res_9_ninit... $ECHO_C" >&6; } -if test "${ac_cv_search_res_9_ninit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ninit" >&5 +$as_echo_n "checking for library containing res_9_ninit... " >&6; } +if test "${ac_cv_search_res_9_ninit+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20367,61 +14936,34 @@ for ac_lib in '' resolv; do ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_res_9_ninit=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_res_9_ninit+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_res_9_ninit+set}" = set; then : break fi done -if test "${ac_cv_search_res_9_ninit+set}" = set; then - : +if test "${ac_cv_search_res_9_ninit+set}" = set; then : + else ac_cv_search_res_9_ninit=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_res_9_ninit" >&5 -echo "${ECHO_T}$ac_cv_search_res_9_ninit" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ninit" >&5 +$as_echo "$ac_cv_search_res_9_ninit" >&6; } ac_res=$ac_cv_search_res_9_ninit -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ echo "$as_me:$LINENO: checking for res_ninit" >&5 -echo $ECHO_N "checking for res_ninit... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ninit" >&5 +$as_echo_n "checking for res_ninit... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_SYS_SOCKET_H @@ -20442,42 +14984,19 @@ int foo = res_ninit(NULL); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_RES_NINIT 1 -_ACEOF +$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h - { echo "$as_me:$LINENO: checking for library containing res_9_ndestroy" >&5 -echo $ECHO_N "checking for library containing res_9_ndestroy... $ECHO_C" >&6; } -if test "${ac_cv_search_res_9_ndestroy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5 +$as_echo_n "checking for library containing res_9_ndestroy... " >&6; } +if test "${ac_cv_search_res_9_ndestroy+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -20502,61 +15021,34 @@ for ac_lib in '' resolv; do ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_res_9_ndestroy=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_res_9_ndestroy+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_res_9_ndestroy+set}" = set; then : break fi done -if test "${ac_cv_search_res_9_ndestroy+set}" = set; then - : +if test "${ac_cv_search_res_9_ndestroy+set}" = set; then : + else ac_cv_search_res_9_ndestroy=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_res_9_ndestroy" >&5 -echo "${ECHO_T}$ac_cv_search_res_9_ndestroy" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ndestroy" >&5 +$as_echo "$ac_cv_search_res_9_ndestroy" >&6; } ac_res=$ac_cv_search_res_9_ndestroy -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi - { echo "$as_me:$LINENO: checking for res_ndestroy" >&5 -echo $ECHO_N "checking for res_ndestroy... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy" >&5 +$as_echo_n "checking for res_ndestroy... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_SYS_SOCKET_H @@ -20577,71 +15069,40 @@ res_ndestroy(NULL); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_RES_NDESTROY 1 -_ACEOF +$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "x${PBX_IP_MTU_DISCOVER}" != "x1"; then - { echo "$as_me:$LINENO: checking for IP_MTU_DISCOVER in netinet/in.h" >&5 -echo $ECHO_N "checking for IP_MTU_DISCOVER in netinet/in.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IP_MTU_DISCOVER in netinet/in.h" >&5 +$as_echo_n "checking for IP_MTU_DISCOVER in netinet/in.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${IP_MTU_DISCOVER_DIR}" != "x"; then IP_MTU_DISCOVER_INCLUDE="-I${IP_MTU_DISCOVER_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${IP_MTU_DISCOVER_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <netinet/in.h> + #include <netinet/in.h> int main () { @@ -20656,179 +15117,28 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_IP_MTU_DISCOVER=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_IP_MTU_DISCOVER 1 -_ACEOF +$as_echo "#define HAVE_IP_MTU_DISCOVER 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi -if test "${ac_cv_header_libkern_OSAtomic_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libkern/OSAtomic.h" >&5 -echo $ECHO_N "checking for libkern/OSAtomic.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libkern_OSAtomic_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libkern_OSAtomic_h" >&5 -echo "${ECHO_T}$ac_cv_header_libkern_OSAtomic_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libkern/OSAtomic.h usability" >&5 -echo $ECHO_N "checking libkern/OSAtomic.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libkern/OSAtomic.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libkern/OSAtomic.h presence" >&5 -echo $ECHO_N "checking libkern/OSAtomic.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libkern/OSAtomic.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libkern/OSAtomic.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libkern/OSAtomic.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for libkern/OSAtomic.h" >&5 -echo $ECHO_N "checking for libkern/OSAtomic.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libkern_OSAtomic_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libkern_OSAtomic_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libkern_OSAtomic_h" >&5 -echo "${ECHO_T}$ac_cv_header_libkern_OSAtomic_h" >&6; } - -fi -if test $ac_cv_header_libkern_OSAtomic_h = yes; then +ac_fn_c_check_header_mongrel "$LINENO" "libkern/OSAtomic.h" "ac_cv_header_libkern_OSAtomic_h" "$ac_includes_default" +if test "x$ac_cv_header_libkern_OSAtomic_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_OSX_ATOMICS 1 @@ -20838,403 +15148,32 @@ fi -{ echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6; } -if test "${ac_cv_type_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef int ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_int=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_int=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6; } - # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef int ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef int ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef int ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef int ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef int ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if test "${ac_cv_sizeof_int+set}" = set; then : + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_int=$ac_lo;; -'') if test "$ac_cv_type_int" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_int=0 - fi ;; -esac else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef int ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include <stdio.h> -#include <stdlib.h> -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_int=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_int" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (int) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_int=0 fi fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +$as_echo "$ac_cv_sizeof_int" >&6; } @@ -21243,403 +15182,32 @@ cat >>confdefs.h <<_ACEOF _ACEOF -{ echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6; } -if test "${ac_cv_type_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef long ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_long=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6; } - # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if test "${ac_cv_sizeof_long+set}" = set; then : + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_long=$ac_lo;; -'') if test "$ac_cv_type_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include <stdio.h> -#include <stdlib.h> -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_long=0 fi fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +$as_echo "$ac_cv_sizeof_long" >&6; } @@ -21648,1154 +15216,192 @@ cat >>confdefs.h <<_ACEOF _ACEOF -{ echo "$as_me:$LINENO: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6; } -if test "${ac_cv_type_long_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef long long ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_long_long=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long_long=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_long_long" >&6; } - # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of long long" >&5 -echo $ECHO_N "checking size of long long... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_long_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if test "${ac_cv_sizeof_long_long+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long long) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_long_long=0 + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long long ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +if ac_fn_c_compute_int "$LINENO" "sizeof(foo.fds_bits[0])" "ac_cv_sizeof_fd_set_fds_bits" "$ac_includes_default +fd_set foo;"; then : + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_long_long=$ac_lo;; -'') if test "$ac_cv_type_long_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long_long=0 - fi ;; -esac +# This doesn't actually work; what it does is to use the variable set in the +# previous test as a cached value to set the right output variables. +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of fd_set.fds_bits" >&5 +$as_echo_n "checking size of fd_set.fds_bits... " >&6; } +if test "${ac_cv_sizeof_fd_set_fds_bits+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef long long ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include <stdio.h> -#include <stdlib.h> -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fd_set.fds_bits))" "ac_cv_sizeof_fd_set_fds_bits" "$ac_includes_default"; then : - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long_long=`cat conftest.val` else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_long_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + if test "$ac_cv_type_fd_set_fds_bits" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (fd_set.fds_bits) +See \`config.log' for more details." "$LINENO" 5; }; } else - ac_cv_sizeof_long_long=0 + ac_cv_sizeof_fd_set_fds_bits=0 fi fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fd_set_fds_bits" >&5 +$as_echo "$ac_cv_sizeof_fd_set_fds_bits" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +#define SIZEOF_FD_SET_FDS_BITS $ac_cv_sizeof_fd_set_fds_bits _ACEOF -if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -fd_set foo; -int -main () -{ -static int test_array [1 - 2 * !((sizeof(foo.fds_bits[0])) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -fd_set foo; -int -main () -{ -static int test_array [1 - 2 * !((sizeof(foo.fds_bits[0])) <= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Set a type compatible with the previous. We cannot just use a generic type +# for these bits, because on big-endian systems, the bits won't match up +# correctly if the size is wrong. +if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi +$as_echo "#define TYPEOF_FD_SET_FDS_BITS int" >>confdefs.h -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +else if test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -fd_set foo; -int -main () -{ -static int test_array [1 - 2 * !((sizeof(foo.fds_bits[0])) < 0)]; -test_array [0] = 0 +$as_echo "#define TYPEOF_FD_SET_FDS_BITS long" >>confdefs.h - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -fd_set foo; -int -main () -{ -static int test_array [1 - 2 * !((sizeof(foo.fds_bits[0])) >= $ac_mid)]; -test_array [0] = 0 +else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +$as_echo "#define TYPEOF_FD_SET_FDS_BITS long long" >>confdefs.h - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi +fi ; fi ; fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +# PKGCONFIG is used in later tests +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -fd_set foo; -int -main () -{ -static int test_array [1 - 2 * !((sizeof(foo.fds_bits[0])) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -case $ac_lo in -?*) ac_cv_sizeof_fd_set_fds_bits=$ac_lo;; -'') ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -fd_set foo; -static long int longval () { return sizeof(foo.fds_bits[0]); } -static unsigned long int ulongval () { return sizeof(foo.fds_bits[0]); } -#include <stdio.h> -#include <stdlib.h> -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if ((sizeof(foo.fds_bits[0])) < 0) - { - long int i = longval (); - if (i != (sizeof(foo.fds_bits[0]))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != (sizeof(foo.fds_bits[0]))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_fd_set_fds_bits=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + done +IFS=$as_save_IFS fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.val -# This doesn't actually work; what it does is to use the variable set in the -# previous test as a cached value to set the right output variables. -{ echo "$as_me:$LINENO: checking for fd_set.fds_bits" >&5 -echo $ECHO_N "checking for fd_set.fds_bits... $ECHO_C" >&6; } -if test "${ac_cv_type_fd_set_fds_bits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef fd_set.fds_bits ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_fd_set_fds_bits=yes +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +$as_echo "$PKGCONFIG" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_fd_set_fds_bits=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_fd_set_fds_bits" >&5 -echo "${ECHO_T}$ac_cv_type_fd_set_fds_bits" >&6; } -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of fd_set.fds_bits" >&5 -echo $ECHO_N "checking size of fd_set.fds_bits... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_fd_set_fds_bits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef fd_set.fds_bits ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef fd_set.fds_bits ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef fd_set.fds_bits ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef fd_set.fds_bits ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +IFS=$as_save_IFS - ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef fd_set.fds_bits ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKGCONFIG" >&5 +$as_echo "$ac_ct_PKGCONFIG" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_fd_set_fds_bits=$ac_lo;; -'') if test "$ac_cv_type_fd_set_fds_bits" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (fd_set.fds_bits) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (fd_set.fds_bits) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_fd_set_fds_bits=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef fd_set.fds_bits ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include <stdio.h> -#include <stdlib.h> -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="No" else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_fd_set_fds_bits=`cat conftest.val` + PKGCONFIG=$ac_ct_PKGCONFIG + fi else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_fd_set_fds_bits" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (fd_set.fds_bits) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (fd_set.fds_bits) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_fd_set_fds_bits=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + PKGCONFIG="$ac_cv_prog_PKGCONFIG" fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_fd_set_fds_bits" >&5 -echo "${ECHO_T}$ac_cv_sizeof_fd_set_fds_bits" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_FD_SET_FDS_BITS $ac_cv_sizeof_fd_set_fds_bits -_ACEOF - - - -# Set a type compatible with the previous. We cannot just use a generic type -# for these bits, because on big-endian systems, the bits won't match up -# correctly if the size is wrong. -if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then - -cat >>confdefs.h <<\_ACEOF -#define TYPEOF_FD_SET_FDS_BITS int -_ACEOF - -else if test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then - -cat >>confdefs.h <<\_ACEOF -#define TYPEOF_FD_SET_FDS_BITS long -_ACEOF - -else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then - -cat >>confdefs.h <<\_ACEOF -#define TYPEOF_FD_SET_FDS_BITS long long -_ACEOF -fi ; fi ; fi # do the package library checks now @@ -22817,19 +15423,15 @@ if test "x${PBX_ALSA}" != "x1" -a "${USE_ALSA}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_asound_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lasound" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lasound... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_asound_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lasound" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lasound... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lasound ${pbxlibdir} -lm -ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22847,40 +15449,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_ALSA_FOUND=yes else AST_ALSA_FOUND=no @@ -22902,137 +15484,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE}" - if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5 -echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking alsa/asoundlib.h usability" >&5 -echo $ECHO_N "checking alsa/asoundlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <alsa/asoundlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking alsa/asoundlib.h presence" >&5 -echo $ECHO_N "checking alsa/asoundlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <alsa/asoundlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: alsa/asoundlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5 -echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_alsa_asoundlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_asoundlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_alsa_asoundlib_h" >&6; } - -fi -if test $ac_cv_header_alsa_asoundlib_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : ALSA_HEADER_FOUND=1 else ALSA_HEADER_FOUND=0 @@ -23076,19 +15529,15 @@ if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcurses" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lcurses... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcurses" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lcurses... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -23106,40 +15555,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_CURSES_FOUND=yes else AST_CURSES_FOUND=no @@ -23161,137 +15590,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}" - if test "${ac_cv_header_curses_h+set}" = set; then - { echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking curses.h usability" >&5 -echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <curses.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking curses.h presence" >&5 -echo $ECHO_N "checking curses.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <curses.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: curses.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_curses_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } - -fi -if test $ac_cv_header_curses_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" +if test "x$ac_cv_header_curses_h" = x""yes; then : CURSES_HEADER_FOUND=1 else CURSES_HEADER_FOUND=0 @@ -23336,19 +15636,15 @@ if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_cap_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcap" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lcap... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_cap_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcap" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lcap... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcap ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -23366,40 +15662,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_CAP_FOUND=yes else AST_CAP_FOUND=no @@ -23421,137 +15697,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE}" - if test "${ac_cv_header_sys_capability_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/capability.h" >&5 -echo $ECHO_N "checking for sys/capability.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_capability_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_capability_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_capability_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/capability.h usability" >&5 -echo $ECHO_N "checking sys/capability.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sys/capability.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/capability.h presence" >&5 -echo $ECHO_N "checking sys/capability.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/capability.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/capability.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/capability.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/capability.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/capability.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/capability.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/capability.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/capability.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/capability.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/capability.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/capability.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/capability.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/capability.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/capability.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/capability.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/capability.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/capability.h" >&5 -echo $ECHO_N "checking for sys/capability.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_capability_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_capability_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_capability_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_capability_h" >&6; } - -fi -if test $ac_cv_header_sys_capability_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_capability_h" = x""yes; then : CAP_HEADER_FOUND=1 else CAP_HEADER_FOUND=0 @@ -23581,21 +15728,17 @@ fi if test "x${PBX_DAHDI}" != "x1"; then - { echo "$as_me:$LINENO: checking for DAHDI_RESET_COUNTERS in dahdi/user.h" >&5 -echo $ECHO_N "checking for DAHDI_RESET_COUNTERS in dahdi/user.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_RESET_COUNTERS in dahdi/user.h" >&5 +$as_echo_n "checking for DAHDI_RESET_COUNTERS in dahdi/user.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${DAHDI_DIR}" != "x"; then DAHDI_INCLUDE="-I${DAHDI_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${DAHDI_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <dahdi/user.h> + #include <dahdi/user.h> int main () { @@ -23610,46 +15753,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_DAHDI=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI 1 -_ACEOF +$as_echo "#define HAVE_DAHDI 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_VERSION 230 -_ACEOF +$as_echo "#define HAVE_DAHDI_VERSION 230" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -23657,21 +15776,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_DAHDI}" != "x1"; then - { echo "$as_me:$LINENO: checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h" >&5 -echo $ECHO_N "checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h" >&5 +$as_echo_n "checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${DAHDI_DIR}" != "x"; then DAHDI_INCLUDE="-I${DAHDI_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${DAHDI_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <dahdi/user.h> + #include <dahdi/user.h> int main () { @@ -23686,46 +15801,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_DAHDI=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI 1 -_ACEOF +$as_echo "#define HAVE_DAHDI 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_VERSION 220 -_ACEOF +$as_echo "#define HAVE_DAHDI_VERSION 220" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -23733,21 +15824,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_DAHDI}" != "x1"; then - { echo "$as_me:$LINENO: checking for DAHDI_CODE in dahdi/user.h" >&5 -echo $ECHO_N "checking for DAHDI_CODE in dahdi/user.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_CODE in dahdi/user.h" >&5 +$as_echo_n "checking for DAHDI_CODE in dahdi/user.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${DAHDI_DIR}" != "x"; then DAHDI_INCLUDE="-I${DAHDI_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${DAHDI_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <dahdi/user.h> + #include <dahdi/user.h> int main () { @@ -23762,46 +15849,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_DAHDI=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI 1 -_ACEOF +$as_echo "#define HAVE_DAHDI 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_VERSION 200 -_ACEOF +$as_echo "#define HAVE_DAHDI_VERSION 200" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -23810,21 +15873,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_DAHDI_HALF_FULL}" != "x1"; then - { echo "$as_me:$LINENO: checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h" >&5 -echo $ECHO_N "checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h" >&5 +$as_echo_n "checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${DAHDI_HALF_FULL_DIR}" != "x"; then DAHDI_HALF_FULL_INCLUDE="-I${DAHDI_HALF_FULL_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${DAHDI_HALF_FULL_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <dahdi/user.h> + #include <dahdi/user.h> int main () { @@ -23839,42 +15898,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_DAHDI_HALF_FULL=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_HALF_FULL 1 -_ACEOF +$as_echo "#define HAVE_DAHDI_HALF_FULL 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -23884,11 +15921,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_DAHDI_LINEREVERSE_VMWI}" != "x1" -a "${USE_DAHDI_LINEREVERSE_VMWI}" != "no"; then if test "xenhanced dahdi vmwi support" != "x"; then - { echo "$as_me:$LINENO: checking for enhanced dahdi vmwi support" >&5 -echo $ECHO_N "checking for enhanced dahdi vmwi support... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5 +$as_echo_n "checking for enhanced dahdi vmwi support... " >&6; } else - { echo "$as_me:$LINENO: checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h" >&5 -echo $ECHO_N "checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h" >&5 +$as_echo_n "checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h... " >&6; } fi saved_cppflags="${CPPFLAGS}" if test "x${DAHDI_LINEREVERSE_VMWI_DIR}" != "x"; then @@ -23896,13 +15933,9 @@ echo $ECHO_N "checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi fi CPPFLAGS="${CPPFLAGS} ${DAHDI_LINEREVERSE_VMWI_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <dahdi/user.h> + #include <dahdi/user.h> int main () { @@ -23912,42 +15945,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_DAHDI_LINEREVERSE_VMWI=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_DAHDI_LINEREVERSE_VMWI 1 -_ACEOF +$as_echo "#define HAVE_DAHDI_LINEREVERSE_VMWI 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -23956,11 +15967,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_GETIFADDRS}" != "x1" -a "${USE_GETIFADDRS}" != "no"; then if test "xgetifaddrs() support" != "x"; then - { echo "$as_me:$LINENO: checking for getifaddrs() support" >&5 -echo $ECHO_N "checking for getifaddrs() support... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5 +$as_echo_n "checking for getifaddrs() support... " >&6; } else - { echo "$as_me:$LINENO: checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h" >&5 -echo $ECHO_N "checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h" >&5 +$as_echo_n "checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h... " >&6; } fi saved_cppflags="${CPPFLAGS}" if test "x${GETIFADDRS_DIR}" != "x"; then @@ -23968,13 +15979,9 @@ echo $ECHO_N "checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using i fi CPPFLAGS="${CPPFLAGS} ${GETIFADDRS_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <ifaddrs.h> + #include <ifaddrs.h> int main () { @@ -23984,42 +15991,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_GETIFADDRS=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETIFADDRS 1 -_ACEOF +$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -24027,11 +16012,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_TIMERFD}" != "x1" -a "${USE_TIMERFD}" != "no"; then if test "xtimerfd support" != "x"; then - { echo "$as_me:$LINENO: checking for timerfd support" >&5 -echo $ECHO_N "checking for timerfd support... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5 +$as_echo_n "checking for timerfd support... " >&6; } else - { echo "$as_me:$LINENO: checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h" >&5 -echo $ECHO_N "checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h" >&5 +$as_echo_n "checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h... " >&6; } fi saved_cppflags="${CPPFLAGS}" if test "x${TIMERFD_DIR}" != "x"; then @@ -24039,13 +16024,9 @@ echo $ECHO_N "checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL); fi CPPFLAGS="${CPPFLAGS} ${TIMERFD_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <sys/timerfd.h> + #include <sys/timerfd.h> int main () { @@ -24055,42 +16036,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_TIMERFD=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIMERFD 1 -_ACEOF +$as_echo "#define HAVE_TIMERFD 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -24114,18 +16073,14 @@ if test "${USE_GSM}" != "no"; then gsmlibdir="-L${GSM_DIR}" fi fi - { echo "$as_me:$LINENO: checking for gsm_create in -lgsm" >&5 -echo $ECHO_N "checking for gsm_create in -lgsm... $ECHO_C" >&6; } -if test "${ac_cv_lib_gsm_gsm_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsm_create in -lgsm" >&5 +$as_echo_n "checking for gsm_create in -lgsm... " >&6; } +if test "${ac_cv_lib_gsm_gsm_create+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgsm ${gsmlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -24143,39 +16098,18 @@ return gsm_create (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gsm_gsm_create=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gsm_gsm_create=no + ac_cv_lib_gsm_gsm_create=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_create" >&5 -echo "${ECHO_T}$ac_cv_lib_gsm_gsm_create" >&6; } -if test $ac_cv_lib_gsm_gsm_create = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsm_gsm_create" >&5 +$as_echo "$ac_cv_lib_gsm_gsm_create" >&6; } +if test "x$ac_cv_lib_gsm_gsm_create" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GSM 1 @@ -24185,280 +16119,20 @@ fi if test "${ac_cv_lib_gsm_gsm_create}" = "yes"; then if test "x${GSM_DIR}" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${GSM_DIR}/include/gsm.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${GSM_DIR}/include/gsm.h" >&5 -echo $ECHO_N "checking for ${GSM_DIR}/include/gsm.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${GSM_DIR}/include/gsm.h usability" >&5 -echo $ECHO_N "checking ${GSM_DIR}/include/gsm.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${GSM_DIR}/include/gsm.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${GSM_DIR}/include/gsm.h presence" >&5 -echo $ECHO_N "checking ${GSM_DIR}/include/gsm.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${GSM_DIR}/include/gsm.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ${GSM_DIR}/include/gsm.h" >&5 -echo $ECHO_N "checking for ${GSM_DIR}/include/gsm.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${GSM_DIR}/include/gsm.h" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "${GSM_DIR}/include/gsm.h" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : GSM_HEADER_FOUND=1 else GSM_HEADER_FOUND=0 fi - as_ac_Header=`echo "ac_cv_header_${GSM_DIR}/include/gsm/gsm.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${GSM_DIR}/include/gsm/gsm.h" >&5 -echo $ECHO_N "checking for ${GSM_DIR}/include/gsm/gsm.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${GSM_DIR}/include/gsm/gsm.h usability" >&5 -echo $ECHO_N "checking ${GSM_DIR}/include/gsm/gsm.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${GSM_DIR}/include/gsm/gsm.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${GSM_DIR}/include/gsm/gsm.h presence" >&5 -echo $ECHO_N "checking ${GSM_DIR}/include/gsm/gsm.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${GSM_DIR}/include/gsm/gsm.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GSM_DIR}/include/gsm/gsm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${GSM_DIR}/include/gsm/gsm.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ${GSM_DIR}/include/gsm/gsm.h" >&5 -echo $ECHO_N "checking for ${GSM_DIR}/include/gsm/gsm.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${GSM_DIR}/include/gsm/gsm.h" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "${GSM_DIR}/include/gsm/gsm.h" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : GSM_GSM_HEADER_FOUND=1 else GSM_GSM_HEADER_FOUND=0 @@ -24466,274 +16140,16 @@ fi else - if test "${ac_cv_header_gsm_h+set}" = set; then - { echo "$as_me:$LINENO: checking for gsm.h" >&5 -echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gsm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5 -echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking gsm.h usability" >&5 -echo $ECHO_N "checking gsm.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <gsm.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking gsm.h presence" >&5 -echo $ECHO_N "checking gsm.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <gsm.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gsm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gsm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gsm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gsm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gsm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gsm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gsm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gsm.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for gsm.h" >&5 -echo $ECHO_N "checking for gsm.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gsm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_gsm_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_h" >&5 -echo "${ECHO_T}$ac_cv_header_gsm_h" >&6; } - -fi -if test $ac_cv_header_gsm_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "gsm.h" "ac_cv_header_gsm_h" "$ac_includes_default" +if test "x$ac_cv_header_gsm_h" = x""yes; then : GSM_HEADER_FOUND=1 else GSM_HEADER_FOUND=0 fi - if test "${ac_cv_header_gsm_gsm_h+set}" = set; then - { echo "$as_me:$LINENO: checking for gsm/gsm.h" >&5 -echo $ECHO_N "checking for gsm/gsm.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gsm_gsm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_gsm_h" >&5 -echo "${ECHO_T}$ac_cv_header_gsm_gsm_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking gsm/gsm.h usability" >&5 -echo $ECHO_N "checking gsm/gsm.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <gsm/gsm.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking gsm/gsm.h presence" >&5 -echo $ECHO_N "checking gsm/gsm.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <gsm/gsm.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gsm/gsm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gsm/gsm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gsm/gsm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gsm/gsm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gsm/gsm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gsm/gsm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gsm/gsm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gsm/gsm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gsm/gsm.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for gsm/gsm.h" >&5 -echo $ECHO_N "checking for gsm/gsm.h... $ECHO_C" >&6; } -if test "${ac_cv_header_gsm_gsm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_gsm_gsm_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_gsm_gsm_h" >&5 -echo "${ECHO_T}$ac_cv_header_gsm_gsm_h" >&6; } - -fi -if test $ac_cv_header_gsm_gsm_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "gsm/gsm.h" "ac_cv_header_gsm_gsm_h" "$ac_includes_default" +if test "x$ac_cv_header_gsm_gsm_h" = x""yes; then : GSM_GSM_HEADER_FOUND=1 else GSM_GSM_HEADER_FOUND=0 @@ -24744,14 +16160,14 @@ fi if test "${GSM_HEADER_FOUND}" = "0" ; then if test "{GSM_GSM_HEADER_FOUND}" = "0" ; then if test "x${GSM_MANDATORY}" = "xyes" ; then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the gsm development package installed." >&5 -echo "$as_me: *** It appears that you do not have the gsm development package installed." >&6;} - { echo "$as_me:$LINENO: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&5 -echo "$as_me: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&6;} - { echo "$as_me:$LINENO: *** without explicitly specifying --with-${GSM_OPTION}" >&5 -echo "$as_me: *** without explicitly specifying --with-${GSM_OPTION}" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5 +$as_echo "$as_me: ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** It appears that you do not have the gsm development package installed." >&5 +$as_echo "$as_me: *** It appears that you do not have the gsm development package installed." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&5 +$as_echo "$as_me: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** without explicitly specifying --with-${GSM_OPTION}" >&5 +$as_echo "$as_me: *** without explicitly specifying --with-${GSM_OPTION}" >&6;} exit 1 fi fi @@ -24812,19 +16228,15 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_iconv_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -liconv" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -liconv... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_iconv_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liconv" >&5 +$as_echo_n "checking for ${pbxfuncname} in -liconv... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-liconv ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -24842,40 +16254,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_ICONV_FOUND=yes else AST_ICONV_FOUND=no @@ -24897,137 +16289,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}" - if test "${ac_cv_header_iconv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking iconv.h usability" >&5 -echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <iconv.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking iconv.h presence" >&5 -echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <iconv.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_iconv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } - -fi -if test $ac_cv_header_iconv_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" +if test "x$ac_cv_header_iconv_h" = x""yes; then : ICONV_HEADER_FOUND=1 else ICONV_HEADER_FOUND=0 @@ -25071,19 +16334,15 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lc" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lc... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lc ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -25101,40 +16360,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_ICONV_FOUND=yes else AST_ICONV_FOUND=no @@ -25156,137 +16395,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}" - if test "${ac_cv_header_iconv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking iconv.h usability" >&5 -echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <iconv.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking iconv.h presence" >&5 -echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <iconv.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_iconv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } - -fi -if test $ac_cv_header_iconv_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" +if test "x$ac_cv_header_iconv_h" = x""yes; then : ICONV_HEADER_FOUND=1 else ICONV_HEADER_FOUND=0 @@ -25330,19 +16440,15 @@ if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_iksemel_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -liksemel" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -liksemel... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_iksemel_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liksemel" >&5 +$as_echo_n "checking for ${pbxfuncname} in -liksemel... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-liksemel ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -25360,40 +16466,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_IKSEMEL_FOUND=yes else AST_IKSEMEL_FOUND=no @@ -25415,137 +16501,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE}" - if test "${ac_cv_header_iksemel_h+set}" = set; then - { echo "$as_me:$LINENO: checking for iksemel.h" >&5 -echo $ECHO_N "checking for iksemel.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iksemel_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iksemel_h" >&5 -echo "${ECHO_T}$ac_cv_header_iksemel_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking iksemel.h usability" >&5 -echo $ECHO_N "checking iksemel.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <iksemel.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking iksemel.h presence" >&5 -echo $ECHO_N "checking iksemel.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <iksemel.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: iksemel.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: iksemel.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: iksemel.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: iksemel.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: iksemel.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: iksemel.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: iksemel.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: iksemel.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: iksemel.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: iksemel.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: iksemel.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: iksemel.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: iksemel.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: iksemel.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: iksemel.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: iksemel.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for iksemel.h" >&5 -echo $ECHO_N "checking for iksemel.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iksemel_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_iksemel_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iksemel_h" >&5 -echo "${ECHO_T}$ac_cv_header_iksemel_h" >&6; } - -fi -if test $ac_cv_header_iksemel_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "iksemel.h" "ac_cv_header_iksemel_h" "$ac_includes_default" +if test "x$ac_cv_header_iksemel_h" = x""yes; then : IKSEMEL_HEADER_FOUND=1 else IKSEMEL_HEADER_FOUND=0 @@ -25581,8 +16538,8 @@ if test "${USE_IMAP_TK}" != "no"; then switch_to_system_on_failure="yes" fi if test "${IMAP_TK_DIR}" != "system"; then - { echo "$as_me:$LINENO: checking for UW IMAP Toolkit c-client library" >&5 -echo $ECHO_N "checking for UW IMAP Toolkit c-client library... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UW IMAP Toolkit c-client library" >&5 +$as_echo_n "checking for UW IMAP Toolkit c-client library... " >&6; } if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` fi @@ -25590,11 +16547,7 @@ echo $ECHO_N "checking for UW IMAP Toolkit c-client library... $ECHO_C" >&6; } imap_include="-I${IMAP_TK_DIR}/c-client" CPPFLAGS="${CPPFLAGS} ${imap_include}" LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "c-client.h" void mm_searched (MAILSTREAM *stream,unsigned long number) @@ -25653,41 +16606,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk="no" + ac_cv_imap_tk="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "${ac_cv_imap_tk}" = "yes"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "c-client.h" void mm_searched (MAILSTREAM *stream,unsigned long number) @@ -25746,46 +16674,25 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk2006="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk2006="no" + ac_cv_imap_tk2006="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" if test "${ac_cv_imap_tk}" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if test "${switch_to_system_on_failure}" = "yes"; then IMAP_TK_DIR="system" else #This means they specified a directory. Search for a package installation there too - { echo "$as_me:$LINENO: checking for system c-client library..." >&5 -echo $ECHO_N "checking for system c-client library...... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for system c-client library..." >&5 +$as_echo_n "checking for system c-client library...... " >&6; } CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" imap_include="-I${IMAP_TK_DIR}/include" @@ -25793,11 +16700,7 @@ echo $ECHO_N "checking for system c-client library...... $ECHO_C" >&6; } imap_libs="-lc-client" CPPFLAGS="${CPPFLAGS} ${imap_include}" LIBS="${LIBS} ${imap_libs} ${imap_ldflags}" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "c-client.h" void mm_searched (MAILSTREAM *stream,unsigned long number) @@ -25856,41 +16759,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk="no" + ac_cv_imap_tk="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "${ac_cv_imap_tk}" = "yes"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "c-client.h" void mm_searched (MAILSTREAM *stream,unsigned long number) @@ -25949,43 +16827,22 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk2006="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk2006="no" + ac_cv_imap_tk2006="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi fi fi fi if test "${IMAP_TK_DIR}" = "system"; then #We will enter here if user specified "system" or if any of above checks failed - { echo "$as_me:$LINENO: checking for system c-client library..." >&5 -echo $ECHO_N "checking for system c-client library...... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for system c-client library..." >&5 +$as_echo_n "checking for system c-client library...... " >&6; } CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" imap_ldflags="" @@ -25993,11 +16850,7 @@ echo $ECHO_N "checking for system c-client library...... $ECHO_C" >&6; } imap_include="-DUSE_SYSTEM_IMAP" #Try the imap directory first CPPFLAGS="${CPPFLAGS} ${imap_include}" LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> #include <imap/c-client.h> @@ -26057,41 +16910,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk="no" + ac_cv_imap_tk="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "${ac_cv_imap_tk}" = "yes"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> #include <imap/c-client.h> @@ -26151,35 +16979,14 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk2006="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk2006="no" + ac_cv_imap_tk2006="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext else #looking in imap directory didn't work, try c-client imap_ldflags="" imap_libs="-lc-client" @@ -26188,11 +16995,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ LIBS="${saved_libs}" CPPFLAGS="${CPPFLAGS} ${imap_include}" LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> #include <c-client/c-client.h> @@ -26252,41 +17055,16 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk="no" + ac_cv_imap_tk="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "${ac_cv_imap_tk}" = "yes"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> #include <c-client/c-client.h> @@ -26346,59 +17124,34 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_imap_tk2006="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_imap_tk2006="no" + ac_cv_imap_tk2006="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi fi fi if test "${ac_cv_imap_tk}" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` IMAP_TK_INCLUDE="${imap_include}" PBX_IMAP_TK=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_IMAP_TK 1 -_ACEOF +$as_echo "#define HAVE_IMAP_TK 1" >>confdefs.h if test "${ac_cv_imap_tk2006}" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_IMAP_TK2006 1 -_ACEOF +$as_echo "#define HAVE_IMAP_TK2006 1" >>confdefs.h fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" @@ -26421,19 +17174,15 @@ if test "x${PBX_IODBC}" != "x1" -a "${USE_IODBC}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" - as_ac_Lib=`echo "ac_cv_lib_iodbc_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -liodbc" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -liodbc... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_iodbc_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liodbc" >&5 +$as_echo_n "checking for ${pbxfuncname} in -liodbc... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-liodbc ${pbxlibdir} ${PTHREAD_LIBS} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -26451,40 +17200,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_IODBC_FOUND=yes else AST_IODBC_FOUND=no @@ -26506,137 +17235,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${IODBC_INCLUDE}" - if test "${ac_cv_header_sql_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sql_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sql.h usability" >&5 -echo $ECHO_N "checking sql.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sql.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sql.h presence" >&5 -echo $ECHO_N "checking sql.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sql.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sql.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sql.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sql.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sql.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sql.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sql_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sql_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } - -fi -if test $ac_cv_header_sql_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default" +if test "x$ac_cv_header_sql_h" = x""yes; then : IODBC_HEADER_FOUND=1 else IODBC_HEADER_FOUND=0 @@ -26680,19 +17280,15 @@ if test "x${PBX_INOTIFY}" != "x1" -a "${USE_INOTIFY}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lc" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lc... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lc ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -26710,40 +17306,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_INOTIFY_FOUND=yes else AST_INOTIFY_FOUND=no @@ -26765,137 +17341,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${INOTIFY_INCLUDE}" - if test "${ac_cv_header_sys_inotify_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/inotify.h" >&5 -echo $ECHO_N "checking for sys/inotify.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_inotify_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_inotify_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/inotify.h usability" >&5 -echo $ECHO_N "checking sys/inotify.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sys/inotify.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/inotify.h presence" >&5 -echo $ECHO_N "checking sys/inotify.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/inotify.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/inotify.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/inotify.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/inotify.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/inotify.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/inotify.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/inotify.h" >&5 -echo $ECHO_N "checking for sys/inotify.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_inotify_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_inotify_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_inotify_h" >&6; } - -fi -if test $ac_cv_header_sys_inotify_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_inotify_h" = x""yes; then : INOTIFY_HEADER_FOUND=1 else INOTIFY_HEADER_FOUND=0 @@ -26939,19 +17386,15 @@ if test "x${PBX_JACK}" != "x1" -a "${USE_JACK}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_jack_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ljack" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ljack... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_jack_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ljack" >&5 +$as_echo_n "checking for ${pbxfuncname} in -ljack... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljack ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -26969,40 +17412,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_JACK_FOUND=yes else AST_JACK_FOUND=no @@ -27024,137 +17447,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE}" - if test "${ac_cv_header_jack_jack_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jack/jack.h" >&5 -echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jack_jack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jack_jack_h" >&5 -echo "${ECHO_T}$ac_cv_header_jack_jack_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking jack/jack.h usability" >&5 -echo $ECHO_N "checking jack/jack.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <jack/jack.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking jack/jack.h presence" >&5 -echo $ECHO_N "checking jack/jack.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <jack/jack.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: jack/jack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jack/jack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jack/jack.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jack/jack.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jack/jack.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jack/jack.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jack/jack.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jack/jack.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jack/jack.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jack/jack.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jack/jack.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for jack/jack.h" >&5 -echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6; } -if test "${ac_cv_header_jack_jack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_jack_jack_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jack_jack_h" >&5 -echo "${ECHO_T}$ac_cv_header_jack_jack_h" >&6; } - -fi -if test $ac_cv_header_jack_jack_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "jack/jack.h" "ac_cv_header_jack_jack_h" "$ac_includes_default" +if test "x$ac_cv_header_jack_jack_h" = x""yes; then : JACK_HEADER_FOUND=1 else JACK_HEADER_FOUND=0 @@ -27199,19 +17493,15 @@ if test "x${PBX_LTDL}" != "x1" -a "${USE_LTDL}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ltdl_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lltdl" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lltdl... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ltdl_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lltdl" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lltdl... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lltdl ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -27229,40 +17519,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_LTDL_FOUND=yes else AST_LTDL_FOUND=no @@ -27284,137 +17554,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE}" - if test "${ac_cv_header_ltdl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ltdl.h" >&5 -echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ltdl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5 -echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ltdl.h usability" >&5 -echo $ECHO_N "checking ltdl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <ltdl.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ltdl.h presence" >&5 -echo $ECHO_N "checking ltdl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ltdl.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ltdl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ltdl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ltdl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ltdl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ltdl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ltdl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ltdl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ltdl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ltdl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ltdl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ltdl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ltdl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ltdl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ltdl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ltdl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ltdl.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ltdl.h" >&5 -echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ltdl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ltdl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5 -echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; } - -fi -if test $ac_cv_header_ltdl_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default" +if test "x$ac_cv_header_ltdl_h" = x""yes; then : LTDL_HEADER_FOUND=1 else LTDL_HEADER_FOUND=0 @@ -27458,19 +17599,15 @@ if test "x${PBX_LDAP}" != "x1" -a "${USE_LDAP}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ldap_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lldap" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lldap... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ldap_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lldap" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lldap... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -27488,40 +17625,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_LDAP_FOUND=yes else AST_LDAP_FOUND=no @@ -27543,137 +17660,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE}" - if test "${ac_cv_header_ldap_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ldap.h" >&5 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ldap_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5 -echo "${ECHO_T}$ac_cv_header_ldap_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ldap.h usability" >&5 -echo $ECHO_N "checking ldap.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <ldap.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ldap.h presence" >&5 -echo $ECHO_N "checking ldap.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ldap.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ldap.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ldap.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ldap.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ldap.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ldap.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ldap.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ldap.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ldap.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ldap.h" >&5 -echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ldap_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ldap_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5 -echo "${ECHO_T}$ac_cv_header_ldap_h" >&6; } - -fi -if test $ac_cv_header_ldap_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" +if test "x$ac_cv_header_ldap_h" = x""yes; then : LDAP_HEADER_FOUND=1 else LDAP_HEADER_FOUND=0 @@ -27701,13 +17689,11 @@ fi # Check whether --enable-xmldoc was given. -if test "${enable_xmldoc+set}" = set; then +if test "${enable_xmldoc+set}" = set; then : enableval=$enable_xmldoc; case "${enableval}" in y|ye|yes) disable_xmldoc=no ;; n|no) disable_xmldoc=yes ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-xmldoc" >&5 -echo "$as_me: error: bad value ${enableval} for --disable-xmldoc" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --disable-xmldoc" "$LINENO" 5 ;; esac else disable_xmldoc=no @@ -27721,10 +17707,10 @@ if test "${disable_xmldoc}" != "yes"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}xml2-config", so it can be a program name with args. set dummy ${ac_tool_prefix}xml2-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CONFIG_LIBXML2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CONFIG_LIBXML2+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $CONFIG_LIBXML2 in [\\/]* | ?:[\\/]*) @@ -27737,14 +17723,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CONFIG_LIBXML2="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -27752,11 +17738,11 @@ esac fi CONFIG_LIBXML2=$ac_cv_path_CONFIG_LIBXML2 if test -n "$CONFIG_LIBXML2"; then - { echo "$as_me:$LINENO: result: $CONFIG_LIBXML2" >&5 -echo "${ECHO_T}$CONFIG_LIBXML2" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_LIBXML2" >&5 +$as_echo "$CONFIG_LIBXML2" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -27765,10 +17751,10 @@ if test -z "$ac_cv_path_CONFIG_LIBXML2"; then ac_pt_CONFIG_LIBXML2=$CONFIG_LIBXML2 # Extract the first word of "xml2-config", so it can be a program name with args. set dummy xml2-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_CONFIG_LIBXML2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_CONFIG_LIBXML2+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_CONFIG_LIBXML2 in [\\/]* | ?:[\\/]*) @@ -27781,14 +17767,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CONFIG_LIBXML2="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -27796,11 +17782,11 @@ esac fi ac_pt_CONFIG_LIBXML2=$ac_cv_path_ac_pt_CONFIG_LIBXML2 if test -n "$ac_pt_CONFIG_LIBXML2"; then - { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_LIBXML2" >&5 -echo "${ECHO_T}$ac_pt_CONFIG_LIBXML2" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_LIBXML2" >&5 +$as_echo "$ac_pt_CONFIG_LIBXML2" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_CONFIG_LIBXML2" = x; then @@ -27808,12 +17794,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CONFIG_LIBXML2=$ac_pt_CONFIG_LIBXML2 @@ -27838,13 +17820,9 @@ fi saved_libs="${LIBS}" LIBS="${LIBXML2_LIB}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <libxml/tree.h> + #include <libxml/tree.h> #include <libxml/parser.h> int main () @@ -27855,61 +17833,33 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : PBX_LIBXML2=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXML2 1 -_ACEOF - - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" else PBX_LIBXML2=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXML2 1 -_ACEOF +$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h fi fi fi if test "${PBX_LIBXML2}" != 1; then - { echo "$as_me:$LINENO: *** XML documentation will not be available because the 'libxml2' development package is missing." >&5 -echo "$as_me: *** XML documentation will not be available because the 'libxml2' development package is missing." >&6;} - { echo "$as_me:$LINENO: *** Please run the 'configure' script with the '--disable-xmldoc' parameter option" >&5 -echo "$as_me: *** Please run the 'configure' script with the '--disable-xmldoc' parameter option" >&6;} - { echo "$as_me:$LINENO: *** or install the 'libxml2' development package." >&5 -echo "$as_me: *** or install the 'libxml2' development package." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** XML documentation will not be available because the 'libxml2' development package is missing." >&5 +$as_echo "$as_me: *** XML documentation will not be available because the 'libxml2' development package is missing." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Please run the 'configure' script with the '--disable-xmldoc' parameter option" >&5 +$as_echo "$as_me: *** Please run the 'configure' script with the '--disable-xmldoc' parameter option" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** or install the 'libxml2' development package." >&5 +$as_echo "$as_me: *** or install the 'libxml2' development package." >&6;} exit 1 fi fi @@ -27931,19 +17881,15 @@ if test "x${PBX_MISDN}" != "x1" -a "${USE_MISDN}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_mISDN_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lmISDN" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lmISDN... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_mISDN_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lmISDN" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lmISDN... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmISDN ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -27961,40 +17907,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_MISDN_FOUND=yes else AST_MISDN_FOUND=no @@ -28016,137 +17942,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE}" - if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for mISDNuser/mISDNlib.h" >&5 -echo $ECHO_N "checking for mISDNuser/mISDNlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mISDNuser_mISDNlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_mISDNuser_mISDNlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking mISDNuser/mISDNlib.h usability" >&5 -echo $ECHO_N "checking mISDNuser/mISDNlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <mISDNuser/mISDNlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking mISDNuser/mISDNlib.h presence" >&5 -echo $ECHO_N "checking mISDNuser/mISDNlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <mISDNuser/mISDNlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/mISDNlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mISDNuser/mISDNlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for mISDNuser/mISDNlib.h" >&5 -echo $ECHO_N "checking for mISDNuser/mISDNlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_mISDNuser_mISDNlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mISDNuser_mISDNlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_mISDNuser_mISDNlib_h" >&6; } - -fi -if test $ac_cv_header_mISDNuser_mISDNlib_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/mISDNlib.h" "ac_cv_header_mISDNuser_mISDNlib_h" "$ac_includes_default" +if test "x$ac_cv_header_mISDNuser_mISDNlib_h" = x""yes; then : MISDN_HEADER_FOUND=1 else MISDN_HEADER_FOUND=0 @@ -28191,19 +17988,15 @@ if test "x${PBX_ISDNNET}" != "x1" -a "${USE_ISDNNET}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_isdnnet_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lisdnnet" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lisdnnet... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_isdnnet_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lisdnnet" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lisdnnet... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lisdnnet ${pbxlibdir} -lmISDN -lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -28221,40 +18014,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_ISDNNET_FOUND=yes else AST_ISDNNET_FOUND=no @@ -28276,137 +18049,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE}" - if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then - { echo "$as_me:$LINENO: checking for mISDNuser/isdn_net.h" >&5 -echo $ECHO_N "checking for mISDNuser/isdn_net.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mISDNuser_isdn_net_h" >&5 -echo "${ECHO_T}$ac_cv_header_mISDNuser_isdn_net_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking mISDNuser/isdn_net.h usability" >&5 -echo $ECHO_N "checking mISDNuser/isdn_net.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <mISDNuser/isdn_net.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking mISDNuser/isdn_net.h presence" >&5 -echo $ECHO_N "checking mISDNuser/isdn_net.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <mISDNuser/isdn_net.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/isdn_net.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mISDNuser/isdn_net.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for mISDNuser/isdn_net.h" >&5 -echo $ECHO_N "checking for mISDNuser/isdn_net.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_mISDNuser_isdn_net_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mISDNuser_isdn_net_h" >&5 -echo "${ECHO_T}$ac_cv_header_mISDNuser_isdn_net_h" >&6; } - -fi -if test $ac_cv_header_mISDNuser_isdn_net_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/isdn_net.h" "ac_cv_header_mISDNuser_isdn_net_h" "$ac_includes_default" +if test "x$ac_cv_header_mISDNuser_isdn_net_h" = x""yes; then : ISDNNET_HEADER_FOUND=1 else ISDNNET_HEADER_FOUND=0 @@ -28449,19 +18093,15 @@ if test "x${PBX_SUPPSERV}" != "x1" -a "${USE_SUPPSERV}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_suppserv_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsuppserv" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lsuppserv... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_suppserv_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsuppserv" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lsuppserv... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsuppserv ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -28479,40 +18119,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SUPPSERV_FOUND=yes else AST_SUPPSERV_FOUND=no @@ -28534,137 +18154,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE}" - if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then - { echo "$as_me:$LINENO: checking for mISDNuser/suppserv.h" >&5 -echo $ECHO_N "checking for mISDNuser/suppserv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mISDNuser_suppserv_h" >&5 -echo "${ECHO_T}$ac_cv_header_mISDNuser_suppserv_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking mISDNuser/suppserv.h usability" >&5 -echo $ECHO_N "checking mISDNuser/suppserv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <mISDNuser/suppserv.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking mISDNuser/suppserv.h presence" >&5 -echo $ECHO_N "checking mISDNuser/suppserv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <mISDNuser/suppserv.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mISDNuser/suppserv.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mISDNuser/suppserv.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for mISDNuser/suppserv.h" >&5 -echo $ECHO_N "checking for mISDNuser/suppserv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_mISDNuser_suppserv_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mISDNuser_suppserv_h" >&5 -echo "${ECHO_T}$ac_cv_header_mISDNuser_suppserv_h" >&6; } - -fi -if test $ac_cv_header_mISDNuser_suppserv_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/suppserv.h" "ac_cv_header_mISDNuser_suppserv_h" "$ac_includes_default" +if test "x$ac_cv_header_mISDNuser_suppserv_h" = x""yes; then : SUPPSERV_HEADER_FOUND=1 else SUPPSERV_HEADER_FOUND=0 @@ -28692,21 +18183,17 @@ fi if test "x${PBX_MISDN_FAC_RESULT}" != "x1"; then - { echo "$as_me:$LINENO: checking for Fac_RESULT in mISDNuser/suppserv.h" >&5 -echo $ECHO_N "checking for Fac_RESULT in mISDNuser/suppserv.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fac_RESULT in mISDNuser/suppserv.h" >&5 +$as_echo_n "checking for Fac_RESULT in mISDNuser/suppserv.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${MISDN_FAC_RESULT_DIR}" != "x"; then MISDN_FAC_RESULT_INCLUDE="-I${MISDN_FAC_RESULT_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${MISDN_FAC_RESULT_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <mISDNuser/suppserv.h> + #include <mISDNuser/suppserv.h> int main () { @@ -28721,42 +18208,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_MISDN_FAC_RESULT=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_MISDN_FAC_RESULT 1 -_ACEOF +$as_echo "#define HAVE_MISDN_FAC_RESULT 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -28764,21 +18229,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_MISDN_FAC_ERROR}" != "x1"; then - { echo "$as_me:$LINENO: checking for Fac_ERROR in mISDNuser/suppserv.h" >&5 -echo $ECHO_N "checking for Fac_ERROR in mISDNuser/suppserv.h... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fac_ERROR in mISDNuser/suppserv.h" >&5 +$as_echo_n "checking for Fac_ERROR in mISDNuser/suppserv.h... " >&6; } saved_cppflags="${CPPFLAGS}" if test "x${MISDN_FAC_ERROR_DIR}" != "x"; then MISDN_FAC_ERROR_INCLUDE="-I${MISDN_FAC_ERROR_DIR}/include" fi CPPFLAGS="${CPPFLAGS} ${MISDN_FAC_ERROR_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <mISDNuser/suppserv.h> + #include <mISDNuser/suppserv.h> int main () { @@ -28793,178 +18254,27 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_MISDN_FAC_ERROR=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_MISDN_FAC_ERROR 1 -_ACEOF +$as_echo "#define HAVE_MISDN_FAC_ERROR 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi - if test "${ac_cv_header_linux_mISDNdsp_h+set}" = set; then - { echo "$as_me:$LINENO: checking for linux/mISDNdsp.h" >&5 -echo $ECHO_N "checking for linux/mISDNdsp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_mISDNdsp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_mISDNdsp_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_mISDNdsp_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking linux/mISDNdsp.h usability" >&5 -echo $ECHO_N "checking linux/mISDNdsp.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <linux/mISDNdsp.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking linux/mISDNdsp.h presence" >&5 -echo $ECHO_N "checking linux/mISDNdsp.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <linux/mISDNdsp.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/mISDNdsp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: linux/mISDNdsp.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for linux/mISDNdsp.h" >&5 -echo $ECHO_N "checking for linux/mISDNdsp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_mISDNdsp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_linux_mISDNdsp_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_mISDNdsp_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_mISDNdsp_h" >&6; } - -fi -if test $ac_cv_header_linux_mISDNdsp_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "linux/mISDNdsp.h" "ac_cv_header_linux_mISDNdsp_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_mISDNdsp_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define MISDN_1_2 1 @@ -28992,19 +18302,15 @@ if test "x${PBX_NBS}" != "x1" -a "${USE_NBS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_nbs_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lnbs" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lnbs... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_nbs_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnbs" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lnbs... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnbs ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29022,40 +18328,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_NBS_FOUND=yes else AST_NBS_FOUND=no @@ -29077,137 +18363,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE}" - if test "${ac_cv_header_nbs_h+set}" = set; then - { echo "$as_me:$LINENO: checking for nbs.h" >&5 -echo $ECHO_N "checking for nbs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_nbs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_nbs_h" >&5 -echo "${ECHO_T}$ac_cv_header_nbs_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking nbs.h usability" >&5 -echo $ECHO_N "checking nbs.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <nbs.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking nbs.h presence" >&5 -echo $ECHO_N "checking nbs.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <nbs.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: nbs.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: nbs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: nbs.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: nbs.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: nbs.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: nbs.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: nbs.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: nbs.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: nbs.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: nbs.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: nbs.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: nbs.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: nbs.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: nbs.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: nbs.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: nbs.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for nbs.h" >&5 -echo $ECHO_N "checking for nbs.h... $ECHO_C" >&6; } -if test "${ac_cv_header_nbs_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_nbs_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_nbs_h" >&5 -echo "${ECHO_T}$ac_cv_header_nbs_h" >&6; } - -fi -if test $ac_cv_header_nbs_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "nbs.h" "ac_cv_header_nbs_h" "$ac_includes_default" +if test "x$ac_cv_header_nbs_h" = x""yes; then : NBS_HEADER_FOUND=1 else NBS_HEADER_FOUND=0 @@ -29251,19 +18408,15 @@ if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lncurses" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lncurses... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lncurses" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lncurses... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29281,40 +18434,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_NCURSES_FOUND=yes else AST_NCURSES_FOUND=no @@ -29336,137 +18469,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}" - if test "${ac_cv_header_curses_h+set}" = set; then - { echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking curses.h usability" >&5 -echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <curses.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking curses.h presence" >&5 -echo $ECHO_N "checking curses.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <curses.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: curses.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_curses_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } - -fi -if test $ac_cv_header_curses_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" +if test "x$ac_cv_header_curses_h" = x""yes; then : NCURSES_HEADER_FOUND=1 else NCURSES_HEADER_FOUND=0 @@ -29499,10 +18503,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}net-snmp-config", so it can be a program name with args. set dummy ${ac_tool_prefix}net-snmp-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CONFIG_NETSNMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CONFIG_NETSNMP+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $CONFIG_NETSNMP in [\\/]* | ?:[\\/]*) @@ -29515,14 +18519,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CONFIG_NETSNMP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -29530,11 +18534,11 @@ esac fi CONFIG_NETSNMP=$ac_cv_path_CONFIG_NETSNMP if test -n "$CONFIG_NETSNMP"; then - { echo "$as_me:$LINENO: result: $CONFIG_NETSNMP" >&5 -echo "${ECHO_T}$CONFIG_NETSNMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NETSNMP" >&5 +$as_echo "$CONFIG_NETSNMP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -29543,10 +18547,10 @@ if test -z "$ac_cv_path_CONFIG_NETSNMP"; then ac_pt_CONFIG_NETSNMP=$CONFIG_NETSNMP # Extract the first word of "net-snmp-config", so it can be a program name with args. set dummy net-snmp-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_CONFIG_NETSNMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_CONFIG_NETSNMP+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_CONFIG_NETSNMP in [\\/]* | ?:[\\/]*) @@ -29559,14 +18563,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CONFIG_NETSNMP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -29574,11 +18578,11 @@ esac fi ac_pt_CONFIG_NETSNMP=$ac_cv_path_ac_pt_CONFIG_NETSNMP if test -n "$ac_pt_CONFIG_NETSNMP"; then - { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_NETSNMP" >&5 -echo "${ECHO_T}$ac_pt_CONFIG_NETSNMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NETSNMP" >&5 +$as_echo "$ac_pt_CONFIG_NETSNMP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_CONFIG_NETSNMP" = x; then @@ -29586,12 +18590,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CONFIG_NETSNMP=$ac_pt_CONFIG_NETSNMP @@ -29617,13 +18617,9 @@ fi saved_libs="${LIBS}" LIBS="${NETSNMP_LIB}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <net-snmp/net-snmp-config.h> + #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> #include <net-snmp/agent/net-snmp-agent-includes.h> int @@ -29635,49 +18631,21 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : PBX_NETSNMP=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_NETSNMP 1 -_ACEOF - - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" else PBX_NETSNMP=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_NETSNMP 1 -_ACEOF +$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h fi fi @@ -29701,19 +18669,15 @@ if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lnewt" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lnewt... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnewt" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lnewt... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnewt ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29731,40 +18695,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_NEWT_FOUND=yes else AST_NEWT_FOUND=no @@ -29786,137 +18730,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}" - if test "${ac_cv_header_newt_h+set}" = set; then - { echo "$as_me:$LINENO: checking for newt.h" >&5 -echo $ECHO_N "checking for newt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_newt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_newt_h" >&5 -echo "${ECHO_T}$ac_cv_header_newt_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking newt.h usability" >&5 -echo $ECHO_N "checking newt.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <newt.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking newt.h presence" >&5 -echo $ECHO_N "checking newt.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <newt.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: newt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: newt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: newt.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: newt.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: newt.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: newt.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: newt.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: newt.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: newt.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: newt.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: newt.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: newt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: newt.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: newt.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: newt.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: newt.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for newt.h" >&5 -echo $ECHO_N "checking for newt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_newt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_newt_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_newt_h" >&5 -echo "${ECHO_T}$ac_cv_header_newt_h" >&6; } - -fi -if test $ac_cv_header_newt_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default" +if test "x$ac_cv_header_newt_h" = x""yes; then : NEWT_HEADER_FOUND=1 else NEWT_HEADER_FOUND=0 @@ -29960,19 +18775,15 @@ if test "x${PBX_UNIXODBC}" != "x1" -a "${USE_UNIXODBC}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_odbc_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lodbc" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lodbc... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_odbc_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lodbc" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lodbc... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lodbc ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -29990,40 +18801,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_UNIXODBC_FOUND=yes else AST_UNIXODBC_FOUND=no @@ -30045,137 +18836,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE}" - if test "${ac_cv_header_sql_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sql_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sql.h usability" >&5 -echo $ECHO_N "checking sql.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sql.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sql.h presence" >&5 -echo $ECHO_N "checking sql.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sql.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sql.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sql.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sql.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sql.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sql.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sql_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sql_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } - -fi -if test $ac_cv_header_sql_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default" +if test "x$ac_cv_header_sql_h" = x""yes; then : UNIXODBC_HEADER_FOUND=1 else UNIXODBC_HEADER_FOUND=0 @@ -30219,19 +18881,15 @@ if test "x${PBX_OGG}" != "x1" -a "${USE_OGG}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ogg_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -logg" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -logg... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ogg_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -logg" >&5 +$as_echo_n "checking for ${pbxfuncname} in -logg... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-logg ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -30249,40 +18907,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_OGG_FOUND=yes else AST_OGG_FOUND=no @@ -30304,137 +18942,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}" - if test "${ac_cv_header_+set}" = set; then - { echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking usability" >&5 -echo $ECHO_N "checking usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking presence" >&5 -echo $ECHO_N "checking presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: : proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: : present but cannot be compiled" >&5 -echo "$as_me: WARNING: : present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: : check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: : check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: : see the Autoconf documentation" >&5 -echo "$as_me: WARNING: : see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: : section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: : section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } - -fi -if test $ac_cv_header_ = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" +if test "x$ac_cv_header_" = x""yes; then : OGG_HEADER_FOUND=1 else OGG_HEADER_FOUND=0 @@ -30479,19 +18988,15 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_execinfo_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lexecinfo" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lexecinfo... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_execinfo_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lexecinfo" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lexecinfo... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexecinfo ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -30509,40 +19014,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_BKTR_FOUND=yes else AST_BKTR_FOUND=no @@ -30564,137 +19049,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}" - if test "${ac_cv_header_execinfo_h+set}" = set; then - { echo "$as_me:$LINENO: checking for execinfo.h" >&5 -echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; } -if test "${ac_cv_header_execinfo_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_execinfo_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking execinfo.h usability" >&5 -echo $ECHO_N "checking execinfo.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <execinfo.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking execinfo.h presence" >&5 -echo $ECHO_N "checking execinfo.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <execinfo.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: execinfo.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: execinfo.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: execinfo.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: execinfo.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: execinfo.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: execinfo.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: execinfo.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for execinfo.h" >&5 -echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; } -if test "${ac_cv_header_execinfo_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_execinfo_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_execinfo_h" >&6; } - -fi -if test $ac_cv_header_execinfo_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_execinfo_h" = x""yes; then : BKTR_HEADER_FOUND=1 else BKTR_HEADER_FOUND=0 @@ -30738,19 +19094,15 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lc" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lc... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lc ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -30768,40 +19120,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_BKTR_FOUND=yes else AST_BKTR_FOUND=no @@ -30823,137 +19155,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}" - if test "${ac_cv_header_execinfo_h+set}" = set; then - { echo "$as_me:$LINENO: checking for execinfo.h" >&5 -echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; } -if test "${ac_cv_header_execinfo_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_execinfo_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking execinfo.h usability" >&5 -echo $ECHO_N "checking execinfo.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <execinfo.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking execinfo.h presence" >&5 -echo $ECHO_N "checking execinfo.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <execinfo.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: execinfo.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: execinfo.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: execinfo.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: execinfo.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: execinfo.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: execinfo.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: execinfo.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: execinfo.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for execinfo.h" >&5 -echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; } -if test "${ac_cv_header_execinfo_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_execinfo_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_execinfo_h" >&6; } - -fi -if test $ac_cv_header_execinfo_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_execinfo_h" = x""yes; then : BKTR_HEADER_FOUND=1 else BKTR_HEADER_FOUND=0 @@ -30998,19 +19201,15 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lossaudio" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lossaudio... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lossaudio ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31028,40 +19227,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_OSS_FOUND=yes else AST_OSS_FOUND=no @@ -31083,137 +19262,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" - if test "${ac_cv_header_linux_soundcard_h+set}" = set; then - { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 -echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5 -echo $ECHO_N "checking linux/soundcard.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <linux/soundcard.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5 -echo $ECHO_N "checking linux/soundcard.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <linux/soundcard.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 -echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_linux_soundcard_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; } - -fi -if test $ac_cv_header_linux_soundcard_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_soundcard_h" = x""yes; then : OSS_HEADER_FOUND=1 else OSS_HEADER_FOUND=0 @@ -31256,19 +19306,15 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lossaudio" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lossaudio... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lossaudio ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31286,40 +19332,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_OSS_FOUND=yes else AST_OSS_FOUND=no @@ -31341,137 +19367,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" - if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5 -echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sys/soundcard.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5 -echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/soundcard.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5 -echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_soundcard_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; } - -fi -if test $ac_cv_header_sys_soundcard_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then : OSS_HEADER_FOUND=1 else OSS_HEADER_FOUND=0 @@ -31514,19 +19411,15 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lossaudio" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lossaudio... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lossaudio ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -31544,40 +19437,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_OSS_FOUND=yes else AST_OSS_FOUND=no @@ -31599,137 +19472,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" - if test "${ac_cv_header_soundcard_h+set}" = set; then - { echo "$as_me:$LINENO: checking for soundcard.h" >&5 -echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_soundcard_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking soundcard.h usability" >&5 -echo $ECHO_N "checking soundcard.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <soundcard.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking soundcard.h presence" >&5 -echo $ECHO_N "checking soundcard.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <soundcard.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: soundcard.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: soundcard.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: soundcard.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: soundcard.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: soundcard.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: soundcard.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: soundcard.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: soundcard.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for soundcard.h" >&5 -echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; } -if test "${ac_cv_header_soundcard_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_soundcard_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_soundcard_h" >&5 -echo "${ECHO_T}$ac_cv_header_soundcard_h" >&6; } - -fi -if test $ac_cv_header_soundcard_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "soundcard.h" "ac_cv_header_soundcard_h" "$ac_includes_default" +if test "x$ac_cv_header_soundcard_h" = x""yes; then : OSS_HEADER_FOUND=1 else OSS_HEADER_FOUND=0 @@ -31762,10 +19506,10 @@ if test "${USE_PGSQL}" != "no"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args. set dummy ${ac_tool_prefix}pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $PG_CONFIG in [\\/]* | ?:[\\/]*) @@ -31777,14 +19521,14 @@ for as_dir in ${PGSQL_DIR}/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -31792,11 +19536,11 @@ esac fi PG_CONFIG=$ac_cv_path_PG_CONFIG if test -n "$PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 -echo "${ECHO_T}$PG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 +$as_echo "$PG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -31805,10 +19549,10 @@ if test -z "$ac_cv_path_PG_CONFIG"; then ac_pt_PG_CONFIG=$PG_CONFIG # Extract the first word of "pg_config", so it can be a program name with args. set dummy pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_PG_CONFIG in [\\/]* | ?:[\\/]*) @@ -31820,14 +19564,14 @@ for as_dir in ${PGSQL_DIR}/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -31835,11 +19579,11 @@ esac fi ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG if test -n "$ac_pt_PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PG_CONFIG" >&5 +$as_echo "$ac_pt_PG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PG_CONFIG" = x; then @@ -31847,12 +19591,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PG_CONFIG=$ac_pt_PG_CONFIG @@ -31862,26 +19602,26 @@ else fi if test x"${PG_CONFIG}" = xNo; then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** pg_config was not found in the path you specified:" >&5 -echo "$as_me: *** pg_config was not found in the path you specified:" >&6;} - { echo "$as_me:$LINENO: *** ${PGSQL_DIR}/bin" >&5 -echo "$as_me: *** ${PGSQL_DIR}/bin" >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-postgres" >&5 -echo "$as_me: *** including --without-postgres" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5 +$as_echo "$as_me: ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** pg_config was not found in the path you specified:" >&5 +$as_echo "$as_me: *** pg_config was not found in the path you specified:" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** ${PGSQL_DIR}/bin" >&5 +$as_echo "$as_me: *** ${PGSQL_DIR}/bin" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5 +$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5 +$as_echo "$as_me: *** including --without-postgres" >&6;} exit 1 fi else if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args. set dummy ${ac_tool_prefix}pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $PG_CONFIG in [\\/]* | ?:[\\/]*) @@ -31893,14 +19633,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -31908,11 +19648,11 @@ esac fi PG_CONFIG=$ac_cv_path_PG_CONFIG if test -n "$PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 -echo "${ECHO_T}$PG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 +$as_echo "$PG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -31921,10 +19661,10 @@ if test -z "$ac_cv_path_PG_CONFIG"; then ac_pt_PG_CONFIG=$PG_CONFIG # Extract the first word of "pg_config", so it can be a program name with args. set dummy pg_config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_PG_CONFIG in [\\/]* | ?:[\\/]*) @@ -31936,14 +19676,14 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -31951,11 +19691,11 @@ esac fi ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG if test -n "$ac_pt_PG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PG_CONFIG" >&5 +$as_echo "$ac_pt_PG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PG_CONFIG" = x; then @@ -31963,12 +19703,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PG_CONFIG=$ac_pt_PG_CONFIG @@ -31984,29 +19720,25 @@ if test "${PG_CONFIG}" != No; then PGSQL_includedir=`${PG_CONFIG} --includedir` if test "x$?" != "x0" ; then if test -n "${PGSQL_MANDATORY}" ; then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 -echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-postgres" >&5 -echo "$as_me: *** including --without-postgres" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5 +$as_echo "$as_me: ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** The PostgreSQL installation on this system appears to be broken." >&5 +$as_echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5 +$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5 +$as_echo "$as_me: *** including --without-postgres" >&6;} exit 1 fi else - { echo "$as_me:$LINENO: checking for PQescapeStringConn in -lpq" >&5 -echo $ECHO_N "checking for PQescapeStringConn in -lpq... $ECHO_C" >&6; } -if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5 +$as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; } +if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpq -L${PGSQL_libdir} -lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32024,39 +19756,18 @@ return PQescapeStringConn (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pq_PQescapeStringConn=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pq_PQescapeStringConn=no + ac_cv_lib_pq_PQescapeStringConn=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeStringConn" >&5 -echo "${ECHO_T}$ac_cv_lib_pq_PQescapeStringConn" >&6; } -if test $ac_cv_lib_pq_PQescapeStringConn = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5 +$as_echo "$ac_cv_lib_pq_PQescapeStringConn" >&6; } +if test "x$ac_cv_lib_pq_PQescapeStringConn" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PGSQL 1 @@ -32065,20 +19776,54 @@ _ACEOF fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char within Postgres headers" >&5 +$as_echo_n "checking for pg_encoding_to_char within Postgres headers... " >&6; } + old_CFLAGS=${CFLAGS} + CFLAGS="${CFLAGS} -I${PGSQL_includedir} -Werror" + old_LDFLAGS=${LDFLAGS} + LDFLAGS="${LDFLAGS} -L${PGSQL_libdir} -lpq -lz" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <libpq-fe.h> +int +main () +{ +const char *foo = pg_encoding_to_char(1) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<_ACEOF +#define HAVE_PGSQL_pg_encoding_to_char 1 +_ACEOF + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS=${old_CFLAGS} + LDFLAGS=${old_LDFLAGS} + if test "${ac_cv_lib_pq_PQescapeStringConn}" = "yes"; then PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz" PGSQL_INCLUDE="-I${PGSQL_includedir}" PBX_PGSQL=1 elif test -n "${PGSQL_MANDATORY}"; then - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The PostgreSQL installation on this system appears to be broken." >&5 -echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-postgres" >&5 -echo "$as_me: *** including --without-postgres" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5 +$as_echo "$as_me: ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** The PostgreSQL installation on this system appears to be broken." >&5 +$as_echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5 +$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5 +$as_echo "$as_me: *** including --without-postgres" >&6;} exit 1 fi fi @@ -32101,19 +19846,15 @@ if test "x${PBX_POPT}" != "x1" -a "${USE_POPT}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_popt_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpopt" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lpopt... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_popt_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpopt" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lpopt... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpopt ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32131,40 +19872,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_POPT_FOUND=yes else AST_POPT_FOUND=no @@ -32186,137 +19907,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE}" - if test "${ac_cv_header_popt_h+set}" = set; then - { echo "$as_me:$LINENO: checking for popt.h" >&5 -echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_popt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking popt.h usability" >&5 -echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <popt.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking popt.h presence" >&5 -echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <popt.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for popt.h" >&5 -echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_popt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_popt_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } - -fi -if test $ac_cv_header_popt_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default" +if test "x$ac_cv_header_popt_h" = x""yes; then : POPT_HEADER_FOUND=1 else POPT_HEADER_FOUND=0 @@ -32360,19 +19952,15 @@ if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_portaudio_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lportaudio" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lportaudio... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_portaudio_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lportaudio" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lportaudio... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lportaudio ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32390,40 +19978,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_PORTAUDIO_FOUND=yes else AST_PORTAUDIO_FOUND=no @@ -32445,137 +20013,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE}" - if test "${ac_cv_header_portaudio_h+set}" = set; then - { echo "$as_me:$LINENO: checking for portaudio.h" >&5 -echo $ECHO_N "checking for portaudio.h... $ECHO_C" >&6; } -if test "${ac_cv_header_portaudio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_portaudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_portaudio_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking portaudio.h usability" >&5 -echo $ECHO_N "checking portaudio.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <portaudio.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking portaudio.h presence" >&5 -echo $ECHO_N "checking portaudio.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <portaudio.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: portaudio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: portaudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: portaudio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: portaudio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: portaudio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: portaudio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: portaudio.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: portaudio.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: portaudio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: portaudio.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: portaudio.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for portaudio.h" >&5 -echo $ECHO_N "checking for portaudio.h... $ECHO_C" >&6; } -if test "${ac_cv_header_portaudio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_portaudio_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_portaudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_portaudio_h" >&6; } - -fi -if test $ac_cv_header_portaudio_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "portaudio.h" "ac_cv_header_portaudio_h" "$ac_includes_default" +if test "x$ac_cv_header_portaudio_h" = x""yes; then : PORTAUDIO_HEADER_FOUND=1 else PORTAUDIO_HEADER_FOUND=0 @@ -32619,19 +20058,15 @@ if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32649,40 +20084,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_PRI_FOUND=yes else AST_PRI_FOUND=no @@ -32704,137 +20119,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE}" - if test "${ac_cv_header_libpri_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libpri.h usability" >&5 -echo $ECHO_N "checking libpri.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libpri.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libpri.h presence" >&5 -echo $ECHO_N "checking libpri.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libpri.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libpri_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } - -fi -if test $ac_cv_header_libpri_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" +if test "x$ac_cv_header_libpri_h" = x""yes; then : PRI_HEADER_FOUND=1 else PRI_HEADER_FOUND=0 @@ -32878,19 +20164,15 @@ if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no"; else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -32908,40 +20190,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_PRI_PROG_W_CAUSE_FOUND=yes else AST_PRI_PROG_W_CAUSE_FOUND=no @@ -32963,137 +20225,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_PROG_W_CAUSE_INCLUDE}" - if test "${ac_cv_header_libpri_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libpri.h usability" >&5 -echo $ECHO_N "checking libpri.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libpri.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libpri.h presence" >&5 -echo $ECHO_N "checking libpri.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libpri.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libpri_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } - -fi -if test $ac_cv_header_libpri_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" +if test "x$ac_cv_header_libpri_h" = x""yes; then : PRI_PROG_W_CAUSE_HEADER_FOUND=1 else PRI_PROG_W_CAUSE_HEADER_FOUND=0 @@ -33137,19 +20270,15 @@ if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -33167,40 +20296,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_PRI_INBANDDISCONNECT_FOUND=yes else AST_PRI_INBANDDISCONNECT_FOUND=no @@ -33222,137 +20331,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}" - if test "${ac_cv_header_libpri_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libpri.h usability" >&5 -echo $ECHO_N "checking libpri.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libpri.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libpri.h presence" >&5 -echo $ECHO_N "checking libpri.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libpri.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for libpri.h" >&5 -echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libpri_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libpri_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 -echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } - -fi -if test $ac_cv_header_libpri_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" +if test "x$ac_cv_header_libpri_h" = x""yes; then : PRI_INBANDDISCONNECT_HEADER_FOUND=1 else PRI_INBANDDISCONNECT_HEADER_FOUND=0 @@ -33396,19 +20376,15 @@ if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_resample_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lresample" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lresample... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_resample_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lresample" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lresample... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lresample ${pbxlibdir} -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -33426,40 +20402,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_RESAMPLE_FOUND=yes else AST_RESAMPLE_FOUND=no @@ -33481,137 +20437,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RESAMPLE_INCLUDE}" - if test "${ac_cv_header_libresample_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libresample.h" >&5 -echo $ECHO_N "checking for libresample.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libresample_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libresample_h" >&5 -echo "${ECHO_T}$ac_cv_header_libresample_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libresample.h usability" >&5 -echo $ECHO_N "checking libresample.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libresample.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libresample.h presence" >&5 -echo $ECHO_N "checking libresample.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libresample.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libresample.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libresample.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libresample.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libresample.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libresample.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libresample.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libresample.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libresample.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libresample.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libresample.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libresample.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libresample.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libresample.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libresample.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libresample.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libresample.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for libresample.h" >&5 -echo $ECHO_N "checking for libresample.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libresample_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libresample_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libresample_h" >&5 -echo "${ECHO_T}$ac_cv_header_libresample_h" >&6; } - -fi -if test $ac_cv_header_libresample_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libresample.h" "ac_cv_header_libresample_h" "$ac_includes_default" +if test "x$ac_cv_header_libresample_h" = x""yes; then : RESAMPLE_HEADER_FOUND=1 else RESAMPLE_HEADER_FOUND=0 @@ -33641,19 +20468,19 @@ fi if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then if test "xminimum version of SpanDSP" != "x"; then - { echo "$as_me:$LINENO: checking for minimum version of SpanDSP" >&5 -echo $ECHO_N "checking for minimum version of SpanDSP... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5 +$as_echo_n "checking for minimum version of SpanDSP... " >&6; } else - { echo "$as_me:$LINENO: checking if \" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \" #if SPANDSP_RELEASE_DATE < 20080516 #error \"spandsp 0.0.5 or greater is required\" #endif \" compiles using spandsp/version.h" >&5 -echo $ECHO_N "checking if \" +$as_echo_n "checking if \" #if SPANDSP_RELEASE_DATE < 20080516 #error \"spandsp 0.0.5 or greater is required\" #endif - \" compiles using spandsp/version.h... $ECHO_C" >&6; } + \" compiles using spandsp/version.h... " >&6; } fi saved_cppflags="${CPPFLAGS}" if test "x${SPANDSP_DIR}" != "x"; then @@ -33661,13 +20488,9 @@ echo $ECHO_N "checking if \" fi CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <spandsp/version.h> + #include <spandsp/version.h> int main () { @@ -33681,42 +20504,20 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_SPANDSP=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_SPANDSP 1 -_ACEOF +$as_echo "#define HAVE_SPANDSP 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" fi @@ -33743,19 +20544,15 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspandsp" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lspandsp... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -33773,40 +20570,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SPANDSP_FOUND=yes else AST_SPANDSP_FOUND=no @@ -33828,137 +20605,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" - if test "${ac_cv_header_spandsp_h+set}" = set; then - { echo "$as_me:$LINENO: checking for spandsp.h" >&5 -echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_spandsp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 -echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5 -echo $ECHO_N "checking spandsp.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <spandsp.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking spandsp.h presence" >&5 -echo $ECHO_N "checking spandsp.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <spandsp.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: spandsp.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for spandsp.h" >&5 -echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_spandsp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_spandsp_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 -echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } - -fi -if test $ac_cv_header_spandsp_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default" +if test "x$ac_cv_header_spandsp_h" = x""yes; then : SPANDSP_HEADER_FOUND=1 else SPANDSP_HEADER_FOUND=0 @@ -34006,19 +20654,15 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspandsp" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lspandsp... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -34036,40 +20680,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SPANDSP_FOUND=yes else AST_SPANDSP_FOUND=no @@ -34091,137 +20715,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" - if test "${ac_cv_header_spandsp_h+set}" = set; then - { echo "$as_me:$LINENO: checking for spandsp.h" >&5 -echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_spandsp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 -echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5 -echo $ECHO_N "checking spandsp.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <spandsp.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking spandsp.h presence" >&5 -echo $ECHO_N "checking spandsp.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <spandsp.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: spandsp.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for spandsp.h" >&5 -echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_spandsp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_spandsp_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 -echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } - -fi -if test $ac_cv_header_spandsp_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default" +if test "x$ac_cv_header_spandsp_h" = x""yes; then : SPANDSP_HEADER_FOUND=1 else SPANDSP_HEADER_FOUND=0 @@ -34250,51 +20745,9 @@ fi fi if test "x${PBX_SPANDSP}" = "x1" ; then - { echo "$as_me:$LINENO: checking for spandsp/expose.h" >&5 -echo $ECHO_N "checking for spandsp/expose.h... $ECHO_C" >&6; } -if test "${ac_cv_header_spandsp_expose_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <spandsp.h> - -#include <spandsp/expose.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_spandsp_expose_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_spandsp_expose_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_expose_h" >&5 -echo "${ECHO_T}$ac_cv_header_spandsp_expose_h" >&6; } -if test $ac_cv_header_spandsp_expose_h = yes; then + ac_fn_c_check_header_compile "$LINENO" "spandsp/expose.h" "ac_cv_header_spandsp_expose_h" "#include <spandsp.h> +" +if test "x$ac_cv_header_spandsp_expose_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SPANDSP_EXPOSE_H 1 @@ -34322,19 +20775,15 @@ if test "x${PBX_SS7}" != "x1" -a "${USE_SS7}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ss7_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lss7" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lss7... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ss7_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lss7" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lss7... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lss7 ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -34352,40 +20801,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SS7_FOUND=yes else AST_SS7_FOUND=no @@ -34407,137 +20836,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE}" - if test "${ac_cv_header_libss7_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libss7.h" >&5 -echo $ECHO_N "checking for libss7.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libss7_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libss7_h" >&5 -echo "${ECHO_T}$ac_cv_header_libss7_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libss7.h usability" >&5 -echo $ECHO_N "checking libss7.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <libss7.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libss7.h presence" >&5 -echo $ECHO_N "checking libss7.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libss7.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libss7.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libss7.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libss7.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libss7.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libss7.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libss7.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libss7.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libss7.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libss7.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libss7.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libss7.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libss7.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libss7.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libss7.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libss7.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libss7.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for libss7.h" >&5 -echo $ECHO_N "checking for libss7.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libss7_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libss7_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libss7_h" >&5 -echo "${ECHO_T}$ac_cv_header_libss7_h" >&6; } - -fi -if test $ac_cv_header_libss7_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libss7.h" "ac_cv_header_libss7_h" "$ac_includes_default" +if test "x$ac_cv_header_libss7_h" = x""yes; then : SS7_HEADER_FOUND=1 else SS7_HEADER_FOUND=0 @@ -34581,19 +20881,15 @@ if test "x${PBX_OPENR2}" != "x1" -a "${USE_OPENR2}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_openr2_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lopenr2" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lopenr2... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_openr2_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopenr2" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lopenr2... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lopenr2 ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -34611,40 +20907,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_OPENR2_FOUND=yes else AST_OPENR2_FOUND=no @@ -34666,137 +20942,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENR2_INCLUDE}" - if test "${ac_cv_header_openr2_h+set}" = set; then - { echo "$as_me:$LINENO: checking for openr2.h" >&5 -echo $ECHO_N "checking for openr2.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openr2_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openr2_h" >&5 -echo "${ECHO_T}$ac_cv_header_openr2_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking openr2.h usability" >&5 -echo $ECHO_N "checking openr2.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <openr2.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking openr2.h presence" >&5 -echo $ECHO_N "checking openr2.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <openr2.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: openr2.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: openr2.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: openr2.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: openr2.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: openr2.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: openr2.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: openr2.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: openr2.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: openr2.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: openr2.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: openr2.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: openr2.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: openr2.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: openr2.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: openr2.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: openr2.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for openr2.h" >&5 -echo $ECHO_N "checking for openr2.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openr2_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_openr2_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openr2_h" >&5 -echo "${ECHO_T}$ac_cv_header_openr2_h" >&6; } - -fi -if test $ac_cv_header_openr2_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "openr2.h" "ac_cv_header_openr2_h" "$ac_includes_default" +if test "x$ac_cv_header_openr2_h" = x""yes; then : OPENR2_HEADER_FOUND=1 else OPENR2_HEADER_FOUND=0 @@ -34839,140 +20986,10 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${PWLIBDIR:-unset}" != "unset" ; then - as_ac_Header=`echo "ac_cv_header_${PWLIBDIR}/version.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${PWLIBDIR}/version.h" >&5 -echo $ECHO_N "checking for ${PWLIBDIR}/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${PWLIBDIR}/version.h usability" >&5 -echo $ECHO_N "checking ${PWLIBDIR}/version.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${PWLIBDIR}/version.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${PWLIBDIR}/version.h presence" >&5 -echo $ECHO_N "checking ${PWLIBDIR}/version.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${PWLIBDIR}/version.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/version.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/version.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ${PWLIBDIR}/version.h" >&5 -echo $ECHO_N "checking for ${PWLIBDIR}/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${PWLIBDIR}/version.h" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "${PWLIBDIR}/version.h" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : HAS_PWLIB=1 fi @@ -34980,140 +20997,10 @@ fi fi if test "${HAS_PWLIB:-unset}" = "unset" ; then if test "${OPENH323DIR:-unset}" != "unset"; then - as_ac_Header=`echo "ac_cv_header_${OPENH323DIR}/../pwlib/version.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${OPENH323DIR}/../pwlib/version.h" >&5 -echo $ECHO_N "checking for ${OPENH323DIR}/../pwlib/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${OPENH323DIR}/../pwlib/version.h usability" >&5 -echo $ECHO_N "checking ${OPENH323DIR}/../pwlib/version.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${OPENH323DIR}/../pwlib/version.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${OPENH323DIR}/../pwlib/version.h presence" >&5 -echo $ECHO_N "checking ${OPENH323DIR}/../pwlib/version.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${OPENH323DIR}/../pwlib/version.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/../pwlib/version.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/../pwlib/version.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ${OPENH323DIR}/../pwlib/version.h" >&5 -echo $ECHO_N "checking for ${OPENH323DIR}/../pwlib/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/../pwlib/version.h" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "${OPENH323DIR}/../pwlib/version.h" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : HAS_PWLIB=1 fi @@ -35122,140 +21009,10 @@ fi if test "${HAS_PWLIB:-unset}" != "unset" ; then PWLIBDIR="${OPENH323DIR}/../pwlib" else - as_ac_Header=`echo "ac_cv_header_${HOME}/pwlib/include/ptlib.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${HOME}/pwlib/include/ptlib.h" >&5 -echo $ECHO_N "checking for ${HOME}/pwlib/include/ptlib.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${HOME}/pwlib/include/ptlib.h usability" >&5 -echo $ECHO_N "checking ${HOME}/pwlib/include/ptlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${HOME}/pwlib/include/ptlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${HOME}/pwlib/include/ptlib.h presence" >&5 -echo $ECHO_N "checking ${HOME}/pwlib/include/ptlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${HOME}/pwlib/include/ptlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${HOME}/pwlib/include/ptlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${HOME}/pwlib/include/ptlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ${HOME}/pwlib/include/ptlib.h" >&5 -echo $ECHO_N "checking for ${HOME}/pwlib/include/ptlib.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${HOME}/pwlib/include/ptlib.h" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "${HOME}/pwlib/include/ptlib.h" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : HAS_PWLIB=1 fi @@ -35263,137 +21020,8 @@ fi if test "${HAS_PWLIB:-unset}" != "unset" ; then PWLIBDIR="${HOME}/pwlib" else - if test "${ac_cv_header__usr_local_include_ptlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for /usr/local/include/ptlib.h" >&5 -echo $ECHO_N "checking for /usr/local/include/ptlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header__usr_local_include_ptlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_ptlib_h" >&5 -echo "${ECHO_T}$ac_cv_header__usr_local_include_ptlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking /usr/local/include/ptlib.h usability" >&5 -echo $ECHO_N "checking /usr/local/include/ptlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include </usr/local/include/ptlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking /usr/local/include/ptlib.h presence" >&5 -echo $ECHO_N "checking /usr/local/include/ptlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include </usr/local/include/ptlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/local/include/ptlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: /usr/local/include/ptlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for /usr/local/include/ptlib.h" >&5 -echo $ECHO_N "checking for /usr/local/include/ptlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header__usr_local_include_ptlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header__usr_local_include_ptlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_ptlib_h" >&5 -echo "${ECHO_T}$ac_cv_header__usr_local_include_ptlib_h" >&6; } - -fi -if test $ac_cv_header__usr_local_include_ptlib_h = yes; then + ac_fn_cxx_check_header_mongrel "$LINENO" "/usr/local/include/ptlib.h" "ac_cv_header__usr_local_include_ptlib_h" "$ac_includes_default" +if test "x$ac_cv_header__usr_local_include_ptlib_h" = x""yes; then : HAS_PWLIB=1 fi @@ -35401,10 +21029,10 @@ fi if test "${HAS_PWLIB:-unset}" != "unset" ; then # Extract the first word of "ptlib-config", so it can be a program name with args. set dummy ptlib-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $PTLIB_CONFIG in [\\/]* | ?:[\\/]*) @@ -35416,14 +21044,14 @@ for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -35431,11 +21059,11 @@ esac fi PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG if test -n "$PTLIB_CONFIG"; then - { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 -echo "${ECHO_T}$PTLIB_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTLIB_CONFIG" >&5 +$as_echo "$PTLIB_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -35454,137 +21082,8 @@ fi PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs` PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`" else - if test "${ac_cv_header__usr_include_ptlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for /usr/include/ptlib.h" >&5 -echo $ECHO_N "checking for /usr/include/ptlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header__usr_include_ptlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_ptlib_h" >&5 -echo "${ECHO_T}$ac_cv_header__usr_include_ptlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking /usr/include/ptlib.h usability" >&5 -echo $ECHO_N "checking /usr/include/ptlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include </usr/include/ptlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking /usr/include/ptlib.h presence" >&5 -echo $ECHO_N "checking /usr/include/ptlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include </usr/include/ptlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: /usr/include/ptlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: /usr/include/ptlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for /usr/include/ptlib.h" >&5 -echo $ECHO_N "checking for /usr/include/ptlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header__usr_include_ptlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header__usr_include_ptlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_ptlib_h" >&5 -echo "${ECHO_T}$ac_cv_header__usr_include_ptlib_h" >&6; } - -fi -if test $ac_cv_header__usr_include_ptlib_h = yes; then + ac_fn_cxx_check_header_mongrel "$LINENO" "/usr/include/ptlib.h" "ac_cv_header__usr_include_ptlib_h" "$ac_includes_default" +if test "x$ac_cv_header__usr_include_ptlib_h" = x""yes; then : HAS_PWLIB=1 fi @@ -35592,10 +21091,10 @@ fi if test "${HAS_PWLIB:-unset}" != "unset" ; then # Extract the first word of "ptlib-config", so it can be a program name with args. set dummy ptlib-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PTLIB_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $PTLIB_CONFIG in [\\/]* | ?:[\\/]*) @@ -35607,14 +21106,14 @@ for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -35622,11 +21121,11 @@ esac fi PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG if test -n "$PTLIB_CONFIG"; then - { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 -echo "${ECHO_T}$PTLIB_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTLIB_CONFIG" >&5 +$as_echo "$PTLIB_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -35722,20 +21221,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu let PWLIB_MAX=*10000+*100+ fi - { echo "$as_me:$LINENO: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5 -echo $ECHO_N "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5 +$as_echo_n "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... " >&6; } if test ${PWLIB_VER} -lt ${PWLIB_REQ}; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } unset HAS_PWLIB else if test ${PWLIB_VER} -gt ${PWLIB_MAX}; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } unset HAS_PWLIB else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi fi @@ -35769,8 +21268,8 @@ case "$host_os" in ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ; ;; * ) PWLIB_OSTYPE="$host_os" ; - { echo "$as_me:$LINENO: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&5 -echo "$as_me: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&2;} ; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&5 +$as_echo "$as_me: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&2;} ; ;; esac @@ -35820,8 +21319,8 @@ case "$host_cpu" in ;; * ) PWLIB_MACHTYPE="$host_cpu"; - { echo "$as_me:$LINENO: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&5 -echo "$as_me: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&2;} ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&5 +$as_echo "$as_me: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&2;} ;; esac PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}" @@ -35833,8 +21332,8 @@ PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}" if test "${HAS_PWLIB:-unset}" != "unset"; then - { echo "$as_me:$LINENO: checking PWLib installation validity" >&5 -echo $ECHO_N "checking PWLib installation validity... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking PWLib installation validity" >&5 +$as_echo_n "checking PWLib installation validity... " >&6; } saved_cppflags="${CPPFLAGS}" saved_libs="${LIBS}" @@ -35852,11 +21351,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "ptlib.h" int @@ -35867,41 +21362,20 @@ int q = (int) PTime::IsDaylightSavings(); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_lib_PWLIB="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_cv_lib_PWLIB="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -35926,9 +21400,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi PBX_PWLIB=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_PWLIB 1 -_ACEOF +$as_echo "#define HAVE_PWLIB 1" >>confdefs.h fi fi @@ -35950,280 +21422,20 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${OPENH323DIR:-unset}" != "unset" ; then - as_ac_Header=`echo "ac_cv_header_${OPENH323DIR}/version.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${OPENH323DIR}/version.h" >&5 -echo $ECHO_N "checking for ${OPENH323DIR}/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${OPENH323DIR}/version.h usability" >&5 -echo $ECHO_N "checking ${OPENH323DIR}/version.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${OPENH323DIR}/version.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${OPENH323DIR}/version.h presence" >&5 -echo $ECHO_N "checking ${OPENH323DIR}/version.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${OPENH323DIR}/version.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${OPENH323DIR}/version.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${OPENH323DIR}/version.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ${OPENH323DIR}/version.h" >&5 -echo $ECHO_N "checking for ${OPENH323DIR}/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/version.h" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "${OPENH323DIR}/version.h" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : HAS_OPENH323=1 fi fi if test "${HAS_OPENH323:-unset}" = "unset" ; then - as_ac_Header=`echo "ac_cv_header_${PWLIBDIR}/../openh323/version.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${PWLIBDIR}/../openh323/version.h" >&5 -echo $ECHO_N "checking for ${PWLIBDIR}/../openh323/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${PWLIBDIR}/../openh323/version.h usability" >&5 -echo $ECHO_N "checking ${PWLIBDIR}/../openh323/version.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <${PWLIBDIR}/../openh323/version.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ${PWLIBDIR}/../openh323/version.h presence" >&5 -echo $ECHO_N "checking ${PWLIBDIR}/../openh323/version.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <${PWLIBDIR}/../openh323/version.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${PWLIBDIR}/../openh323/version.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${PWLIBDIR}/../openh323/version.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ${PWLIBDIR}/../openh323/version.h" >&5 -echo $ECHO_N "checking for ${PWLIBDIR}/../openh323/version.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${PWLIBDIR}/../openh323/version.h" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "${PWLIBDIR}/../openh323/version.h" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1 fi @@ -36232,54 +21444,12 @@ fi OPENH323DIR="${PWLIBDIR}/../openh323" saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR}/openh323 -I${PWLIB_INCDIR}" - as_ac_Header=`echo "ac_cv_header_${OPENH323DIR}/include/h323.h" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${OPENH323DIR}/include/h323.h" >&5 -echo $ECHO_N "checking for ${OPENH323DIR}/include/h323.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ptlib.h> - -#include <${OPENH323DIR}/include/h323.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi + as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/include/h323.h" | $as_tr_sh` +ac_fn_cxx_check_header_compile "$LINENO" "${OPENH323DIR}/include/h323.h" "$as_ac_Header" "#include <ptlib.h> +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - : else OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}" fi @@ -36289,53 +21459,11 @@ fi else saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}" - as_ac_Header=`echo "ac_cv_header_${HOME}/openh323/include/h323.h" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${HOME}/openh323/include/h323.h" >&5 -echo $ECHO_N "checking for ${HOME}/openh323/include/h323.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ptlib.h> - -#include <${HOME}/openh323/include/h323.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then + as_ac_Header=`$as_echo "ac_cv_header_${HOME}/openh323/include/h323.h" | $as_tr_sh` +ac_fn_cxx_check_header_compile "$LINENO" "${HOME}/openh323/include/h323.h" "$as_ac_Header" "#include <ptlib.h> +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : HAS_OPENH323=1 fi @@ -36346,51 +21474,9 @@ fi else saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}" - { echo "$as_me:$LINENO: checking for /usr/local/include/openh323/h323.h" >&5 -echo $ECHO_N "checking for /usr/local/include/openh323/h323.h... $ECHO_C" >&6; } -if test "${ac_cv_header__usr_local_include_openh323_h323_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ptlib.h> - -#include </usr/local/include/openh323/h323.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header__usr_local_include_openh323_h323_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header__usr_local_include_openh323_h323_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_openh323_h323_h" >&5 -echo "${ECHO_T}$ac_cv_header__usr_local_include_openh323_h323_h" >&6; } -if test $ac_cv_header__usr_local_include_openh323_h323_h = yes; then + ac_fn_cxx_check_header_compile "$LINENO" "/usr/local/include/openh323/h323.h" "ac_cv_header__usr_local_include_openh323_h323_h" "#include <ptlib.h> +" +if test "x$ac_cv_header__usr_local_include_openh323_h323_h" = x""yes; then : HAS_OPENH323=1 fi @@ -36407,51 +21493,9 @@ fi else saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I/usr/include/openh323 -I${PWLIB_INCDIR}" - { echo "$as_me:$LINENO: checking for /usr/include/openh323/h323.h" >&5 -echo $ECHO_N "checking for /usr/include/openh323/h323.h... $ECHO_C" >&6; } -if test "${ac_cv_header__usr_include_openh323_h323_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ptlib.h> - -#include </usr/include/openh323/h323.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header__usr_include_openh323_h323_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header__usr_include_openh323_h323_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_openh323_h323_h" >&5 -echo "${ECHO_T}$ac_cv_header__usr_include_openh323_h323_h" >&6; } -if test $ac_cv_header__usr_include_openh323_h323_h = yes; then + ac_fn_cxx_check_header_compile "$LINENO" "/usr/include/openh323/h323.h" "ac_cv_header__usr_include_openh323_h323_h" "#include <ptlib.h> +" +if test "x$ac_cv_header__usr_include_openh323_h323_h" = x""yes; then : HAS_OPENH323=1 fi @@ -36514,28 +21558,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu let OPENH323_MAX=1*10000+19*100+0 fi - { echo "$as_me:$LINENO: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5 -echo $ECHO_N "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5 +$as_echo_n "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... " >&6; } if test ${OPENH323_VER} -lt ${OPENH323_REQ}; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } unset HAS_OPENH323 else if test ${OPENH323_VER} -gt ${OPENH323_MAX}; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } unset HAS_OPENH323 else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi fi if test "${HAS_OPENH323:-unset}" != "unset"; then - { echo "$as_me:$LINENO: checking OpenH323 build option" >&5 -echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 build option" >&5 +$as_echo_n "checking OpenH323 build option... " >&6; } OPENH323_SUFFIX= prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323" for pfx in $prefixes; do @@ -36586,8 +21630,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; } fi ;; esac - { echo "$as_me:$LINENO: result: ${OPENH323_BUILD}" >&5 -echo "${ECHO_T}${OPENH323_BUILD}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${OPENH323_BUILD}" >&5 +$as_echo "${OPENH323_BUILD}" >&6; } @@ -36596,8 +21640,8 @@ echo "${ECHO_T}${OPENH323_BUILD}" >&6; } PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}" if test "${HAS_OPENH323:-unset}" != "unset"; then - { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 -echo $ECHO_N "checking OpenH323 installation validity... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 +$as_echo_n "checking OpenH323 installation validity... " >&6; } saved_cppflags="${CPPFLAGS}" saved_libs="${LIBS}" @@ -36615,11 +21659,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "ptlib.h" #include "h323.h" @@ -36632,41 +21672,20 @@ H323EndPoint ep = H323EndPoint(); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_lib_OPENH323="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_cv_lib_OPENH323="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -36691,9 +21710,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi PBX_OPENH323=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_OPENH323 1 -_ACEOF +$as_echo "#define HAVE_OPENH323 1" >>confdefs.h fi fi @@ -36717,19 +21734,15 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5 +$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -36747,40 +21760,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_LUA_FOUND=yes else AST_LUA_FOUND=no @@ -36802,137 +21795,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" - if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h usability" >&5 -echo $ECHO_N "checking lua5.1/lua.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <lua5.1/lua.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h presence" >&5 -echo $ECHO_N "checking lua5.1/lua.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <lua5.1/lua.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_lua5_1_lua_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } - -fi -if test $ac_cv_header_lua5_1_lua_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" +if test "x$ac_cv_header_lua5_1_lua_h" = x""yes; then : LUA_HEADER_FOUND=1 else LUA_HEADER_FOUND=0 @@ -36984,19 +21848,15 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llua... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua" >&5 +$as_echo_n "checking for ${pbxfuncname} in -llua... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-llua ${pbxlibdir} -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -37014,40 +21874,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_LUA_FOUND=yes else AST_LUA_FOUND=no @@ -37069,137 +21909,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" - if test "${ac_cv_header_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua.h" >&5 -echo $ECHO_N "checking for lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking lua.h usability" >&5 -echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <lua.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking lua.h presence" >&5 -echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <lua.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lua.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lua.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for lua.h" >&5 -echo $ECHO_N "checking for lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_lua_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua_h" >&6; } - -fi -if test $ac_cv_header_lua_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "lua.h" "ac_cv_header_lua_h" "$ac_includes_default" +if test "x$ac_cv_header_lua_h" = x""yes; then : LUA_HEADER_FOUND=1 else LUA_HEADER_FOUND=0 @@ -37243,19 +21954,15 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lradiusclient-ng... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -37273,40 +21980,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_RADIUS_FOUND=yes else AST_RADIUS_FOUND=no @@ -37328,137 +22015,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}" - if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then - { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 -echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <radiusclient-ng.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 -echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <radiusclient-ng.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_radiusclient_ng_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } - -fi -if test $ac_cv_header_radiusclient_ng_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "radiusclient-ng.h" "ac_cv_header_radiusclient_ng_h" "$ac_includes_default" +if test "x$ac_cv_header_radiusclient_ng_h" = x""yes; then : RADIUS_HEADER_FOUND=1 else RADIUS_HEADER_FOUND=0 @@ -37511,19 +22069,15 @@ if test "x${PBX_OPENAIS}" != "x1" -a "${USE_OPENAIS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_SaClm_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lSaClm" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lSaClm... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_SaClm_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lSaClm" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lSaClm... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lSaClm ${pbxlibdir} -L/usr/lib/openais -L/usr/lib64/openais $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -37541,40 +22095,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_OPENAIS_FOUND=yes else AST_OPENAIS_FOUND=no @@ -37596,137 +22130,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENAIS_INCLUDE}" - if test "${ac_cv_header_openais_saClm_h+set}" = set; then - { echo "$as_me:$LINENO: checking for openais/saClm.h" >&5 -echo $ECHO_N "checking for openais/saClm.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openais_saClm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openais_saClm_h" >&5 -echo "${ECHO_T}$ac_cv_header_openais_saClm_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking openais/saClm.h usability" >&5 -echo $ECHO_N "checking openais/saClm.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <openais/saClm.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking openais/saClm.h presence" >&5 -echo $ECHO_N "checking openais/saClm.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <openais/saClm.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: openais/saClm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: openais/saClm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: openais/saClm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: openais/saClm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: openais/saClm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: openais/saClm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: openais/saClm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: openais/saClm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: openais/saClm.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for openais/saClm.h" >&5 -echo $ECHO_N "checking for openais/saClm.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openais_saClm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_openais_saClm_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openais_saClm_h" >&5 -echo "${ECHO_T}$ac_cv_header_openais_saClm_h" >&6; } - -fi -if test $ac_cv_header_openais_saClm_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "openais/saClm.h" "ac_cv_header_openais_saClm_h" "$ac_includes_default" +if test "x$ac_cv_header_openais_saClm_h" = x""yes; then : OPENAIS_HEADER_FOUND=1 else OPENAIS_HEADER_FOUND=0 @@ -37785,19 +22190,15 @@ if test "x${PBX_SPEEX}" != "x1" -a "${USE_SPEEX}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeex" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lspeex... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeex" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lspeex... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lspeex ${pbxlibdir} -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -37815,40 +22216,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SPEEX_FOUND=yes else AST_SPEEX_FOUND=no @@ -37870,137 +22251,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE}" - if test "${ac_cv_header_speex_speex_h+set}" = set; then - { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking speex/speex.h usability" >&5 -echo $ECHO_N "checking speex/speex.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <speex/speex.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking speex/speex.h presence" >&5 -echo $ECHO_N "checking speex/speex.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <speex/speex.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: speex/speex.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: speex/speex.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: speex/speex.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_speex_speex_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } - -fi -if test $ac_cv_header_speex_speex_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default" +if test "x$ac_cv_header_speex_speex_h" = x""yes; then : SPEEX_HEADER_FOUND=1 else SPEEX_HEADER_FOUND=0 @@ -38045,19 +22297,15 @@ if test "x${PBX_SPEEX_PREPROCESS}" != "x1" -a "${USE_SPEEX_PREPROCESS}" != "no"; else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeex" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lspeex... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeex" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lspeex... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lspeex ${pbxlibdir} -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -38075,40 +22323,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SPEEX_PREPROCESS_FOUND=yes else AST_SPEEX_PREPROCESS_FOUND=no @@ -38130,137 +22358,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE}" - if test "${ac_cv_header_speex_speex_h+set}" = set; then - { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking speex/speex.h usability" >&5 -echo $ECHO_N "checking speex/speex.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <speex/speex.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking speex/speex.h presence" >&5 -echo $ECHO_N "checking speex/speex.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <speex/speex.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: speex/speex.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: speex/speex.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: speex/speex.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_speex_speex_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } - -fi -if test $ac_cv_header_speex_speex_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default" +if test "x$ac_cv_header_speex_speex_h" = x""yes; then : SPEEX_PREPROCESS_HEADER_FOUND=1 else SPEEX_PREPROCESS_HEADER_FOUND=0 @@ -38307,19 +22406,15 @@ if test "x${PBX_SPEEXDSP}" != "x1" -a "${USE_SPEEXDSP}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_speexdsp_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeexdsp" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lspeexdsp... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_speexdsp_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeexdsp" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lspeexdsp... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lspeexdsp ${pbxlibdir} -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -38337,40 +22432,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SPEEXDSP_FOUND=yes else AST_SPEEXDSP_FOUND=no @@ -38392,137 +22467,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE}" - if test "${ac_cv_header_speex_speex_h+set}" = set; then - { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking speex/speex.h usability" >&5 -echo $ECHO_N "checking speex/speex.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <speex/speex.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking speex/speex.h presence" >&5 -echo $ECHO_N "checking speex/speex.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <speex/speex.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: speex/speex.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: speex/speex.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: speex/speex.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: speex/speex.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for speex/speex.h" >&5 -echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_speex_speex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_speex_speex_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } - -fi -if test $ac_cv_header_speex_speex_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default" +if test "x$ac_cv_header_speex_speex_h" = x""yes; then : SPEEXDSP_HEADER_FOUND=1 else SPEEXDSP_HEADER_FOUND=0 @@ -38571,19 +22517,15 @@ if test "x${PBX_SQLITE}" != "x1" -a "${USE_SQLITE}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_sqlite_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsqlite" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lsqlite... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_sqlite_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lsqlite... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -38601,40 +22543,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SQLITE_FOUND=yes else AST_SQLITE_FOUND=no @@ -38656,137 +22578,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}" - if test "${ac_cv_header_sqlite_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sqlite.h" >&5 -echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sqlite_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlite_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sqlite.h usability" >&5 -echo $ECHO_N "checking sqlite.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sqlite.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sqlite.h presence" >&5 -echo $ECHO_N "checking sqlite.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sqlite.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sqlite.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sqlite.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sqlite.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sqlite.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sqlite.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sqlite.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sqlite.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sqlite.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sqlite.h" >&5 -echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sqlite_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sqlite_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlite_h" >&6; } - -fi -if test $ac_cv_header_sqlite_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sqlite.h" "ac_cv_header_sqlite_h" "$ac_includes_default" +if test "x$ac_cv_header_sqlite_h" = x""yes; then : SQLITE_HEADER_FOUND=1 else SQLITE_HEADER_FOUND=0 @@ -38830,19 +22623,15 @@ if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsqlite3" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lsqlite3... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite3" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lsqlite3... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -38860,40 +22649,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SQLITE3_FOUND=yes else AST_SQLITE3_FOUND=no @@ -38915,137 +22684,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE}" - if test "${ac_cv_header_sqlite3_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sqlite3.h" >&5 -echo $ECHO_N "checking for sqlite3.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sqlite3_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite3_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlite3_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sqlite3.h usability" >&5 -echo $ECHO_N "checking sqlite3.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sqlite3.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sqlite3.h presence" >&5 -echo $ECHO_N "checking sqlite3.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sqlite3.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite3.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sqlite3.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sqlite3.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sqlite3.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite3.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sqlite3.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite3.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sqlite3.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite3.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sqlite3.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite3.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sqlite3.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlite3.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sqlite3.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sqlite3.h" >&5 -echo $ECHO_N "checking for sqlite3.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sqlite3_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sqlite3_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlite3_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlite3_h" >&6; } - -fi -if test $ac_cv_header_sqlite3_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default" +if test "x$ac_cv_header_sqlite3_h" = x""yes; then : SQLITE3_HEADER_FOUND=1 else SQLITE3_HEADER_FOUND=0 @@ -39089,19 +22729,15 @@ if test "x${PBX_CRYPTO}" != "x1" -a "${USE_CRYPTO}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_crypto_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcrypto" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lcrypto... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_crypto_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcrypto" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lcrypto... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -39119,40 +22755,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_CRYPTO_FOUND=yes else AST_CRYPTO_FOUND=no @@ -39174,137 +22790,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE}" - if test "${ac_cv_header_openssl_aes_h+set}" = set; then - { echo "$as_me:$LINENO: checking for openssl/aes.h" >&5 -echo $ECHO_N "checking for openssl/aes.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_aes_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_aes_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_aes_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking openssl/aes.h usability" >&5 -echo $ECHO_N "checking openssl/aes.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <openssl/aes.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking openssl/aes.h presence" >&5 -echo $ECHO_N "checking openssl/aes.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <openssl/aes.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: openssl/aes.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: openssl/aes.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: openssl/aes.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: openssl/aes.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: openssl/aes.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: openssl/aes.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: openssl/aes.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/aes.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: openssl/aes.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for openssl/aes.h" >&5 -echo $ECHO_N "checking for openssl/aes.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_aes_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_openssl_aes_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_aes_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_aes_h" >&6; } - -fi -if test $ac_cv_header_openssl_aes_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "openssl/aes.h" "ac_cv_header_openssl_aes_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_aes_h" = x""yes; then : CRYPTO_HEADER_FOUND=1 else CRYPTO_HEADER_FOUND=0 @@ -39350,19 +22837,15 @@ if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lssl" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lssl... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lssl" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lssl... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lssl ${pbxlibdir} -lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -39380,40 +22863,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_OPENSSL_FOUND=yes else AST_OPENSSL_FOUND=no @@ -39435,137 +22898,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE}" - if test "${ac_cv_header_openssl_ssl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 -echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_ssl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5 -echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <openssl/ssl.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5 -echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <openssl/ssl.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5 -echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_openssl_ssl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_openssl_ssl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5 -echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; } - -fi -if test $ac_cv_header_openssl_ssl_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then : OPENSSL_HEADER_FOUND=1 else OPENSSL_HEADER_FOUND=0 @@ -39610,137 +22944,8 @@ then # check for the header osptk_saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${osptk_cflags}" - if test "${ac_cv_header_osp_osp_h+set}" = set; then - { echo "$as_me:$LINENO: checking for osp/osp.h" >&5 -echo $ECHO_N "checking for osp/osp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_osp_osp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_osp_osp_h" >&5 -echo "${ECHO_T}$ac_cv_header_osp_osp_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking osp/osp.h usability" >&5 -echo $ECHO_N "checking osp/osp.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <osp/osp.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking osp/osp.h presence" >&5 -echo $ECHO_N "checking osp/osp.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <osp/osp.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: osp/osp.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: osp/osp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: osp/osp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: osp/osp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: osp/osp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: osp/osp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: osp/osp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: osp/osp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: osp/osp.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for osp/osp.h" >&5 -echo $ECHO_N "checking for osp/osp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_osp_osp_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_osp_osp_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_osp_osp_h" >&5 -echo "${ECHO_T}$ac_cv_header_osp_osp_h" >&6; } - -fi -if test $ac_cv_header_osp_osp_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "osp/osp.h" "ac_cv_header_osp_osp_h" "$ac_includes_default" +if test "x$ac_cv_header_osp_osp_h" = x""yes; then : osptk_header_found=yes else osptk_header_found=no @@ -39753,18 +22958,14 @@ fi if test "${osptk_header_found}" = "yes"; then osptk_extralibs="-lssl -lcrypto" - { echo "$as_me:$LINENO: checking for OSPPInit in -losptk" >&5 -echo $ECHO_N "checking for OSPPInit in -losptk... $ECHO_C" >&6; } -if test "${ac_cv_lib_osptk_OSPPInit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSPPInit in -losptk" >&5 +$as_echo_n "checking for OSPPInit in -losptk... " >&6; } +if test "${ac_cv_lib_osptk_OSPPInit+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-losptk ${osptk_ldflags} ${osptk_extralibs} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -39782,39 +22983,18 @@ return OSPPInit (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_osptk_OSPPInit=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_osptk_OSPPInit=no + ac_cv_lib_osptk_OSPPInit=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_osptk_OSPPInit" >&5 -echo "${ECHO_T}$ac_cv_lib_osptk_OSPPInit" >&6; } -if test $ac_cv_lib_osptk_OSPPInit = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_osptk_OSPPInit" >&5 +$as_echo "$ac_cv_lib_osptk_OSPPInit" >&6; } +if test "x$ac_cv_lib_osptk_OSPPInit" = x""yes; then : osptk_library_found=yes else osptk_library_found=no @@ -39823,23 +23003,18 @@ fi # check OSP Toolkit version if test "${osptk_library_found}" = "yes"; then - { echo "$as_me:$LINENO: checking if OSP Toolkit version is compatible with app_osplookup" >&5 -echo $ECHO_N "checking if OSP Toolkit version is compatible with app_osplookup... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OSP Toolkit version is compatible with app_osplookup" >&5 +$as_echo_n "checking if OSP Toolkit version is compatible with app_osplookup... " >&6; } osptk_saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${osptk_cflags}" - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run test program while cross compiling +See \`config.log' for more details." "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <osp/osp.h> @@ -39850,45 +23025,21 @@ cat >>conftest.$ac_ext <<_ACEOF } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : osptk_compatible=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -osptk_compatible=no + osptk_compatible=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - CPPFLAGS="${osptk_saved_cppflags}" if test "${osptk_compatible}" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } PBX_OSPTK=1 OSPTK_INCLUDE="${osptk_cflags}" OSPTK_LIB="${osptk_ldflags} -losptk ${osptk_extralibs}" @@ -39898,8 +23049,8 @@ cat >>confdefs.h <<_ACEOF _ACEOF else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi fi @@ -39911,12 +23062,12 @@ fi if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then PBX_GMIME=0 if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gmime-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}gmime-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Extract the first word of "${ac_tool_prefix}gmime-config-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}gmime-config-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $CONFIG_GMIME in [\\/]* | ?:[\\/]*) @@ -39929,14 +23080,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -39944,23 +23095,23 @@ esac fi CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME if test -n "$CONFIG_GMIME"; then - { echo "$as_me:$LINENO: result: $CONFIG_GMIME" >&5 -echo "${ECHO_T}$CONFIG_GMIME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GMIME" >&5 +$as_echo "$CONFIG_GMIME" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test -z "$ac_cv_path_CONFIG_GMIME"; then ac_pt_CONFIG_GMIME=$CONFIG_GMIME - # Extract the first word of "gmime-config", so it can be a program name with args. -set dummy gmime-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Extract the first word of "gmime-config-config", so it can be a program name with args. +set dummy gmime-config-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_CONFIG_GMIME in [\\/]* | ?:[\\/]*) @@ -39973,14 +23124,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CONFIG_GMIME="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -39988,11 +23139,11 @@ esac fi ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME if test -n "$ac_pt_CONFIG_GMIME"; then - { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GMIME" >&5 -echo "${ECHO_T}$ac_pt_CONFIG_GMIME" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GMIME" >&5 +$as_echo "$ac_pt_CONFIG_GMIME" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_CONFIG_GMIME" = x; then @@ -40000,12 +23151,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CONFIG_GMIME=$ac_pt_CONFIG_GMIME @@ -40029,13 +23176,9 @@ fi saved_libs="${LIBS}" LIBS="${GMIME_LIB}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <gmime/gmime.h> + #include <gmime/gmime.h> int main () { @@ -40045,54 +23188,43 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : PBX_GMIME=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_GMIME 1 -_ACEOF - - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +$as_echo "#define HAVE_GMIME 1" >>confdefs.h fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" else PBX_GMIME=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_GMIME 1 -_ACEOF +$as_echo "#define HAVE_GMIME 1" >>confdefs.h fi fi fi +if test "x${PBX_GMIME}" = "x0"; then + # Later versions of GMime use pkg-config + if test "x${PKGCONFIG}" = xNo; then :; else + GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null) + GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs) + if test "x${GMIME_INCLUDE}${GMIME_LIB}" = "x"; then + GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.2 --cflags 2>/dev/null) + GMIME_LIB=$(${PKGCONFIG} gmime-2.2 --libs) + fi + if test "x${GMIME_INCLUDE}${GMIME_LIB}" != "x"; then + PBX_GMIME=1 + +$as_echo "#define HAVE_GMIME 1" >>confdefs.h + + fi + fi +fi if test "x${PBX_HOARD}" != "x1" -a "${USE_HOARD}" != "no"; then @@ -40111,19 +23243,15 @@ if test "x${PBX_HOARD}" != "x1" -a "${USE_HOARD}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_hoard_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lhoard" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lhoard... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_hoard_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lhoard" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lhoard... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhoard ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -40141,40 +23269,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_HOARD_FOUND=yes else AST_HOARD_FOUND=no @@ -40196,137 +23304,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${HOARD_INCLUDE}" - if test "${ac_cv_header_+set}" = set; then - { echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking usability" >&5 -echo $ECHO_N "checking usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking presence" >&5 -echo $ECHO_N "checking presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: : proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: : present but cannot be compiled" >&5 -echo "$as_me: WARNING: : present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: : check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: : check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: : see the Autoconf documentation" >&5 -echo "$as_me: WARNING: : see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: : section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: : section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } - -fi -if test $ac_cv_header_ = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" +if test "x$ac_cv_header_" = x""yes; then : HOARD_HEADER_FOUND=1 else HOARD_HEADER_FOUND=0 @@ -40370,19 +23349,15 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lsybdb" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lsybdb... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsybdb" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lsybdb... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsybdb ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -40400,40 +23375,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_FREETDS_FOUND=yes else AST_FREETDS_FOUND=no @@ -40455,137 +23410,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE}" - if test "${ac_cv_header_sybdb_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sybdb.h" >&5 -echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sybdb_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 -echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sybdb.h usability" >&5 -echo $ECHO_N "checking sybdb.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <sybdb.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking sybdb.h presence" >&5 -echo $ECHO_N "checking sybdb.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sybdb.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sybdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sybdb.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sybdb.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sybdb.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sybdb.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sybdb.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sybdb.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sybdb.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sybdb.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sybdb.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sybdb.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sybdb.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sybdb.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for sybdb.h" >&5 -echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sybdb_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sybdb_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sybdb_h" >&5 -echo "${ECHO_T}$ac_cv_header_sybdb_h" >&6; } - -fi -if test $ac_cv_header_sybdb_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "sybdb.h" "ac_cv_header_sybdb_h" "$ac_includes_default" +if test "x$ac_cv_header_sybdb_h" = x""yes; then : FREETDS_HEADER_FOUND=1 else FREETDS_HEADER_FOUND=0 @@ -40629,19 +23455,15 @@ if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_termcap_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltermcap" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ltermcap... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_termcap_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltermcap" >&5 +$as_echo_n "checking for ${pbxfuncname} in -ltermcap... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -40659,40 +23481,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_TERMCAP_FOUND=yes else AST_TERMCAP_FOUND=no @@ -40714,137 +23516,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${TERMCAP_INCLUDE}" - if test "${ac_cv_header_+set}" = set; then - { echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking usability" >&5 -echo $ECHO_N "checking usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking presence" >&5 -echo $ECHO_N "checking presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: : proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: : present but cannot be compiled" >&5 -echo "$as_me: WARNING: : present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: : check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: : check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: : see the Autoconf documentation" >&5 -echo "$as_me: WARNING: : see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: : section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: : section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } - -fi -if test $ac_cv_header_ = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" +if test "x$ac_cv_header_" = x""yes; then : TERMCAP_HEADER_FOUND=1 else TERMCAP_HEADER_FOUND=0 @@ -40888,19 +23561,15 @@ if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_tinfo_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltinfo" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ltinfo... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_tinfo_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltinfo" >&5 +$as_echo_n "checking for ${pbxfuncname} in -ltinfo... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltinfo ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -40918,40 +23587,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_TINFO_FOUND=yes else AST_TINFO_FOUND=no @@ -40973,137 +23622,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}" - if test "${ac_cv_header_+set}" = set; then - { echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking usability" >&5 -echo $ECHO_N "checking usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking presence" >&5 -echo $ECHO_N "checking presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: : proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: : present but cannot be compiled" >&5 -echo "$as_me: WARNING: : present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: : check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: : check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: : see the Autoconf documentation" >&5 -echo "$as_me: WARNING: : see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: : section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: : section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } - -fi -if test $ac_cv_header_ = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" +if test "x$ac_cv_header_" = x""yes; then : TINFO_HEADER_FOUND=1 else TINFO_HEADER_FOUND=0 @@ -41130,18 +23650,14 @@ fi -{ echo "$as_me:$LINENO: checking for tone_zone_find_by_num in -ltonezone" >&5 -echo $ECHO_N "checking for tone_zone_find_by_num in -ltonezone... $ECHO_C" >&6; } -if test "${ac_cv_lib_tonezone_tone_zone_find_by_num+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tone_zone_find_by_num in -ltonezone" >&5 +$as_echo_n "checking for tone_zone_find_by_num in -ltonezone... " >&6; } +if test "${ac_cv_lib_tonezone_tone_zone_find_by_num+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltonezone $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -41159,39 +23675,18 @@ return tone_zone_find_by_num (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_tonezone_tone_zone_find_by_num=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tonezone_tone_zone_find_by_num=no + ac_cv_lib_tonezone_tone_zone_find_by_num=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_tonezone_tone_zone_find_by_num" >&5 -echo "${ECHO_T}$ac_cv_lib_tonezone_tone_zone_find_by_num" >&6; } -if test $ac_cv_lib_tonezone_tone_zone_find_by_num = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find_by_num" >&5 +$as_echo "$ac_cv_lib_tonezone_tone_zone_find_by_num" >&6; } +if test "x$ac_cv_lib_tonezone_tone_zone_find_by_num" = x""yes; then : tonezone_does_not_need_lm=yes else tonezone_does_not_need_lm=no @@ -41219,19 +23714,15 @@ if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_tonezone_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -ltonezone" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -ltonezone... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_tonezone_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltonezone" >&5 +$as_echo_n "checking for ${pbxfuncname} in -ltonezone... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltonezone ${pbxlibdir} ${tonezone_extra} ${DAHDI_INCLUDE} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -41249,40 +23740,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_TONEZONE_FOUND=yes else AST_TONEZONE_FOUND=no @@ -41304,137 +23775,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}" - if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then - { echo "$as_me:$LINENO: checking for dahdi/tonezone.h" >&5 -echo $ECHO_N "checking for dahdi/tonezone.h... $ECHO_C" >&6; } -if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_dahdi_tonezone_h" >&5 -echo "${ECHO_T}$ac_cv_header_dahdi_tonezone_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking dahdi/tonezone.h usability" >&5 -echo $ECHO_N "checking dahdi/tonezone.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <dahdi/tonezone.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking dahdi/tonezone.h presence" >&5 -echo $ECHO_N "checking dahdi/tonezone.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <dahdi/tonezone.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: dahdi/tonezone.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: dahdi/tonezone.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for dahdi/tonezone.h" >&5 -echo $ECHO_N "checking for dahdi/tonezone.h... $ECHO_C" >&6; } -if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_dahdi_tonezone_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_dahdi_tonezone_h" >&5 -echo "${ECHO_T}$ac_cv_header_dahdi_tonezone_h" >&6; } - -fi -if test $ac_cv_header_dahdi_tonezone_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "dahdi/tonezone.h" "ac_cv_header_dahdi_tonezone_h" "$ac_includes_default" +if test "x$ac_cv_header_dahdi_tonezone_h" = x""yes; then : TONEZONE_HEADER_FOUND=1 else TONEZONE_HEADER_FOUND=0 @@ -41478,19 +23820,15 @@ if test "x${PBX_USB}" != "x1" -a "${USE_USB}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_usb_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lusb" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lusb... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_usb_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lusb" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lusb... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lusb ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -41508,40 +23846,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_USB_FOUND=yes else AST_USB_FOUND=no @@ -41563,137 +23881,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${USB_INCLUDE}" - if test "${ac_cv_header_usb_h+set}" = set; then - { echo "$as_me:$LINENO: checking for usb.h" >&5 -echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; } -if test "${ac_cv_header_usb_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 -echo "${ECHO_T}$ac_cv_header_usb_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking usb.h usability" >&5 -echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <usb.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking usb.h presence" >&5 -echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <usb.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: usb.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for usb.h" >&5 -echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; } -if test "${ac_cv_header_usb_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_usb_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 -echo "${ECHO_T}$ac_cv_header_usb_h" >&6; } - -fi -if test $ac_cv_header_usb_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default" +if test "x$ac_cv_header_usb_h" = x""yes; then : USB_HEADER_FOUND=1 else USB_HEADER_FOUND=0 @@ -41739,19 +23928,15 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lvorbis" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lvorbis... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lvorbis" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lvorbis... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lvorbis ${pbxlibdir} -lm -lvorbisenc -logg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -41769,40 +23954,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_VORBIS_FOUND=yes else AST_VORBIS_FOUND=no @@ -41824,137 +23989,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}" - if test "${ac_cv_header_vorbis_codec_h+set}" = set; then - { echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5 -echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_vorbis_codec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_codec_h" >&5 -echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking vorbis/codec.h usability" >&5 -echo $ECHO_N "checking vorbis/codec.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <vorbis/codec.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking vorbis/codec.h presence" >&5 -echo $ECHO_N "checking vorbis/codec.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <vorbis/codec.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: vorbis/codec.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: vorbis/codec.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5 -echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_vorbis_codec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_vorbis_codec_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_codec_h" >&5 -echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6; } - -fi -if test $ac_cv_header_vorbis_codec_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default" +if test "x$ac_cv_header_vorbis_codec_h" = x""yes; then : VORBIS_HEADER_FOUND=1 else VORBIS_HEADER_FOUND=0 @@ -41998,19 +24034,15 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lvorbis" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lvorbis... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lvorbis" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lvorbis... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lvorbis ${pbxlibdir} -lm -lvorbisenc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -42028,40 +24060,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_VORBIS_FOUND=yes else AST_VORBIS_FOUND=no @@ -42083,137 +24095,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}" - if test "${ac_cv_header_vorbis_codec_h+set}" = set; then - { echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5 -echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_vorbis_codec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_codec_h" >&5 -echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking vorbis/codec.h usability" >&5 -echo $ECHO_N "checking vorbis/codec.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <vorbis/codec.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking vorbis/codec.h presence" >&5 -echo $ECHO_N "checking vorbis/codec.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <vorbis/codec.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: vorbis/codec.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: vorbis/codec.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5 -echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_vorbis_codec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_vorbis_codec_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_codec_h" >&5 -echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6; } - -fi -if test $ac_cv_header_vorbis_codec_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default" +if test "x$ac_cv_header_vorbis_codec_h" = x""yes; then : VORBIS_HEADER_FOUND=1 else VORBIS_HEADER_FOUND=0 @@ -42249,8 +24132,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${USE_VPB}" != "no"; then - { echo "$as_me:$LINENO: checking for vpb_open in -lvpb" >&5 -echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpb_open in -lvpb" >&5 +$as_echo_n "checking for vpb_open in -lvpb... " >&6; } saved_libs="${LIBS}" saved_cppflags="${CPPFLAGS}" if test "x${VPB_DIR}" != "x"; then @@ -42264,14 +24147,10 @@ echo $ECHO_N "checking for vpb_open in -lvpb... $ECHO_C" >&6; } fi LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb" CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <vpbapi.h> + + #include <vpbapi.h> int main () { @@ -42281,41 +24160,20 @@ int q = vpb_open(0,0); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ac_cv_lib_vpb_vpb_open="yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ac_cv_lib_vpb_vpb_open="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="${saved_libs}" CPPFLAGS="${saved_cppflags}" if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then @@ -42326,9 +24184,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi PBX_VPB=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_VPB 1 -_ACEOF +$as_echo "#define HAVE_VPB 1" >>confdefs.h fi fi @@ -42357,19 +24213,15 @@ if test "x${PBX_ZLIB}" != "x1" -a "${USE_ZLIB}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_z_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lz" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lz... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_z_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lz" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lz... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -42387,40 +24239,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_ZLIB_FOUND=yes else AST_ZLIB_FOUND=no @@ -42442,137 +24274,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE}" - if test "${ac_cv_header_zlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <zlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking zlib.h presence" >&5 -echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <zlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_zlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } - -fi -if test $ac_cv_header_zlib_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = x""yes; then : ZLIB_HEADER_FOUND=1 else ZLIB_HEADER_FOUND=0 @@ -42609,21 +24312,15 @@ elif test "x$CURSES_LIB" != "x" ; then elif test "x$NCURSES_LIB" != "x" ; then EDITLINE_LIB="$NCURSES_LIB" else - { { echo "$as_me:$LINENO: error: *** termcap support not found (on modern systems, this typically means the ncurses development package is missing)" >&5 -echo "$as_me: error: *** termcap support not found (on modern systems, this typically means the ncurses development package is missing)" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "*** termcap support not found (on modern systems, this typically means the ncurses development package is missing)" "$LINENO" 5 fi if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then # Does ODBC support wide characters? - { echo "$as_me:$LINENO: checking whether ODBC has support for Unicode types" >&5 -echo $ECHO_N "checking whether ODBC has support for Unicode types... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ODBC has support for Unicode types" >&5 +$as_echo_n "checking whether ODBC has support for Unicode types... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sql.h> #include <sqlext.h> @@ -42635,175 +24332,23 @@ int foo = SQL_WCHAR return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_ODBC_WCHAR 1 -_ACEOF +$as_echo "#define HAVE_ODBC_WCHAR 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -if test "${ac_cv_header_h323_h+set}" = set; then - { echo "$as_me:$LINENO: checking for h323.h" >&5 -echo $ECHO_N "checking for h323.h... $ECHO_C" >&6; } -if test "${ac_cv_header_h323_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_h323_h" >&5 -echo "${ECHO_T}$ac_cv_header_h323_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking h323.h usability" >&5 -echo $ECHO_N "checking h323.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <h323.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking h323.h presence" >&5 -echo $ECHO_N "checking h323.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <h323.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: h323.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: h323.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: h323.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: h323.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: h323.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: h323.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: h323.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: h323.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: h323.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: h323.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: h323.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: h323.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: h323.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: h323.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: h323.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: h323.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for h323.h" >&5 -echo $ECHO_N "checking for h323.h... $ECHO_C" >&6; } -if test "${ac_cv_header_h323_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_h323_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_h323_h" >&5 -echo "${ECHO_T}$ac_cv_header_h323_h" >&6; } - -fi -if test $ac_cv_header_h323_h = yes; then +ac_fn_c_check_header_mongrel "$LINENO" "h323.h" "ac_cv_header_h323_h" "$ac_includes_default" +if test "x$ac_cv_header_h323_h" = x""yes; then : PBX_H323=1 else PBX_H323=0 @@ -42812,137 +24357,8 @@ fi -if test "${ac_cv_header_linux_compiler_h+set}" = set; then - { echo "$as_me:$LINENO: checking for linux/compiler.h" >&5 -echo $ECHO_N "checking for linux/compiler.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_compiler_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_compiler_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_compiler_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking linux/compiler.h usability" >&5 -echo $ECHO_N "checking linux/compiler.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <linux/compiler.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking linux/compiler.h presence" >&5 -echo $ECHO_N "checking linux/compiler.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <linux/compiler.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: linux/compiler.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: linux/compiler.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: linux/compiler.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: linux/compiler.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: linux/compiler.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: linux/compiler.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: linux/compiler.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/compiler.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: linux/compiler.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for linux/compiler.h" >&5 -echo $ECHO_N "checking for linux/compiler.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_compiler_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_linux_compiler_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_compiler_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_compiler_h" >&6; } - -fi -if test $ac_cv_header_linux_compiler_h = yes; then +ac_fn_c_check_header_mongrel "$LINENO" "linux/compiler.h" "ac_cv_header_linux_compiler_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_compiler_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LINUX_COMPILER_H 1 @@ -42952,56 +24368,14 @@ fi -{ echo "$as_me:$LINENO: checking for linux/ixjuser.h" >&5 -echo $ECHO_N "checking for linux/ixjuser.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_ixjuser_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - +ac_fn_c_check_header_compile "$LINENO" "linux/ixjuser.h" "ac_cv_header_linux_ixjuser_h" " #include <linux/version.h> #ifdef HAVE_LINUX_COMPILER_H #include <linux/compiler.h> #endif - -#include <linux/ixjuser.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_linux_ixjuser_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_linux_ixjuser_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_ixjuser_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_ixjuser_h" >&6; } -if test $ac_cv_header_linux_ixjuser_h = yes; then +" +if test "x$ac_cv_header_linux_ixjuser_h" = x""yes; then : PBX_IXJUSER=1 else PBX_IXJUSER=0 @@ -43016,10 +24390,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}sdl-config", so it can be a program name with args. set dummy ${ac_tool_prefix}sdl-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CONFIG_SDL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CONFIG_SDL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $CONFIG_SDL in [\\/]* | ?:[\\/]*) @@ -43032,14 +24406,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CONFIG_SDL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -43047,11 +24421,11 @@ esac fi CONFIG_SDL=$ac_cv_path_CONFIG_SDL if test -n "$CONFIG_SDL"; then - { echo "$as_me:$LINENO: result: $CONFIG_SDL" >&5 -echo "${ECHO_T}$CONFIG_SDL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_SDL" >&5 +$as_echo "$CONFIG_SDL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -43060,10 +24434,10 @@ if test -z "$ac_cv_path_CONFIG_SDL"; then ac_pt_CONFIG_SDL=$CONFIG_SDL # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_CONFIG_SDL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_CONFIG_SDL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_CONFIG_SDL in [\\/]* | ?:[\\/]*) @@ -43076,14 +24450,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CONFIG_SDL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -43091,11 +24465,11 @@ esac fi ac_pt_CONFIG_SDL=$ac_cv_path_ac_pt_CONFIG_SDL if test -n "$ac_pt_CONFIG_SDL"; then - { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_SDL" >&5 -echo "${ECHO_T}$ac_pt_CONFIG_SDL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_SDL" >&5 +$as_echo "$ac_pt_CONFIG_SDL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_CONFIG_SDL" = x; then @@ -43103,12 +24477,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CONFIG_SDL=$ac_pt_CONFIG_SDL @@ -43132,11 +24502,7 @@ fi saved_libs="${LIBS}" LIBS="${SDL_LIB}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -43148,49 +24514,21 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : PBX_SDL=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_SDL 1 -_ACEOF - - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +$as_echo "#define HAVE_SDL 1" >>confdefs.h fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" else PBX_SDL=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_SDL 1 -_ACEOF +$as_echo "#define HAVE_SDL 1" >>confdefs.h fi fi @@ -43213,19 +24551,15 @@ if test "x${PBX_SDL_IMAGE}" != "x1" -a "${USE_SDL_IMAGE}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${SDL_INCLUDE}" - as_ac_Lib=`echo "ac_cv_lib_SDL_image_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lSDL_image" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lSDL_image... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_SDL_image_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lSDL_image" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lSDL_image... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lSDL_image ${pbxlibdir} ${SDL_LIB} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -43243,40 +24577,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_SDL_IMAGE_FOUND=yes else AST_SDL_IMAGE_FOUND=no @@ -43298,137 +24612,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}" - if test "${ac_cv_header_SDL_image_h+set}" = set; then - { echo "$as_me:$LINENO: checking for SDL_image.h" >&5 -echo $ECHO_N "checking for SDL_image.h... $ECHO_C" >&6; } -if test "${ac_cv_header_SDL_image_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_image_h" >&5 -echo "${ECHO_T}$ac_cv_header_SDL_image_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking SDL_image.h usability" >&5 -echo $ECHO_N "checking SDL_image.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <SDL_image.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking SDL_image.h presence" >&5 -echo $ECHO_N "checking SDL_image.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <SDL_image.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: SDL_image.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: SDL_image.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: SDL_image.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: SDL_image.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: SDL_image.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: SDL_image.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: SDL_image.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: SDL_image.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: SDL_image.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: SDL_image.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: SDL_image.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: SDL_image.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: SDL_image.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: SDL_image.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: SDL_image.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: SDL_image.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for SDL_image.h" >&5 -echo $ECHO_N "checking for SDL_image.h... $ECHO_C" >&6; } -if test "${ac_cv_header_SDL_image_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_SDL_image_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_image_h" >&5 -echo "${ECHO_T}$ac_cv_header_SDL_image_h" >&6; } - -fi -if test $ac_cv_header_SDL_image_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "SDL_image.h" "ac_cv_header_SDL_image_h" "$ac_includes_default" +if test "x$ac_cv_header_SDL_image_h" = x""yes; then : SDL_IMAGE_HEADER_FOUND=1 else SDL_IMAGE_HEADER_FOUND=0 @@ -43471,19 +24656,15 @@ if test "x${PBX_FFMPEG}" != "x1" -a "${USE_FFMPEG}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" - as_ac_Lib=`echo "ac_cv_lib_avcodec_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lavcodec" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lavcodec... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_avcodec_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lavcodec" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lavcodec... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lavcodec ${pbxlibdir} ${PTHREAD_LIBS} -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -43501,40 +24682,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_FFMPEG_FOUND=yes else AST_FFMPEG_FOUND=no @@ -43556,137 +24717,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}" - if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5 -echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_avcodec_h" >&5 -echo "${ECHO_T}$ac_cv_header_ffmpeg_avcodec_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h usability" >&5 -echo $ECHO_N "checking ffmpeg/avcodec.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <ffmpeg/avcodec.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h presence" >&5 -echo $ECHO_N "checking ffmpeg/avcodec.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ffmpeg/avcodec.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5 -echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ffmpeg_avcodec_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_avcodec_h" >&5 -echo "${ECHO_T}$ac_cv_header_ffmpeg_avcodec_h" >&6; } - -fi -if test $ac_cv_header_ffmpeg_avcodec_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "$ac_includes_default" +if test "x$ac_cv_header_ffmpeg_avcodec_h" = x""yes; then : FFMPEG_HEADER_FOUND=1 else FFMPEG_HEADER_FOUND=0 @@ -43714,137 +24746,8 @@ fi # possible places for video4linux version 1 -if test "${ac_cv_header_linux_videodev_h+set}" = set; then - { echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 -echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_videodev_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_videodev_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5 -echo $ECHO_N "checking linux/videodev.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <linux/videodev.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5 -echo $ECHO_N "checking linux/videodev.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <linux/videodev.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 -echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_videodev_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_linux_videodev_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_videodev_h" >&6; } - -fi -if test $ac_cv_header_linux_videodev_h = yes; then +ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_videodev_h" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_VIDEODEV_H 1 @@ -43872,19 +24775,15 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lX11" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lX11... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lX11" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lX11... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -43902,40 +24801,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_X11_FOUND=yes else AST_X11_FOUND=no @@ -43957,137 +24836,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}" - if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5 -echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <X11/Xlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5 -echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <X11/Xlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/Xlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/Xlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/Xlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/Xlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_Xlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } - -fi -if test $ac_cv_header_X11_Xlib_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_Xlib_h" = x""yes; then : X11_HEADER_FOUND=1 else X11_HEADER_FOUND=0 @@ -44118,7 +24868,6 @@ fi - if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then pbxlibdir="" # if --with-X11=DIR has been specified, use it. @@ -44135,19 +24884,15 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then else ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -I/usr/X11R6/include" - as_ac_Lib=`echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lX11" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lX11... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_Lib=`$as_echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lX11" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lX11... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 ${pbxlibdir} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -44165,40 +24910,20 @@ return ${pbxfuncname} (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_Lib=yes" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : AST_X11_FOUND=yes else AST_X11_FOUND=no @@ -44220,137 +24945,8 @@ fi else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}" - if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5 -echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <X11/Xlib.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5 -echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <X11/Xlib.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/Xlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/Xlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/Xlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/Xlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/Xlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/Xlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to https://issues.asterisk.org ## -## ------------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_Xlib_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } - -fi -if test $ac_cv_header_X11_Xlib_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_Xlib_h" = x""yes; then : X11_HEADER_FOUND=1 else X11_HEADER_FOUND=0 @@ -44381,31 +24977,26 @@ fi - if test "${cross_compiling}" = "no"; then - { echo "$as_me:$LINENO: checking for /sbin/launchd" >&5 -echo $ECHO_N "checking for /sbin/launchd... $ECHO_C" >&6; } -if test "${ac_cv_file__sbin_launchd+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /sbin/launchd" >&5 +$as_echo_n "checking for /sbin/launchd... " >&6; } +if test "${ac_cv_file__sbin_launchd+set}" = set; then : + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/sbin/launchd"; then ac_cv_file__sbin_launchd=yes else ac_cv_file__sbin_launchd=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__sbin_launchd" >&5 -echo "${ECHO_T}$ac_cv_file__sbin_launchd" >&6; } -if test $ac_cv_file__sbin_launchd = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__sbin_launchd" >&5 +$as_echo "$ac_cv_file__sbin_launchd" >&6; } +if test "x$ac_cv_file__sbin_launchd" = x""yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_SBIN_LAUNCHD 1 -_ACEOF +$as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h fi @@ -44418,10 +25009,10 @@ PBX_GTK=0 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gtk-config", so it can be a program name with args. set dummy ${ac_tool_prefix}gtk-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_CONFIG_GTK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CONFIG_GTK+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $CONFIG_GTK in [\\/]* | ?:[\\/]*) @@ -44434,14 +25025,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CONFIG_GTK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -44449,11 +25040,11 @@ esac fi CONFIG_GTK=$ac_cv_path_CONFIG_GTK if test -n "$CONFIG_GTK"; then - { echo "$as_me:$LINENO: result: $CONFIG_GTK" >&5 -echo "${ECHO_T}$CONFIG_GTK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GTK" >&5 +$as_echo "$CONFIG_GTK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -44462,10 +25053,10 @@ if test -z "$ac_cv_path_CONFIG_GTK"; then ac_pt_CONFIG_GTK=$CONFIG_GTK # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_CONFIG_GTK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_CONFIG_GTK+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_CONFIG_GTK in [\\/]* | ?:[\\/]*) @@ -44478,14 +25069,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_CONFIG_GTK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -44493,11 +25084,11 @@ esac fi ac_pt_CONFIG_GTK=$ac_cv_path_ac_pt_CONFIG_GTK if test -n "$ac_pt_CONFIG_GTK"; then - { echo "$as_me:$LINENO: result: $ac_pt_CONFIG_GTK" >&5 -echo "${ECHO_T}$ac_pt_CONFIG_GTK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GTK" >&5 +$as_echo "$ac_pt_CONFIG_GTK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_CONFIG_GTK" = x; then @@ -44505,12 +25096,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CONFIG_GTK=$ac_pt_CONFIG_GTK @@ -44534,11 +25121,7 @@ fi saved_libs="${LIBS}" LIBS="${GTK_LIB}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -44550,49 +25133,21 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : PBX_GTK=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_GTK 1 -_ACEOF - - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +$as_echo "#define HAVE_GTK 1" >>confdefs.h fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" else PBX_GTK=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_GTK 1 -_ACEOF +$as_echo "#define HAVE_GTK 1" >>confdefs.h fi fi @@ -44600,110 +25155,12 @@ _ACEOF PBX_GTK2=0 -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_PKGCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$PKGCONFIG"; then - ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -PKGCONFIG=$ac_cv_prog_PKGCONFIG -if test -n "$PKGCONFIG"; then - { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 -echo "${ECHO_T}$PKGCONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_PKGCONFIG"; then - ac_ct_PKGCONFIG=$PKGCONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_PKGCONFIG"; then - ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG -if test -n "$ac_ct_PKGCONFIG"; then - { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 -echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_PKGCONFIG" = x; then - PKGCONFIG="No" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PKGCONFIG=$ac_ct_PKGCONFIG - fi -else - PKGCONFIG="$ac_cv_prog_PKGCONFIG" -fi - if test ! "x${PKGCONFIG}" = xNo; then GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) PBX_GTK2=1 -cat >>confdefs.h <<\_ACEOF -#define HAVE_GTK2 1 -_ACEOF +$as_echo "#define HAVE_GTK2 1" >>confdefs.h fi @@ -44729,33 +25186,39 @@ fi +if test -f makeopts; then + ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak +else + touch makeopts.acbak +fi + ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts channels/h323/Makefile" - { echo "$as_me:$LINENO: checking for mandatory modules: ${ac_mandatory_list}" >&5 -echo $ECHO_N "checking for mandatory modules: ${ac_mandatory_list}... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mandatory modules: ${ac_mandatory_list}" >&5 +$as_echo_n "checking for mandatory modules: ${ac_mandatory_list}... " >&6; } err=0; for i in ${ac_mandatory_list}; do eval "a=\${PBX_$i}" if test "x${a}" = "x1" ; then continue; fi - if test ${err} = "0" ; then { echo "$as_me:$LINENO: result: fail" >&5 -echo "${ECHO_T}fail" >&6; } ; fi - { echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6; } + if test ${err} = "0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: fail" >&5 +$as_echo "fail" >&6; } ; fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } eval "a=\${${i}_OPTION}" - { echo "$as_me:$LINENO: ***" >&5 -echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The $i installation appears to be missing or broken." >&5 -echo "$as_me: *** The $i installation appears to be missing or broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 -echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-${a}." >&5 -echo "$as_me: *** including --without-${a}." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5 +$as_echo "$as_me: ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** The $i installation appears to be missing or broken." >&5 +$as_echo "$as_me: *** The $i installation appears to be missing or broken." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5 +$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-${a}." >&5 +$as_echo "$as_me: *** including --without-${a}." >&6;} err=1 done if test $err = 1 ; then exit 1; fi - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } if test -f build_tools/menuselect-deps; then @@ -44795,12 +25258,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -44808,8 +25272,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -44832,12 +25296,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -44853,11 +25317,11 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -44866,11 +25330,13 @@ LTLIBOBJS=$ac_ltlibobjs : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -44880,59 +25346,79 @@ cat >$CONFIG_STATUS <<_ACEOF debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -44941,20 +25427,18 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -44965,32 +25449,111 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi -done + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -45004,13 +25567,17 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -45025,104 +25592,103 @@ echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -45139,12 +25705,12 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -45159,13 +25725,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by asterisk $as_me 1.6.2, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -45178,29 +25750,41 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -45208,27 +25792,29 @@ $config_files Configuration headers: $config_headers -Report bugs to <bug-autoconf@gnu.org>." +Report bugs to <https://issues.asterisk.org>." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ asterisk config.status 1.6.2 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -45250,34 +25836,40 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -45292,30 +25884,32 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -45326,9 +25920,7 @@ do "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;; "channels/h323/Makefile") CONFIG_FILES="$CONFIG_FILES channels/h323/Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -45354,7 +25946,7 @@ $debug || trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -45365,651 +25957,140 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -CONFIG_CFLAGS!$CONFIG_CFLAGS$ac_delim -CONFIG_LDFLAGS!$CONFIG_LDFLAGS$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -BUILD_PLATFORM!$BUILD_PLATFORM$ac_delim -BUILD_CPU!$BUILD_CPU$ac_delim -BUILD_VENDOR!$BUILD_VENDOR$ac_delim -BUILD_OS!$BUILD_OS$ac_delim -HOST_PLATFORM!$HOST_PLATFORM$ac_delim -HOST_CPU!$HOST_CPU$ac_delim -HOST_VENDOR!$HOST_VENDOR$ac_delim -HOST_OS!$HOST_OS$ac_delim -OSARCH!$OSARCH$ac_delim -PBX_WINARCH!$PBX_WINARCH$ac_delim -UNAME!$UNAME$ac_delim -PBX_OSREV!$PBX_OSREV$ac_delim -CXX!$CXX$ac_delim -LD!$LD$ac_delim -RANLIB!$RANLIB$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXCPP!$CXXCPP$ac_delim -SED!$SED$ac_delim -AWK!$AWK$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -LN_S!$LN_S$ac_delim -GNU_MAKE!$GNU_MAKE$ac_delim -STRIP!$STRIP$ac_delim -ac_ct_STRIP!$ac_ct_STRIP$ac_delim -AR!$AR$ac_delim -ac_ct_AR!$ac_ct_AR$ac_delim -SHA1SUM!$SHA1SUM$ac_delim -ac_ct_SHA1SUM!$ac_ct_SHA1SUM$ac_delim -GNU_LD!$GNU_LD$ac_delim -BISON!$BISON$ac_delim -FLEX!$FLEX$ac_delim -FIND!$FIND$ac_delim -COMPRESS!$COMPRESS$ac_delim -BASENAME!$BASENAME$ac_delim -DIRNAME!$DIRNAME$ac_delim -LN!$LN$ac_delim -DOT!$DOT$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -WGET!$WGET$ac_delim -CURL!$CURL$ac_delim -RUBBER!$RUBBER$ac_delim -CATDVI!$CATDVI$ac_delim -KPATHSEA!$KPATHSEA$ac_delim -XMLSTARLET!$XMLSTARLET$ac_delim -FETCH!$FETCH$ac_delim -DOWNLOAD!$DOWNLOAD$ac_delim -PBX_BISON!$PBX_BISON$ac_delim -PBX_FLEX!$PBX_FLEX$ac_delim -SOXMIX!$SOXMIX$ac_delim -MD5!$MD5$ac_delim -acx_pthread_config!$acx_pthread_config$ac_delim -PTHREAD_CC!$PTHREAD_CC$ac_delim -PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim -PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim -AST_DEVMODE!$AST_DEVMODE$ac_delim -ALSA_LIB!$ALSA_LIB$ac_delim -ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim -ALSA_DIR!$ALSA_DIR$ac_delim -PBX_ALSA!$PBX_ALSA$ac_delim -FFMPEG_LIB!$FFMPEG_LIB$ac_delim -FFMPEG_INCLUDE!$FFMPEG_INCLUDE$ac_delim -FFMPEG_DIR!$FFMPEG_DIR$ac_delim -PBX_FFMPEG!$PBX_FFMPEG$ac_delim -CAP_LIB!$CAP_LIB$ac_delim -CAP_INCLUDE!$CAP_INCLUDE$ac_delim -CAP_DIR!$CAP_DIR$ac_delim -PBX_CAP!$PBX_CAP$ac_delim -CURSES_LIB!$CURSES_LIB$ac_delim -CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim -CURSES_DIR!$CURSES_DIR$ac_delim -PBX_CURSES!$PBX_CURSES$ac_delim -CRYPTO_LIB!$CRYPTO_LIB$ac_delim -CRYPTO_INCLUDE!$CRYPTO_INCLUDE$ac_delim -CRYPTO_DIR!$CRYPTO_DIR$ac_delim -PBX_CRYPTO!$PBX_CRYPTO$ac_delim -DAHDI_LIB!$DAHDI_LIB$ac_delim -DAHDI_INCLUDE!$DAHDI_INCLUDE$ac_delim -DAHDI_DIR!$DAHDI_DIR$ac_delim -PBX_DAHDI!$PBX_DAHDI$ac_delim -BKTR_LIB!$BKTR_LIB$ac_delim -BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim -BKTR_DIR!$BKTR_DIR$ac_delim -PBX_BKTR!$PBX_BKTR$ac_delim -GSM_LIB!$GSM_LIB$ac_delim -GSM_INCLUDE!$GSM_INCLUDE$ac_delim -GSM_DIR!$GSM_DIR$ac_delim -PBX_GSM!$PBX_GSM$ac_delim -GTK_LIB!$GTK_LIB$ac_delim -GTK_INCLUDE!$GTK_INCLUDE$ac_delim -GTK_DIR!$GTK_DIR$ac_delim -PBX_GTK!$PBX_GTK$ac_delim -GTK2_LIB!$GTK2_LIB$ac_delim -GTK2_INCLUDE!$GTK2_INCLUDE$ac_delim -GTK2_DIR!$GTK2_DIR$ac_delim -PBX_GTK2!$PBX_GTK2$ac_delim -GMIME_LIB!$GMIME_LIB$ac_delim -GMIME_INCLUDE!$GMIME_INCLUDE$ac_delim -GMIME_DIR!$GMIME_DIR$ac_delim -PBX_GMIME!$PBX_GMIME$ac_delim -OPENH323_LIB!$OPENH323_LIB$ac_delim -OPENH323_INCLUDE!$OPENH323_INCLUDE$ac_delim -OPENH323_DIR!$OPENH323_DIR$ac_delim -PBX_OPENH323!$PBX_OPENH323$ac_delim -HOARD_LIB!$HOARD_LIB$ac_delim -HOARD_INCLUDE!$HOARD_INCLUDE$ac_delim -HOARD_DIR!$HOARD_DIR$ac_delim -PBX_HOARD!$PBX_HOARD$ac_delim -ICONV_LIB!$ICONV_LIB$ac_delim -ICONV_INCLUDE!$ICONV_INCLUDE$ac_delim -ICONV_DIR!$ICONV_DIR$ac_delim -PBX_ICONV!$PBX_ICONV$ac_delim -IKSEMEL_LIB!$IKSEMEL_LIB$ac_delim -IKSEMEL_INCLUDE!$IKSEMEL_INCLUDE$ac_delim -IKSEMEL_DIR!$IKSEMEL_DIR$ac_delim -PBX_IKSEMEL!$PBX_IKSEMEL$ac_delim -IMAP_TK_LIB!$IMAP_TK_LIB$ac_delim -IMAP_TK_INCLUDE!$IMAP_TK_INCLUDE$ac_delim -IMAP_TK_DIR!$IMAP_TK_DIR$ac_delim -PBX_IMAP_TK!$PBX_IMAP_TK$ac_delim -INOTIFY_LIB!$INOTIFY_LIB$ac_delim -INOTIFY_INCLUDE!$INOTIFY_INCLUDE$ac_delim -INOTIFY_DIR!$INOTIFY_DIR$ac_delim -PBX_INOTIFY!$PBX_INOTIFY$ac_delim -IODBC_LIB!$IODBC_LIB$ac_delim -IODBC_INCLUDE!$IODBC_INCLUDE$ac_delim -IODBC_DIR!$IODBC_DIR$ac_delim -PBX_IODBC!$PBX_IODBC$ac_delim -ISDNNET_LIB!$ISDNNET_LIB$ac_delim -ISDNNET_INCLUDE!$ISDNNET_INCLUDE$ac_delim -ISDNNET_DIR!$ISDNNET_DIR$ac_delim -PBX_ISDNNET!$PBX_ISDNNET$ac_delim -JACK_LIB!$JACK_LIB$ac_delim -JACK_INCLUDE!$JACK_INCLUDE$ac_delim -JACK_DIR!$JACK_DIR$ac_delim -PBX_JACK!$PBX_JACK$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr fi -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -LDAP_LIB!$LDAP_LIB$ac_delim -LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim -LDAP_DIR!$LDAP_DIR$ac_delim -PBX_LDAP!$PBX_LDAP$ac_delim -PBX_CURL!$PBX_CURL$ac_delim -_libcurl_config!$_libcurl_config$ac_delim -CURL_INCLUDE!$CURL_INCLUDE$ac_delim -CURL_LIB!$CURL_LIB$ac_delim -LIBXML2_LIB!$LIBXML2_LIB$ac_delim -LIBXML2_INCLUDE!$LIBXML2_INCLUDE$ac_delim -LIBXML2_DIR!$LIBXML2_DIR$ac_delim -PBX_LIBXML2!$PBX_LIBXML2$ac_delim -LTDL_LIB!$LTDL_LIB$ac_delim -LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim -LTDL_DIR!$LTDL_DIR$ac_delim -PBX_LTDL!$PBX_LTDL$ac_delim -LUA_LIB!$LUA_LIB$ac_delim -LUA_INCLUDE!$LUA_INCLUDE$ac_delim -LUA_DIR!$LUA_DIR$ac_delim -PBX_LUA!$PBX_LUA$ac_delim -MISDN_LIB!$MISDN_LIB$ac_delim -MISDN_INCLUDE!$MISDN_INCLUDE$ac_delim -MISDN_DIR!$MISDN_DIR$ac_delim -PBX_MISDN!$PBX_MISDN$ac_delim -NBS_LIB!$NBS_LIB$ac_delim -NBS_INCLUDE!$NBS_INCLUDE$ac_delim -NBS_DIR!$NBS_DIR$ac_delim -PBX_NBS!$PBX_NBS$ac_delim -NCURSES_LIB!$NCURSES_LIB$ac_delim -NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim -NCURSES_DIR!$NCURSES_DIR$ac_delim -PBX_NCURSES!$PBX_NCURSES$ac_delim -NETSNMP_LIB!$NETSNMP_LIB$ac_delim -NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim -NETSNMP_DIR!$NETSNMP_DIR$ac_delim -PBX_NETSNMP!$PBX_NETSNMP$ac_delim -NEWT_LIB!$NEWT_LIB$ac_delim -NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim -NEWT_DIR!$NEWT_DIR$ac_delim -PBX_NEWT!$PBX_NEWT$ac_delim -OGG_LIB!$OGG_LIB$ac_delim -OGG_INCLUDE!$OGG_INCLUDE$ac_delim -OGG_DIR!$OGG_DIR$ac_delim -PBX_OGG!$PBX_OGG$ac_delim -OPENAIS_LIB!$OPENAIS_LIB$ac_delim -OPENAIS_INCLUDE!$OPENAIS_INCLUDE$ac_delim -OPENAIS_DIR!$OPENAIS_DIR$ac_delim -PBX_OPENAIS!$PBX_OPENAIS$ac_delim -OPENR2_LIB!$OPENR2_LIB$ac_delim -OPENR2_INCLUDE!$OPENR2_INCLUDE$ac_delim -OPENR2_DIR!$OPENR2_DIR$ac_delim -PBX_OPENR2!$PBX_OPENR2$ac_delim -OSPTK_LIB!$OSPTK_LIB$ac_delim -OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim -OSPTK_DIR!$OSPTK_DIR$ac_delim -PBX_OSPTK!$PBX_OSPTK$ac_delim -OSS_LIB!$OSS_LIB$ac_delim -OSS_INCLUDE!$OSS_INCLUDE$ac_delim -OSS_DIR!$OSS_DIR$ac_delim -PBX_OSS!$PBX_OSS$ac_delim -PGSQL_LIB!$PGSQL_LIB$ac_delim -PGSQL_INCLUDE!$PGSQL_INCLUDE$ac_delim -PGSQL_DIR!$PGSQL_DIR$ac_delim -PBX_PGSQL!$PBX_PGSQL$ac_delim -POPT_LIB!$POPT_LIB$ac_delim -POPT_INCLUDE!$POPT_INCLUDE$ac_delim -POPT_DIR!$POPT_DIR$ac_delim -PBX_POPT!$PBX_POPT$ac_delim -PORTAUDIO_LIB!$PORTAUDIO_LIB$ac_delim -PORTAUDIO_INCLUDE!$PORTAUDIO_INCLUDE$ac_delim -PORTAUDIO_DIR!$PORTAUDIO_DIR$ac_delim -PBX_PORTAUDIO!$PBX_PORTAUDIO$ac_delim -PRI_LIB!$PRI_LIB$ac_delim -PRI_INCLUDE!$PRI_INCLUDE$ac_delim -PRI_DIR!$PRI_DIR$ac_delim -PBX_PRI!$PBX_PRI$ac_delim -PRI_INBANDDISCONNECT_LIB!$PRI_INBANDDISCONNECT_LIB$ac_delim -PRI_INBANDDISCONNECT_INCLUDE!$PRI_INBANDDISCONNECT_INCLUDE$ac_delim -PRI_INBANDDISCONNECT_DIR!$PRI_INBANDDISCONNECT_DIR$ac_delim -PBX_PRI_INBANDDISCONNECT!$PBX_PRI_INBANDDISCONNECT$ac_delim -PWLIB_LIB!$PWLIB_LIB$ac_delim -PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim -PWLIB_DIR!$PWLIB_DIR$ac_delim -PBX_PWLIB!$PBX_PWLIB$ac_delim -RADIUS_LIB!$RADIUS_LIB$ac_delim -RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim -RADIUS_DIR!$RADIUS_DIR$ac_delim -PBX_RADIUS!$PBX_RADIUS$ac_delim -RESAMPLE_LIB!$RESAMPLE_LIB$ac_delim -RESAMPLE_INCLUDE!$RESAMPLE_INCLUDE$ac_delim -RESAMPLE_DIR!$RESAMPLE_DIR$ac_delim -PBX_RESAMPLE!$PBX_RESAMPLE$ac_delim -SDL_LIB!$SDL_LIB$ac_delim -SDL_INCLUDE!$SDL_INCLUDE$ac_delim -SDL_DIR!$SDL_DIR$ac_delim -PBX_SDL!$PBX_SDL$ac_delim -SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim -SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim -PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim -SOUNDS_CACHE_DIR!$SOUNDS_CACHE_DIR$ac_delim -SPANDSP_LIB!$SPANDSP_LIB$ac_delim -SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim -SPANDSP_DIR!$SPANDSP_DIR$ac_delim -PBX_SPANDSP!$PBX_SPANDSP$ac_delim -SS7_LIB!$SS7_LIB$ac_delim -SS7_INCLUDE!$SS7_INCLUDE$ac_delim -SS7_DIR!$SS7_DIR$ac_delim -PBX_SS7!$PBX_SS7$ac_delim -SPEEX_LIB!$SPEEX_LIB$ac_delim -SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim -SPEEX_DIR!$SPEEX_DIR$ac_delim -PBX_SPEEX!$PBX_SPEEX$ac_delim -SPEEX_PREPROCESS_LIB!$SPEEX_PREPROCESS_LIB$ac_delim -SPEEX_PREPROCESS_INCLUDE!$SPEEX_PREPROCESS_INCLUDE$ac_delim -SPEEX_PREPROCESS_DIR!$SPEEX_PREPROCESS_DIR$ac_delim -PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim -SPEEXDSP_LIB!$SPEEXDSP_LIB$ac_delim -SPEEXDSP_INCLUDE!$SPEEXDSP_INCLUDE$ac_delim -SPEEXDSP_DIR!$SPEEXDSP_DIR$ac_delim -PBX_SPEEXDSP!$PBX_SPEEXDSP$ac_delim -SQLITE_LIB!$SQLITE_LIB$ac_delim -SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim -SQLITE_DIR!$SQLITE_DIR$ac_delim -PBX_SQLITE!$PBX_SQLITE$ac_delim -SQLITE3_LIB!$SQLITE3_LIB$ac_delim -SQLITE3_INCLUDE!$SQLITE3_INCLUDE$ac_delim -SQLITE3_DIR!$SQLITE3_DIR$ac_delim -PBX_SQLITE3!$PBX_SQLITE3$ac_delim -OPENSSL_LIB!$OPENSSL_LIB$ac_delim -OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim -OPENSSL_DIR!$OPENSSL_DIR$ac_delim -PBX_OPENSSL!$PBX_OPENSSL$ac_delim -SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim -SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim -SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim -PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim -FREETDS_LIB!$FREETDS_LIB$ac_delim -FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim -FREETDS_DIR!$FREETDS_DIR$ac_delim -PBX_FREETDS!$PBX_FREETDS$ac_delim -TERMCAP_LIB!$TERMCAP_LIB$ac_delim -TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim -TERMCAP_DIR!$TERMCAP_DIR$ac_delim -PBX_TERMCAP!$PBX_TERMCAP$ac_delim -TIMERFD_LIB!$TIMERFD_LIB$ac_delim -TIMERFD_INCLUDE!$TIMERFD_INCLUDE$ac_delim -TIMERFD_DIR!$TIMERFD_DIR$ac_delim -PBX_TIMERFD!$PBX_TIMERFD$ac_delim -TINFO_LIB!$TINFO_LIB$ac_delim -TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim -TINFO_DIR!$TINFO_DIR$ac_delim -PBX_TINFO!$PBX_TINFO$ac_delim -TONEZONE_LIB!$TONEZONE_LIB$ac_delim -TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim -TONEZONE_DIR!$TONEZONE_DIR$ac_delim -PBX_TONEZONE!$PBX_TONEZONE$ac_delim -UNIXODBC_LIB!$UNIXODBC_LIB$ac_delim -UNIXODBC_INCLUDE!$UNIXODBC_INCLUDE$ac_delim -UNIXODBC_DIR!$UNIXODBC_DIR$ac_delim -PBX_UNIXODBC!$PBX_UNIXODBC$ac_delim -USB_LIB!$USB_LIB$ac_delim -USB_INCLUDE!$USB_INCLUDE$ac_delim -USB_DIR!$USB_DIR$ac_delim -PBX_USB!$PBX_USB$ac_delim -VORBIS_LIB!$VORBIS_LIB$ac_delim -VORBIS_INCLUDE!$VORBIS_INCLUDE$ac_delim -VORBIS_DIR!$VORBIS_DIR$ac_delim -PBX_VORBIS!$PBX_VORBIS$ac_delim -VPB_LIB!$VPB_LIB$ac_delim -VPB_INCLUDE!$VPB_INCLUDE$ac_delim -VPB_DIR!$VPB_DIR$ac_delim -PBX_VPB!$PBX_VPB$ac_delim -X11_LIB!$X11_LIB$ac_delim -X11_INCLUDE!$X11_INCLUDE$ac_delim -X11_DIR!$X11_DIR$ac_delim -PBX_X11!$PBX_X11$ac_delim -ZLIB_LIB!$ZLIB_LIB$ac_delim -ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim -ZLIB_DIR!$ZLIB_DIR$ac_delim -PBX_ZLIB!$PBX_ZLIB$ac_delim -ALLOCA!$ALLOCA$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -PBX_WORKING_FORK!$PBX_WORKING_FORK$ac_delim -POW_LIB!$POW_LIB$ac_delim -HAS_POLL!$HAS_POLL$ac_delim -PBX_PTHREAD_RWLOCK_INITIALIZER!$PBX_PTHREAD_RWLOCK_INITIALIZER$ac_delim -PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP!$PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP$ac_delim -GC_CFLAGS!$GC_CFLAGS$ac_delim -GC_LDFLAGS!$GC_LDFLAGS$ac_delim -AST_DECLARATION_AFTER_STATEMENT!$AST_DECLARATION_AFTER_STATEMENT$ac_delim -AST_FORTIFY_SOURCE!$AST_FORTIFY_SOURCE$ac_delim -AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim -AST_SHADOW_WARNINGS!$AST_SHADOW_WARNINGS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -PBX_IP_MTU_DISCOVER!$PBX_IP_MTU_DISCOVER$ac_delim -PBX_DAHDI_HALF_FULL!$PBX_DAHDI_HALF_FULL$ac_delim -GSM_INTERNAL!$GSM_INTERNAL$ac_delim -CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim -PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim -PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim -CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim -PG_CONFIG!$PG_CONFIG$ac_delim -PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim -PWLIBDIR!$PWLIBDIR$ac_delim -PWLIB_INCDIR!$PWLIB_INCDIR$ac_delim -PWLIB_LIBDIR!$PWLIB_LIBDIR$ac_delim -PWLIB_PLATFORM!$PWLIB_PLATFORM$ac_delim -OPENH323DIR!$OPENH323DIR$ac_delim -OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim -OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim -OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim -OPENH323_BUILD!$OPENH323_BUILD$ac_delim -PBX_AIS!$PBX_AIS$ac_delim -AIS_INCLUDE!$AIS_INCLUDE$ac_delim -AIS_LIB!$AIS_LIB$ac_delim -CONFIG_GMIME!$CONFIG_GMIME$ac_delim -EDITLINE_LIB!$EDITLINE_LIB$ac_delim -PBX_H323!$PBX_H323$ac_delim -PBX_IXJUSER!$PBX_IXJUSER$ac_delim -CONFIG_SDL!$CONFIG_SDL$ac_delim -CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim -GENERIC_ODBC_LIB!$GENERIC_ODBC_LIB$ac_delim -GENERIC_ODBC_INCLUDE!$GENERIC_ODBC_INCLUDE$ac_delim -PBX_GENERIC_ODBC!$PBX_GENERIC_ODBC$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' <conf$$subs.awk | sed ' +/^[^""]/{ + N + s/\n// +} +' >>$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi + print line +} -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACAWK _ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF - # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty @@ -46025,20 +26106,128 @@ s/^[^=]*=[ ]*$// }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' <confdefs.h | sed ' +s/'"$ac_delim"'/"\\\ +"/g' >>$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -46066,26 +26255,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -46095,42 +26292,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -46148,20 +26310,15 @@ echo X"$as_dir" | q } s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -46201,12 +26358,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -46214,36 +26371,37 @@ case `sed -n '/datarootdir/ { /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -46253,119 +26411,48 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" ;; @@ -46374,11 +26461,13 @@ echo "$as_me: $ac_file is unchanged" >&6;} done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -46398,10 +26487,24 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi +${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2 +if test "x${ac_cv_path_CMP}" = "x:"; then + ( cd `pwd`/menuselect && ./configure ) +else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else + ( cd `pwd`/menuselect && ./configure ) +fi ; fi + +rm makeopts.acbak makeopts.acbak2 + + if test "x${silent}" != "xyes" ; then echo echo " .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=.. " @@ -46428,17 +26531,17 @@ echo " \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$. " echo fi -{ echo "$as_me:$LINENO: Package configured for: " >&5 -echo "$as_me: Package configured for: " >&6;} -{ echo "$as_me:$LINENO: OS type : $host_os" >&5 -echo "$as_me: OS type : $host_os" >&6;} -{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5 -echo "$as_me: Host CPU : $host_cpu" >&6;} -{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5 -echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;} -{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5 -echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Package configured for: " >&5 +$as_echo "$as_me: Package configured for: " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: OS type : $host_os" >&5 +$as_echo "$as_me: OS type : $host_os" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Host CPU : $host_cpu" >&5 +$as_echo "$as_me: Host CPU : $host_cpu" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5 +$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5 +$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;} if test "${cross_compiling}" = "yes"; then - { echo "$as_me:$LINENO: Cross Compilation = YES" >&5 -echo "$as_me: Cross Compilation = YES" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Cross Compilation = YES" >&5 +$as_echo "$as_me: Cross Compilation = YES" >&6;} fi diff --git a/configure.ac b/configure.ac index 0d18a4ac5..2d07c8c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_RANLIB AST_CHECK_GNU_MAKE +AC_PROG_EGREP AC_CHECK_TOOLS([STRIP], [strip gstrip], :) AC_CHECK_TOOLS([AR], [ar gar], :) @@ -188,6 +189,7 @@ fi AC_SUBST(GNU_LD) AC_PATH_PROG([BISON], [bison], :) +AC_PATH_PROG([CMP], [cmp], :) AC_PATH_PROG([FLEX], [flex], :) AC_PATH_PROG([GREP], [grep], :) AC_PATH_PROG([FIND], [find], :) @@ -816,6 +818,9 @@ else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long long], [Define to a type of the same size as fd_set.fds_bits[[0]]]) fi ; fi ; fi +# PKGCONFIG is used in later tests +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) + # do the package library checks now @@ -1532,6 +1537,19 @@ if test "${PG_CONFIG}" != No; then AC_CHECK_LIB([pq], [PQescapeStringConn], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1, [Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz) + AC_MSG_CHECKING(for pg_encoding_to_char within Postgres headers) + old_CFLAGS=${CFLAGS} + CFLAGS="${CFLAGS} -I${PGSQL_includedir} -Werror" + old_LDFLAGS=${LDFLAGS} + LDFLAGS="${LDFLAGS} -L${PGSQL_libdir} -lpq -lz" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libpq-fe.h>], + [const char *foo = pg_encoding_to_char(1)])], + [AC_MSG_RESULT(yes) + AC_DEFINE_UNQUOTED([HAVE_PGSQL_pg_encoding_to_char], 1, [Define to indicate presence of the pg_encoding_to_char API.])], + [AC_MSG_RESULT(no)]) + CFLAGS=${old_CFLAGS} + LDFLAGS=${old_LDFLAGS} + if test "${ac_cv_lib_pq_PQescapeStringConn}" = "yes"; then PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz" PGSQL_INCLUDE="-I${PGSQL_includedir}" @@ -1693,7 +1711,22 @@ then AST_CHECK_OSPTK([3], [5], [0]) fi -AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);]) +AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);]) +if test "x${PBX_GMIME}" = "x0"; then + # Later versions of GMime use pkg-config + if test "x${PKGCONFIG}" = xNo; then :; else + GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null) + GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs) + if test "x${GMIME_INCLUDE}${GMIME_LIB}" = "x"; then + GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.2 --cflags 2>/dev/null) + GMIME_LIB=$(${PKGCONFIG} gmime-2.2 --libs) + fi + if test "x${GMIME_INCLUDE}${GMIME_LIB}" != "x"; then + PBX_GMIME=1 + AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.]) + fi + fi +fi AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], []) @@ -1830,7 +1863,6 @@ PBX_GTK=0 AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread]) PBX_GTK2=0 -AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) if test ! "x${PKGCONFIG}" = xNo; then GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null) GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) @@ -1860,6 +1892,12 @@ AC_SUBST([GENERIC_ODBC_LIB]) AC_SUBST([GENERIC_ODBC_INCLUDE]) AC_SUBST([PBX_GENERIC_ODBC]) +if test -f makeopts; then + ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak +else + touch makeopts.acbak +fi + AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile]) AST_CHECK_MANDATORY @@ -1875,6 +1913,16 @@ fi AC_OUTPUT +${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2 +if test "x${ac_cv_path_CMP}" = "x:"; then + ( cd `pwd`/menuselect && ./configure ) +else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else + ( cd `pwd`/menuselect && ./configure ) +fi ; fi + +rm makeopts.acbak makeopts.acbak2 + + if test "x${silent}" != "xyes" ; then echo echo " .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=.. " diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif index 7286d90b1..5a05d9e85 100644 --- a/contrib/scripts/asterisk.ldif +++ b/contrib/scripts/asterisk.ldif @@ -99,8 +99,15 @@ olcObjectIdentifier: AstVoicemailOptions AstAttrType:56 olcObjectIdentifier: AstVoicemailTimestamp AstAttrType:57 olcObjectIdentifier: AstVoicemailContext AstAttrType:58 olcObjectIdentifier: AstAccountSubscribeContext AstAttrType:59 -olcObjectIdentifier: AstAccountIpAddr AstAttrType:60 olcObjectIdentifier: AstAccountUserAgent AstAttrType:61 +olcObjectIdentifier: AstAccountLanguage AstAttrType:62 +olcObjectIdentifier: AstAccountTransport AstAttrType:63 +olcObjectIdentifier: AstAccountPromiscRedir AstAttrType:64 +olcObjectIdentifier: AstAccountAccountCode AstAttrType:65 +olcObjectIdentifier: AstAccountSetVar AstAttrType:66 +olcObjectIdentifier: AstAccountAllowOverlap AstAttrType:67 +olcObjectIdentifier: AstAccountVideoSupport AstAttrType:68 +olcObjectIdentifier: AstAccountIgnoreSDPVersion AstAttrType:69 # # ############################################################################# @@ -112,6 +119,9 @@ olcObjectIdentifier: AsteriskIAXUser AstObjectClass:2 olcObjectIdentifier: AsteriskSIPUser AstObjectClass:3 olcObjectIdentifier: AsteriskConfig AstObjectClass:4 olcObjectIdentifier: AsteriskVoiceMail AstObjectClass:5 +olcObjectIdentifier: AsteriskDialplan AstObjectClass:6 +olcObjectIdentifier: AsteriskAccount AstObjectClass:7 +olcObjectIdentifier: AsteriskMailbox AstObjectClass:8 # # ############################################################################# @@ -563,16 +573,65 @@ olcAttributeTypes: ( AstAccountSubscribeContext SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) # -olcAttributeTypes: ( AstAccountIpAddr - NAME 'AstAccountIpAddr' - DESC 'Asterisk aaccount IP address' +olcAttributeTypes: ( AstAccountUserAgent + NAME 'AstAccountUserAgent' + DESC 'Asterisk account user context' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) # -olcAttributeTypes: ( AstAccountUserAgent - NAME 'AstAccountUserAgent' - DESC 'Asterisk account user context' +olcAttributeTypes: ( AstAccountLanguage + NAME 'AstAccountLanguage' + DESC 'Asterisk account user language' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountTransport + NAME 'AstAccountTransport' + DESC 'Asterisk account transport type' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountPromiscRedir + NAME 'AstAccountPromiscRedir' + DESC 'Asterisk account promiscous redirects' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountAccountCode + NAME 'AstAccountAccountCode' + DESC 'Asterisk account billing code' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountSetVar + NAME 'AstAccountSetVar' + DESC 'Asterisk account setvar' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountAllowOverlap + NAME 'AstAccountAllowOverlap' + DESC 'Asterisk account allow overlap dialing' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountVideoSupport + NAME 'AstAccountVideoSupport' + DESC 'Asterisk account video support' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountIgnoreSDPVersion + NAME 'AstAccountIgnoreSDPVersion' + DESC 'Asterisk account ignore SDP version' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) @@ -632,6 +691,7 @@ olcObjectClasses: ( AsteriskIAXUser AstAccountPort $ AstAccountQualify $ AstAccountType $ + AstAccountLanguage $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext $ @@ -639,7 +699,10 @@ olcObjectClasses: ( AsteriskIAXUser AstAccountNoTransfer $ AstAccountName $ AstAccountLastQualifyMilliseconds $ - AstAccountCallLimit + AstAccountCallLimit $ + AstAccountSubscribeContext $ + AstAccountIPAddress $ + AstAccountUserAgent ) ) # @@ -649,43 +712,53 @@ olcObjectClasses: ( AsteriskSIPUser SUP AsteriskExtension AUXILIARY MUST cn MAY ( - AstAccountAMAFlags $ - AstAccountCallGroup $ - AstAccountCallerID $ + AstAccountAccountCode $ + AstAccountAllowOverlap $ + AstAccountAllowedCodec $ + AstAccountAMAFlags $ + AstAccountCallGroup $ + AstAccountCallLimit $ + AstAccountCallerID $ + AstAccountCanCallForward $ AstAccountCanReinvite $ AstAccountContext $ + AstAccountDTMFMode $ AstAccountDefaultUser $ - AstAccountDTMFMode $ - AstAccountFromUser $ - AstAccountFromDomain $ - AstAccountFullContact $ - AstAccountHost $ - AstAccountInsecure $ + AstAccountDeny $ + AstAccountDisallowedCodec $ + AstAccountExpirationTimestamp $ + AstAccountFromDomain $ + AstAccountFromUser $ + AstAccountFullContact $ + AstAccountHost $ + AstAccountIgnoreSDPVersion $ + AstAccountInsecure $ AstAccountIPAddress $ - AstAccountMailbox $ - AstAccountRealmedPassword $ + AstAccountLanguage $ + AstAccountLastQualifyMilliseconds $ + AstAccountMailbox $ + AstAccountMusicOnHold $ AstAccountNAT $ - AstAccountDeny $ - AstAccountPermit $ - AstAccountPickupGroup $ + AstAccountName $ + AstAccountPermit $ + AstAccountPickupGroup $ AstAccountPort $ - AstAccountQualify $ - AstAccountRestrictCID $ - AstAccountRTPTimeout $ + AstAccountPromiscRedir $ + AstAccountQualify $ AstAccountRTPHoldTimeout $ - AstAccountType $ - AstAccountDisallowedCodec $ - AstAccountAllowedCodec $ - AstAccountMusicOnHold $ - AstAccountExpirationTimestamp $ - AstAccountRegistrationContext $ + AstAccountRTPTimeout $ + AstAccountRealmedPassword $ + AstAccountRegistrationContext $ AstAccountRegistrationExten $ AstAccountRegistrationServer $ - AstAccountCanCallForward $ - AstAccountSecret $ - AstAccountName $ - AstAccountLastQualifyMilliseconds $ - AstAccountCallLimit + AstAccountRestrictCID $ + AstAccountSecret $ + AstAccountSetVar $ + AstAccountSubscribeContext $ + AstAccountTransport $ + AstAccountType $ + AstAccountUserAgent $ + AstAccountVideoSupport ) ) # @@ -734,3 +807,29 @@ olcObjectClasses: ( AsteriskVoiceMail ) ) # +olcObjectClasses: ( AsteriskDialplan + NAME 'AsteriskDialplan' + DESC 'Asterisk Dialplan Information' + SUP top STRUCTURAL + MUST ( + AstExtension + ) + ) +# +olcObjectClasses: ( AsteriskAccount + NAME 'AsteriskAccount' + DESC 'Asterisk Account Information' + SUP top STRUCTURAL + MUST ( + AstAccountName + ) + ) +# +olcObjectClasses: ( AsteriskMailbox + NAME 'AsteriskMailbox' + DESC 'Asterisk Mailbox Information' + SUP top STRUCTURAL + MUST ( + AstVoicemailMailbox + ) + ) diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp index 22bee0ee1..19a899f49 100644 --- a/contrib/valgrind.supp +++ b/contrib/valgrind.supp @@ -21,7 +21,7 @@ { dlclose-4 Memcheck:Addr4 - ... + fun:... fun:dlclose fun:load_dynamic_module fun:... diff --git a/funcs/func_curl.c b/funcs/func_curl.c index d10209822..9d6a0c846 100644 --- a/funcs/func_curl.c +++ b/funcs/func_curl.c @@ -477,8 +477,11 @@ static int acf_curl_exec(struct ast_channel *chan, const char *cmd, char *info, struct ast_str *fields = ast_str_create(ast_str_strlen(str) / 2); struct ast_str *values = ast_str_create(ast_str_strlen(str) / 2); int rowcount = 0; - while ((piece = strsep(&remainder, "&"))) { + while (fields && values && (piece = strsep(&remainder, "&"))) { char *name = strsep(&piece, "="); + if (!piece) { + piece = ""; + } ast_uri_decode(piece); ast_uri_decode(name); ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", name); diff --git a/funcs/func_strings.c b/funcs/func_strings.c index f69cf8d62..2bd47c3de 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -459,10 +459,10 @@ static int filter(struct ast_channel *chan, const char *cmd, char *parse, char * if (*(args.allowed) == '-') { if (ast_get_encoded_char(args.allowed + 1, &c2, &consumed)) - c2 = -1; + c2 = c1; args.allowed += consumed + 1; - if ((c2 < c1 || c2 == -1) && !ast_opt_dont_warn) { + if ((unsigned char) c2 < (unsigned char) c1 && !ast_opt_dont_warn) { ast_log(LOG_WARNING, "Range wrapping in FILTER(%s,%s). This may not be what you want.\n", parse, args.string); } @@ -470,7 +470,7 @@ static int filter(struct ast_channel *chan, const char *cmd, char *parse, char * * Looks a little strange, until you realize that we can overflow * the size of a char. */ - for (ac = c1; ac != c2; ac++) { + for (ac = (unsigned char) c1; ac != (unsigned char) c2; ac++) { bitfield[ac / 32] |= 1 << (ac % 32); } bitfield[ac / 32] |= 1 << (ac % 32); @@ -609,14 +609,14 @@ static int array(struct ast_channel *chan, const char *cmd, char *var, * want them to be surprised by the result. Hence, we prefer commas as the * delimiter, but we'll fall back to vertical bars if commas aren't found. */ - ast_debug(1, "array (%s=%s)\n", var, value2); + ast_debug(1, "array (%s=%s)\n", var, S_OR(value2, "")); AST_STANDARD_APP_ARGS(arg1, var); AST_STANDARD_APP_ARGS(arg2, value2); for (i = 0; i < arg1.argc; i++) { ast_debug(1, "array set value (%s=%s)\n", arg1.var[i], - arg2.val[i]); + S_OR(arg2.val[i], "")); if (i < arg2.argc) { if (ishash) { snprintf(varname, sizeof(varname), HASH_FORMAT, origvar, arg1.var[i]); diff --git a/include/asterisk.h b/include/asterisk.h index 743064d65..a19415d2a 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -79,6 +79,7 @@ int __ast_fdleak_dup(int oldfd, const char *file, int line, const char *func); int ast_set_priority(int); /*!< Provided by asterisk.c */ int ast_fd_init(void); /*!< Provided by astfd.c */ +int ast_pbx_init(void); /*!< Provided by pbx.c */ /*! * \brief Register a function to be executed before Asterisk exits. diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index c7252d34b..e9ffe7bd9 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -469,6 +469,9 @@ /* Define to indicate the PostgreSQL library */ #undef HAVE_PGSQL +/* Define to indicate presence of the pg_encoding_to_char API. */ +#undef HAVE_PGSQL_pg_encoding_to_char + /* Define to 1 if your system defines IP_PKTINFO. */ #undef HAVE_PKTINFO @@ -699,7 +702,7 @@ /* Define to 1 if you have the `strtoq' function. */ #undef HAVE_STRTOQ -/* Define to 1 if `st_blksize' is member of `struct stat'. */ +/* Define to 1 if `st_blksize' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE /* Define to 1 if you have the mISDN Supplemental Services library. */ @@ -935,12 +938,12 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if the C compiler supports function prototypes. */ -#undef PROTOTYPES - /* Define to necessary symbol if this constant uses a non-standard name on your system. */ #undef PTHREAD_CREATE_JOINABLE @@ -960,11 +963,6 @@ /* Define to the type of arg 5 for `select'. */ #undef SELECT_TYPE_ARG5 -/* Define to 1 if the `setvbuf' function takes the buffering type as its - second argument and the buffer pointer as the third, as on System V before - release 3. */ -#undef SETVBUF_REVERSED - /* The size of `fd_set.fds_bits', as computed by sizeof. */ #undef SIZEOF_FD_SET_FDS_BITS @@ -997,12 +995,27 @@ /* Define to a type of the same size as fd_set.fds_bits[[0]] */ #undef TYPEOF_FD_SET_FDS_BITS -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ +/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + /* Define to 1 if running on Darwin. */ #undef _DARWIN_UNLIMITED_SELECT @@ -1010,11 +1023,6 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif - /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ #undef _LARGEFILE_SOURCE @@ -1031,20 +1039,6 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE -/* Enable extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif - -/* Define like PROTOTYPES; this can be used by system headers. */ -#undef __PROTOTYPES - /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 9345a402d..88d1748c8 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1747,19 +1747,6 @@ static inline int ast_fdisset(struct pollfd *pfds, int fd, int maximum, int *sta return 0; } -#ifndef HAVE_TIMERSUB -static inline void timersub(struct timeval *tvend, struct timeval *tvstart, struct timeval *tvdiff) -{ - tvdiff->tv_sec = tvend->tv_sec - tvstart->tv_sec; - tvdiff->tv_usec = tvend->tv_usec - tvstart->tv_usec; - if (tvdiff->tv_usec < 0) { - tvdiff->tv_sec --; - tvdiff->tv_usec += 1000000; - } - -} -#endif - /*! \brief Retrieves the current T38 state of a channel */ static inline enum ast_t38_state ast_channel_get_t38_state(struct ast_channel *chan) { diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 519c71e68..365df66a1 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -113,6 +113,10 @@ int unsetenv(const char *name); int __attribute__((format(printf, 2, 0))) vasprintf(char **strp, const char *fmt, va_list ap); #endif +#ifndef HAVE_TIMERSUB +void timersub(struct timeval *tvend, struct timeval *tvstart, struct timeval *tvdiff); +#endif + #ifndef HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz); #endif diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index aa38ee0fa..acd40d3ec 100644 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -211,6 +211,7 @@ int ast_rtcp_fd(struct ast_rtp *rtp); int ast_rtp_senddigit_begin(struct ast_rtp *rtp, char digit); int ast_rtp_senddigit_end(struct ast_rtp *rtp, char digit); +int ast_rtp_senddigit_end_with_duration(struct ast_rtp *rtp, char digit, unsigned int duration); int ast_rtp_sendcng(struct ast_rtp *rtp, int level); diff --git a/include/asterisk/timing.h b/include/asterisk/timing.h index d93f4f408..dd2a95d90 100644 --- a/include/asterisk/timing.h +++ b/include/asterisk/timing.h @@ -216,6 +216,16 @@ enum ast_timer_event ast_timer_get_event(const struct ast_timer *handle); */ unsigned int ast_timer_get_max_rate(const struct ast_timer *handle); +/*! + * \brief Get name of timer in use + * + * \param handle timer handle returned by timer_open() + * + * \return name of timer + * \since 1.6.2 + */ +const char *ast_timer_get_name(const struct ast_timer *handle); + #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/main/acl.c b/main/acl.c index 7fbd81d11..258f3c2de 100644 --- a/main/acl.c +++ b/main/acl.c @@ -77,8 +77,8 @@ static void score_address(const struct sockaddr_in *sin, struct in_addr *best_ad /* 172.20.0.0 - 172.29.255.255, but not 172.200.0.0 - 172.255.255.255 nor 172.2.0.0 - 172.2.255.255 */ } else if (address[4] == '2' && address[6] == '.') { score = -5; - /* 172.30.0.0 - 172.31.255.255 */ - } else if (address[4] == '3' && address[5] <= '1') { + /* 172.30.0.0 - 172.31.255.255, but not 172.3.0.0 - 172.3.255.255 */ + } else if (address[4] == '3' && (address[5] == '0' || address[5] == '1')) { score = -5; /* All other 172 addresses are public */ } else { diff --git a/main/ast_expr2.c b/main/ast_expr2.c index df7556772..fe93c3577 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,7 +28,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -47,7 +46,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.4.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,79 +54,28 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ -#define yyparse ast_yyparse -#define yylex ast_yylex -#define yyerror ast_yyerror -#define yylval ast_yylval -#define yychar ast_yychar -#define yydebug ast_yydebug -#define yynerrs ast_yynerrs -#define yylloc ast_yylloc - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - TOK_COMMA = 258, - TOK_COLONCOLON = 259, - TOK_COND = 260, - TOK_OR = 261, - TOK_AND = 262, - TOK_NE = 263, - TOK_LE = 264, - TOK_GE = 265, - TOK_LT = 266, - TOK_GT = 267, - TOK_EQ = 268, - TOK_MINUS = 269, - TOK_PLUS = 270, - TOK_MOD = 271, - TOK_DIV = 272, - TOK_MULT = 273, - TOK_COMPL = 274, - TOK_TILDETILDE = 275, - TOK_EQTILDE = 276, - TOK_COLON = 277, - TOK_LP = 278, - TOK_RP = 279, - TOKEN = 280 - }; -#endif -/* Tokens. */ -#define TOK_COMMA 258 -#define TOK_COLONCOLON 259 -#define TOK_COND 260 -#define TOK_OR 261 -#define TOK_AND 262 -#define TOK_NE 263 -#define TOK_LE 264 -#define TOK_GE 265 -#define TOK_LT 266 -#define TOK_GT 267 -#define TOK_EQ 268 -#define TOK_MINUS 269 -#define TOK_PLUS 270 -#define TOK_MOD 271 -#define TOK_DIV 272 -#define TOK_MULT 273 -#define TOK_COMPL 274 -#define TOK_TILDETILDE 275 -#define TOK_EQTILDE 276 -#define TOK_COLON 277 -#define TOK_LP 278 -#define TOK_RP 279 -#define TOKEN 280 - - - +#define yyparse ast_yyparse +#define yylex ast_yylex +#define yyerror ast_yyerror +#define yylval ast_yylval +#define yychar ast_yychar +#define yydebug ast_yydebug +#define yynerrs ast_yynerrs +#define yylloc ast_yylloc /* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ #line 1 "ast_expr2.y" /* Written by Pace Willisson (pace@blitz.com) @@ -466,6 +414,9 @@ int ast_yyerror(const char *,YYLTYPE *, struct parse_io *); #define DESTROY(x) {if((x)->type == AST_EXPR_numeric_string || (x)->type == AST_EXPR_string) free((x)->u.s); (x)->u.s = 0; free(x);} +/* Line 189 of yacc.c */ +#line 419 "ast_expr2.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -484,19 +435,59 @@ int ast_yyerror(const char *,YYLTYPE *, struct parse_io *); # define YYTOKEN_TABLE 0 #endif + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + TOK_COMMA = 258, + TOK_COLONCOLON = 259, + TOK_COND = 260, + TOK_OR = 261, + TOK_AND = 262, + TOK_NE = 263, + TOK_LE = 264, + TOK_GE = 265, + TOK_LT = 266, + TOK_GT = 267, + TOK_EQ = 268, + TOK_MINUS = 269, + TOK_PLUS = 270, + TOK_MOD = 271, + TOK_DIV = 272, + TOK_MULT = 273, + TOK_COMPL = 274, + TOK_TILDETILDE = 275, + TOK_EQTILDE = 276, + TOK_COLON = 277, + TOK_LP = 278, + TOK_RP = 279, + TOKEN = 280 + }; +#endif + + + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 345 "ast_expr2.y" { + +/* Line 214 of yacc.c */ +#line 345 "ast_expr2.y" + struct val *val; struct expr_node *arglist; -} -/* Line 187 of yacc.c. */ -#line 496 "ast_expr2.c" - YYSTYPE; + + + +/* Line 214 of yacc.c */ +#line 487 "ast_expr2.c" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED @@ -514,13 +505,15 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ + +/* Line 264 of yacc.c */ #line 350 "ast_expr2.y" extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t)); -/* Line 216 of yacc.c. */ -#line 524 "ast_expr2.c" +/* Line 264 of yacc.c */ +#line 517 "ast_expr2.c" #ifdef short # undef short @@ -595,14 +588,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -684,9 +677,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - YYLTYPE yyls; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; + YYLTYPE yyls_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ @@ -721,12 +714,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -1146,17 +1139,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -1191,11 +1187,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) , &(yylsp[(yyi + 1) - (yynrhs)]) ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -1473,129 +1469,219 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) switch (yytype) { case 4: /* "TOK_COLONCOLON" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; + +/* Line 1000 of yacc.c */ #line 1479 "ast_expr2.c" break; case 5: /* "TOK_COND" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1484 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1488 "ast_expr2.c" break; case 6: /* "TOK_OR" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1489 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1497 "ast_expr2.c" break; case 7: /* "TOK_AND" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1494 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1506 "ast_expr2.c" break; case 8: /* "TOK_NE" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1499 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1515 "ast_expr2.c" break; case 9: /* "TOK_LE" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1504 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1524 "ast_expr2.c" break; case 10: /* "TOK_GE" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1509 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1533 "ast_expr2.c" break; case 11: /* "TOK_LT" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1514 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1542 "ast_expr2.c" break; case 12: /* "TOK_GT" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1519 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1551 "ast_expr2.c" break; case 13: /* "TOK_EQ" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1524 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1560 "ast_expr2.c" break; case 14: /* "TOK_MINUS" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1529 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1569 "ast_expr2.c" break; case 15: /* "TOK_PLUS" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1534 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1578 "ast_expr2.c" break; case 16: /* "TOK_MOD" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1539 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1587 "ast_expr2.c" break; case 17: /* "TOK_DIV" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1544 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1596 "ast_expr2.c" break; case 18: /* "TOK_MULT" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1549 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1605 "ast_expr2.c" break; case 19: /* "TOK_COMPL" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1554 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1614 "ast_expr2.c" break; case 20: /* "TOK_TILDETILDE" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1559 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1623 "ast_expr2.c" break; case 21: /* "TOK_EQTILDE" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1564 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1632 "ast_expr2.c" break; case 22: /* "TOK_COLON" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1569 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1641 "ast_expr2.c" break; case 23: /* "TOK_LP" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1574 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1650 "ast_expr2.c" break; case 24: /* "TOK_RP" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1579 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1659 "ast_expr2.c" break; case 25: /* "TOKEN" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1584 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1668 "ast_expr2.c" break; case 29: /* "expr" */ + +/* Line 1000 of yacc.c */ #line 368 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1589 "ast_expr2.c" + +/* Line 1000 of yacc.c */ +#line 1677 "ast_expr2.c" break; default: break; } } - /* Prevent warnings from -Wmissing-prototypes. */ - #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1614,10 +1700,9 @@ int yyparse (); - -/*----------. -| yyparse. | -`----------*/ +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1641,88 +1726,97 @@ yyparse () #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; -/* Location data for the look-ahead symbol. */ +/* Location data for the lookahead symbol. */ YYLTYPE yylloc; - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + /* Number of syntax errors so far. */ + int yynerrs; - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + `yyls': related to locations. - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; + YYLTYPE *yyls; + YYLTYPE *yylsp; - YYSIZE_T yystacksize = YYINITDEPTH; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[2]; + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; YYLTYPE yyloc; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yyls = yylsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; yylsp = yyls; + #if YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 0; + yylloc.first_column = yylloc.last_column = 1; #endif goto yysetstate; @@ -1761,6 +1855,7 @@ YYLTYPE yylloc; &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); + yyls = yyls1; yyss = yyss1; yyvs = yyvs1; @@ -1782,9 +1877,9 @@ YYLTYPE yylloc; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - YYSTACK_RELOCATE (yyls); + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -1805,6 +1900,9 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1813,16 +1911,16 @@ YYLTYPE yylloc; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1854,20 +1952,16 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -1908,6 +2002,8 @@ yyreduce: switch (yyn) { case 2: + +/* Line 1455 of yacc.c */ #line 374 "ast_expr2.y" { ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1); ((struct parse_io *)parseio)->val->type = (yyvsp[(1) - (1)].val)->type; @@ -1920,6 +2016,8 @@ yyreduce: break; case 3: + +/* Line 1455 of yacc.c */ #line 382 "ast_expr2.y" {/* nothing */ ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1); ((struct parse_io *)parseio)->val->type = AST_EXPR_string; @@ -1928,11 +2026,15 @@ yyreduce: break; case 4: + +/* Line 1455 of yacc.c */ #line 389 "ast_expr2.y" { (yyval.arglist) = alloc_expr_node(AST_EXPR_NODE_VAL); (yyval.arglist)->val = (yyvsp[(1) - (1)].val);;} break; case 5: + +/* Line 1455 of yacc.c */ #line 390 "ast_expr2.y" {struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL); struct expr_node *t; @@ -1943,6 +2045,8 @@ yyreduce: break; case 6: + +/* Line 1455 of yacc.c */ #line 396 "ast_expr2.y" {struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL); struct expr_node *t; /* NULL args should OK */ @@ -1953,6 +2057,8 @@ yyreduce: break; case 7: + +/* Line 1455 of yacc.c */ #line 405 "ast_expr2.y" { (yyval.val) = op_func((yyvsp[(1) - (4)].val),(yyvsp[(3) - (4)].arglist), ((struct parse_io *)parseio)->chan); DESTROY((yyvsp[(2) - (4)].val)); @@ -1963,11 +2069,15 @@ yyreduce: break; case 8: + +/* Line 1455 of yacc.c */ #line 411 "ast_expr2.y" {(yyval.val) = (yyvsp[(1) - (1)].val);;} break; case 9: + +/* Line 1455 of yacc.c */ #line 412 "ast_expr2.y" { (yyval.val) = (yyvsp[(2) - (3)].val); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1976,6 +2086,8 @@ yyreduce: break; case 10: + +/* Line 1455 of yacc.c */ #line 416 "ast_expr2.y" { (yyval.val) = op_or ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -1984,6 +2096,8 @@ yyreduce: break; case 11: + +/* Line 1455 of yacc.c */ #line 420 "ast_expr2.y" { (yyval.val) = op_and ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -1992,6 +2106,8 @@ yyreduce: break; case 12: + +/* Line 1455 of yacc.c */ #line 424 "ast_expr2.y" { (yyval.val) = op_eq ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2000,6 +2116,8 @@ yyreduce: break; case 13: + +/* Line 1455 of yacc.c */ #line 428 "ast_expr2.y" { (yyval.val) = op_gt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2008,6 +2126,8 @@ yyreduce: break; case 14: + +/* Line 1455 of yacc.c */ #line 432 "ast_expr2.y" { (yyval.val) = op_lt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2016,6 +2136,8 @@ yyreduce: break; case 15: + +/* Line 1455 of yacc.c */ #line 436 "ast_expr2.y" { (yyval.val) = op_ge ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2024,6 +2146,8 @@ yyreduce: break; case 16: + +/* Line 1455 of yacc.c */ #line 440 "ast_expr2.y" { (yyval.val) = op_le ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2032,6 +2156,8 @@ yyreduce: break; case 17: + +/* Line 1455 of yacc.c */ #line 444 "ast_expr2.y" { (yyval.val) = op_ne ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2040,6 +2166,8 @@ yyreduce: break; case 18: + +/* Line 1455 of yacc.c */ #line 448 "ast_expr2.y" { (yyval.val) = op_plus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2048,6 +2176,8 @@ yyreduce: break; case 19: + +/* Line 1455 of yacc.c */ #line 452 "ast_expr2.y" { (yyval.val) = op_minus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2056,6 +2186,8 @@ yyreduce: break; case 20: + +/* Line 1455 of yacc.c */ #line 456 "ast_expr2.y" { (yyval.val) = op_negate ((yyvsp[(2) - (2)].val)); DESTROY((yyvsp[(1) - (2)].val)); @@ -2064,6 +2196,8 @@ yyreduce: break; case 21: + +/* Line 1455 of yacc.c */ #line 460 "ast_expr2.y" { (yyval.val) = op_compl ((yyvsp[(2) - (2)].val)); DESTROY((yyvsp[(1) - (2)].val)); @@ -2072,6 +2206,8 @@ yyreduce: break; case 22: + +/* Line 1455 of yacc.c */ #line 464 "ast_expr2.y" { (yyval.val) = op_times ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2080,6 +2216,8 @@ yyreduce: break; case 23: + +/* Line 1455 of yacc.c */ #line 468 "ast_expr2.y" { (yyval.val) = op_div ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2088,6 +2226,8 @@ yyreduce: break; case 24: + +/* Line 1455 of yacc.c */ #line 472 "ast_expr2.y" { (yyval.val) = op_rem ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2096,6 +2236,8 @@ yyreduce: break; case 25: + +/* Line 1455 of yacc.c */ #line 476 "ast_expr2.y" { (yyval.val) = op_colon ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2104,6 +2246,8 @@ yyreduce: break; case 26: + +/* Line 1455 of yacc.c */ #line 480 "ast_expr2.y" { (yyval.val) = op_eqtilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2112,6 +2256,8 @@ yyreduce: break; case 27: + +/* Line 1455 of yacc.c */ #line 484 "ast_expr2.y" { (yyval.val) = op_cond ((yyvsp[(1) - (5)].val), (yyvsp[(3) - (5)].val), (yyvsp[(5) - (5)].val)); DESTROY((yyvsp[(2) - (5)].val)); @@ -2121,6 +2267,8 @@ yyreduce: break; case 28: + +/* Line 1455 of yacc.c */ #line 489 "ast_expr2.y" { (yyval.val) = op_tildetilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); @@ -2129,8 +2277,9 @@ yyreduce: break; -/* Line 1267 of yacc.c. */ -#line 2134 "ast_expr2.c" + +/* Line 1455 of yacc.c */ +#line 2283 "ast_expr2.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2206,7 +2355,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -2223,7 +2372,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -2281,14 +2430,11 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; yyerror_range[1] = yylloc; /* Using YYLLOC is tempting, but would change the location of - the look-ahead. YYLOC is available though. */ + the lookahead. YYLOC is available though. */ YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); *++yylsp = yyloc; @@ -2313,7 +2459,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2324,7 +2470,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); /* Do not reclaim the symbols of the rule which action triggered @@ -2350,6 +2496,8 @@ yyreturn: } + +/* Line 1675 of yacc.c */ #line 495 "ast_expr2.y" @@ -2913,18 +3061,18 @@ static struct val *op_func(struct val *funcname, struct expr_node *arglist, stru } } else { - ast_log(LOG_ERROR,"Error! '%s' doesn't appear to be an available function!", funcname->u.s); + ast_log(LOG_ERROR, "Error! '%s' doesn't appear to be an available function!\n", funcname->u.s); return (make_number ((FP___TYPE)0.0)); } #else - ast_log(LOG_ERROR,"Error! '%s' is not available in the standalone version!", funcname->u.s); + ast_log(LOG_ERROR, "Error! '%s' is not available in the standalone version!\n", funcname->u.s); return (make_number ((FP___TYPE)0.0)); #endif } } else { - ast_log(LOG_ERROR,"Error! '%s' is not possibly a function name!", funcname->u.s); + ast_log(LOG_ERROR, "Error! '%s' is not possibly a function name!\n", funcname->u.s); return (make_number ((FP___TYPE)0.0)); } return (make_number ((FP___TYPE)0.0)); @@ -3261,6 +3409,8 @@ op_compl (struct val *a) v1 = 0; else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' ) v1 = 0; + else + v1 = atoi(a->u.s); } break; @@ -3273,6 +3423,8 @@ op_compl (struct val *a) v1 = 0; else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' ) v1 = 0; + else + v1 = atoi(a->u.s); } break; } @@ -3408,7 +3560,7 @@ op_colon (struct val *a, struct val *b) /* compile regular expression */ if ((eval = regcomp (&rp, b->u.s, REG_EXTENDED)) != 0) { regerror (eval, &rp, errbuf, sizeof(errbuf)); - ast_log(LOG_WARNING,"regcomp() error : %s",errbuf); + ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf); free_value(a); free_value(b); return make_str(""); @@ -3459,7 +3611,7 @@ op_eqtilde (struct val *a, struct val *b) /* compile regular expression */ if ((eval = regcomp (&rp, b->u.s, REG_EXTENDED)) != 0) { regerror (eval, &rp, errbuf, sizeof(errbuf)); - ast_log(LOG_WARNING,"regcomp() error : %s",errbuf); + ast_log(LOG_WARNING, "regcomp() error : %s\n", errbuf); free_value(a); free_value(b); return make_str(""); diff --git a/main/ast_expr2.h b/main/ast_expr2.h index 2d6dc479c..1fefe11f7 100644 --- a/main/ast_expr2.h +++ b/main/ast_expr2.h @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,10 +28,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -64,47 +64,27 @@ TOKEN = 280 }; #endif -/* Tokens. */ -#define TOK_COMMA 258 -#define TOK_COLONCOLON 259 -#define TOK_COND 260 -#define TOK_OR 261 -#define TOK_AND 262 -#define TOK_NE 263 -#define TOK_LE 264 -#define TOK_GE 265 -#define TOK_LT 266 -#define TOK_GT 267 -#define TOK_EQ 268 -#define TOK_MINUS 269 -#define TOK_PLUS 270 -#define TOK_MOD 271 -#define TOK_DIV 272 -#define TOK_MULT 273 -#define TOK_COMPL 274 -#define TOK_TILDETILDE 275 -#define TOK_EQTILDE 276 -#define TOK_COLON 277 -#define TOK_LP 278 -#define TOK_RP 279 -#define TOKEN 280 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 345 "ast_expr2.y" { + +/* Line 1676 of yacc.c */ +#line 345 "ast_expr2.y" + struct val *val; struct expr_node *arglist; -} -/* Line 1489 of yacc.c. */ -#line 104 "ast_expr2.h" - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +#line 84 "ast_expr2.h" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif @@ -123,3 +103,4 @@ typedef struct YYLTYPE #endif + diff --git a/main/ast_expr2.y b/main/ast_expr2.y index d963fba61..aabca8a46 100644 --- a/main/ast_expr2.y +++ b/main/ast_expr2.y @@ -1402,6 +1402,8 @@ op_compl (struct val *a) v1 = 0; else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' ) v1 = 0; + else + v1 = atoi(a->u.s); } break; @@ -1414,6 +1416,8 @@ op_compl (struct val *a) v1 = 0; else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' ) v1 = 0; + else + v1 = atoi(a->u.s); } break; } diff --git a/main/asterisk.c b/main/asterisk.c index 270668546..12025f5b9 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -275,6 +275,7 @@ static char *_argv[256]; static int shuttingdown; static int restartnow; static pthread_t consolethread = AST_PTHREADT_NULL; +static pthread_t mon_sig_flags; static int canary_pid = 0; static char canary_filename[128]; @@ -1628,14 +1629,15 @@ static void quit_handler(int num, int niceness, int safeshutdown, int restart) ast_module_shutdown(); } if (ast_opt_console || (ast_opt_remote && !ast_opt_exec)) { + pthread_t thisthread = pthread_self(); if (getenv("HOME")) { snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME")); } if (!ast_strlen_zero(filename)) { ast_el_write_history(filename); } - if (consolethread == AST_PTHREADT_NULL || consolethread == pthread_self()) { - /* Only end if we are the consolethread, otherwise there's a race with that thread. */ + if (consolethread == AST_PTHREADT_NULL || consolethread == thisthread || mon_sig_flags == thisthread) { + /* Only end if we are the consolethread or signal handler, otherwise there's a race with that thread. */ if (el != NULL) { el_end(el); } @@ -2933,7 +2935,7 @@ static void ast_readconfig(void) ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_QUIET); /* Run as console (-c at startup, implies nofork) */ } else if (!strcasecmp(v->name, "console")) { - ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_CONSOLE); + ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_NO_FORK | AST_OPT_FLAG_CONSOLE); /* Run with high priority if the O/S permits (-p at startup) */ } else if (!strcasecmp(v->name, "highpriority")) { ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIGH_PRIORITY); @@ -3176,6 +3178,7 @@ int main(int argc, char *argv[]) tdd_init(); ast_tps_init(); ast_fd_init(); + ast_pbx_init(); if (getenv("HOME")) snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME")); @@ -3354,7 +3357,7 @@ int main(int argc, char *argv[]) } fd2 = (l.rlim_cur > sizeof(readers) * 8 ? sizeof(readers) * 8 : l.rlim_cur) - 1; - if (dup2(fd, fd2)) { + if (dup2(fd, fd2) < 0) { ast_log(LOG_WARNING, "Cannot open maximum file descriptor %d at boot? %s\n", fd2, strerror(errno)); break; } @@ -3786,9 +3789,8 @@ int main(int argc, char *argv[]) /* Console stuff now... */ /* Register our quit function */ char title[256]; - pthread_t dont_care; - ast_pthread_create_detached(&dont_care, NULL, monitor_sig_flags, NULL); + ast_pthread_create_detached(&mon_sig_flags, NULL, monitor_sig_flags, NULL); set_icon("Asterisk"); snprintf(title, sizeof(title), "Asterisk Console on '%s' (pid %ld)", hostname, (long)ast_mainpid); diff --git a/main/channel.c b/main/channel.c index dc77a21e7..460c7bd62 100644 --- a/main/channel.c +++ b/main/channel.c @@ -778,7 +778,7 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char int x; int flags; struct varshead *headp; - char *tech = ""; + char *tech = "", *tech2 = NULL; /* If shutting down, don't allocate any new channels */ if (shutting_down) { @@ -820,7 +820,9 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char } if ((tmp->timer = ast_timer_open())) { - needqueue = 0; + if (strcmp(ast_timer_get_name(tmp->timer), "timerfd")) { + needqueue = 0; + } tmp->timingfd = ast_timer_fd(tmp->timer); } else { tmp->timingfd = -1; @@ -883,7 +885,7 @@ alertpipe_failed: tmp->cid.cid_num = ast_strdup(cid_num); if (!ast_strlen_zero(name_fmt)) { - char *slash; + char *slash, *slash2; /* Almost every channel is calling this function, and setting the name via the ast_string_field_build() call. * And they all use slightly different formats for their name string. * This means, to set the name here, we have to accept variable args, and call the string_field_build from here. @@ -894,6 +896,10 @@ alertpipe_failed: ast_string_field_build_va(tmp, name, name_fmt, ap1, ap2); tech = ast_strdupa(tmp->name); if ((slash = strchr(tech, '/'))) { + if ((slash2 = strchr(slash + 1, '/'))) { + tech2 = slash + 1; + *slash2 = '\0'; + } *slash = '\0'; } } @@ -950,7 +956,7 @@ alertpipe_failed: * proper and correct place to make this call, but you sure do have to pass * a lot of data into this func to do it here! */ - if (ast_get_channel_tech(tech)) { + if (ast_get_channel_tech(tech) || (tech2 && ast_get_channel_tech(tech2))) { manager_event(EVENT_FLAG_CALL, "Newchannel", "Channel: %s\r\n" "ChannelState: %d\r\n" @@ -1019,7 +1025,9 @@ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, in AST_LIST_HEAD_INIT_NOLOCK(&frames); for (cur = fin; cur; cur = AST_LIST_NEXT(cur, frame_list)) { if (!(f = ast_frdup(cur))) { - ast_frfree(AST_LIST_FIRST(&frames)); + if (AST_LIST_FIRST(&frames)) { + ast_frfree(AST_LIST_FIRST(&frames)); + } ast_channel_unlock(chan); return -1; } @@ -2725,7 +2733,18 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { if (chan->generator) ast_deactivate_generator(chan); - goto done; + + /* It is possible for chan->_softhangup to be set, yet there still be control + * frames that still need to be read. Instead of just going to 'done' in the + * case of ast_check_hangup(), we instead need to send the HANGUP frame so that + * it can mark the end of the read queue. If there are frames to be read, + * ast_queue_control will be called repeatedly, but will only queue one hangup + * frame. */ + if (ast_check_hangup(chan)) { + ast_queue_control(chan, AST_CONTROL_HANGUP); + } else { + goto done; + } } #ifdef AST_DEVMODE @@ -3980,6 +3999,7 @@ struct ast_channel *ast_call_forward(struct ast_channel *caller, struct ast_chan struct ast_channel *new = NULL; char *data, *type; int cause = 0; + int res; /* gather data and request the new forward channel */ ast_copy_string(tmpchan, orig->call_forward, sizeof(tmpchan)); @@ -4035,7 +4055,11 @@ struct ast_channel *ast_call_forward(struct ast_channel *caller, struct ast_chan ast_channel_unlock(orig); /* call new channel */ - if ((*timeout = ast_call(new, data, 0))) { + res = ast_call(new, data, 0); + if (timeout) { + *timeout = res; + } + if (res) { ast_log(LOG_NOTICE, "Unable to call forward to channel %s/%s\n", type, (char *)data); ast_hangup(orig); ast_hangup(new); @@ -4098,7 +4122,7 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d if (timeout > -1) timeout = res; if (!ast_strlen_zero(chan->call_forward)) { - if (!(chan = ast_call_forward(NULL, chan, &timeout, format, oh, outstate))) { + if (!(chan = ast_call_forward(NULL, chan, NULL, format, oh, outstate))) { return NULL; } continue; @@ -4497,19 +4521,27 @@ retrymasq: ast_debug(1, "Planning to masquerade channel %s into the structure of %s\n", clonechan->name, original->name); - if (original->masq) { - ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", - original->masq->name, original->name); - } else if (clonechan->masqr) { - ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", - clonechan->name, clonechan->masqr->name); - } else { + + if (!original->masqr && !original->masq && !clonechan->masq && !clonechan->masqr) { original->masq = clonechan; clonechan->masqr = original; ast_queue_frame(original, &ast_null_frame); ast_queue_frame(clonechan, &ast_null_frame); ast_debug(1, "Done planning to masquerade channel %s into the structure of %s\n", clonechan->name, original->name); res = 0; + } else if (original->masq) { + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + original->masq->name, original->name); + } else if (original->masqr) { + /* not yet as a previously planned masq hasn't yet happened */ + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + original->name, original->masqr->name); + } else if (clonechan->masq) { + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + clonechan->masq->name, clonechan->name); + } else { /* (clonechan->masqr) */ + ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n", + clonechan->name, clonechan->masqr->name); } ast_channel_unlock(clonechan); @@ -4921,6 +4953,9 @@ void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char ast_free(chan->cid.cid_ani); chan->cid.cid_ani = ast_strdup(cid_ani); } + if (chan->cdr) { + ast_cdr_setcid(chan->cdr, chan); + } report_new_callerid(chan); diff --git a/main/cli.c b/main/cli.c index 8361e4ebd..b2638cc48 100644 --- a/main/cli.c +++ b/main/cli.c @@ -363,6 +363,7 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg { int oldval; int newlevel; + unsigned int is_debug; int atleast = 0; int fd = a->fd; int argc = a->argc; @@ -432,21 +433,22 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg dst = &option_debug; oldval = option_debug; what = "Core debug"; + is_debug = 1; } else { dst = &option_verbose; oldval = option_verbose; what = "Verbosity"; + is_debug = 0; } if (argc == e->args + 1 && !strcasecmp(argv[e->args], "off")) { - unsigned int debug = (*what == 'C'); newlevel = 0; - dfl = debug ? &debug_files : &verbose_files; + dfl = is_debug ? &debug_files : &verbose_files; AST_RWLIST_WRLOCK(dfl); while ((adf = AST_RWLIST_REMOVE_HEAD(dfl, entry))) ast_free(adf); - ast_clear_flag(&ast_options, debug ? AST_OPT_FLAG_DEBUG_FILE : AST_OPT_FLAG_VERBOSE_FILE); + ast_clear_flag(&ast_options, is_debug ? AST_OPT_FLAG_DEBUG_FILE : AST_OPT_FLAG_VERBOSE_FILE); AST_RWLIST_UNLOCK(dfl); goto done; @@ -458,17 +460,23 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg if (sscanf(argv[e->args + atleast], "%30d", &newlevel) != 1) return CLI_SHOWUSAGE; if (argc == e->args + atleast + 2) { - unsigned int debug = (*what == 'C'); - dfl = debug ? &debug_files : &verbose_files; - + /* We have specified a module name. */ fn = argv[e->args + atleast + 1]; + dfl = is_debug ? &debug_files : &verbose_files; + AST_RWLIST_WRLOCK(dfl); - if ((adf = find_debug_file(fn, debug)) && !newlevel) { + adf = find_debug_file(fn, is_debug); + if (!newlevel) { + if (!adf) { + /* Specified off for a nonexistent entry. */ + AST_RWLIST_UNLOCK(dfl); + return CLI_SUCCESS; + } AST_RWLIST_REMOVE(dfl, adf, entry); if (AST_RWLIST_EMPTY(dfl)) - ast_clear_flag(&ast_options, debug ? AST_OPT_FLAG_DEBUG_FILE : AST_OPT_FLAG_VERBOSE_FILE); + ast_clear_flag(&ast_options, is_debug ? AST_OPT_FLAG_DEBUG_FILE : AST_OPT_FLAG_VERBOSE_FILE); AST_RWLIST_UNLOCK(dfl); ast_cli(fd, "%s was %d and has been set to 0 for '%s'\n", what, adf->level, fn); ast_free(adf); @@ -481,23 +489,36 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg AST_RWLIST_UNLOCK(dfl); return CLI_SUCCESS; } - } else if (!(adf = ast_calloc(1, sizeof(*adf) + strlen(fn) + 1))) { - AST_RWLIST_UNLOCK(dfl); - return CLI_FAILURE; + oldval = adf->level; + adf->level = newlevel; + } else { + adf = ast_calloc(1, sizeof(*adf) + strlen(fn) + 1); + if (!adf) { + AST_RWLIST_UNLOCK(dfl); + return CLI_FAILURE; + } + oldval = adf->level; + adf->level = newlevel; + strcpy(adf->filename, fn); + AST_RWLIST_INSERT_TAIL(dfl, adf, entry); } - oldval = adf->level; - adf->level = newlevel; - strcpy(adf->filename, fn); + ast_set_flag(&ast_options, is_debug ? AST_OPT_FLAG_DEBUG_FILE : AST_OPT_FLAG_VERBOSE_FILE); - ast_set_flag(&ast_options, debug ? AST_OPT_FLAG_DEBUG_FILE : AST_OPT_FLAG_VERBOSE_FILE); - - AST_RWLIST_INSERT_TAIL(dfl, adf, entry); AST_RWLIST_UNLOCK(dfl); ast_cli(fd, "%s was %d and has been set to %d for '%s'\n", what, oldval, adf->level, adf->filename); return CLI_SUCCESS; + } else if (!newlevel) { + /* Specified level as 0 instead of off. */ + dfl = is_debug ? &debug_files : &verbose_files; + + AST_RWLIST_WRLOCK(dfl); + while ((adf = AST_RWLIST_REMOVE_HEAD(dfl, entry))) + ast_free(adf); + ast_clear_flag(&ast_options, is_debug ? AST_OPT_FLAG_DEBUG_FILE : AST_OPT_FLAG_VERBOSE_FILE); + AST_RWLIST_UNLOCK(dfl); } done: diff --git a/main/devicestate.c b/main/devicestate.c index 49b7e1efc..edd378a83 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -609,7 +609,8 @@ static void process_collection(const char *device, struct change_collection *col state = ast_devstate_aggregate_result(&agg); - ast_debug(1, "Aggregate devstate result is %d\n", state); + ast_debug(1, "Aggregate devstate result is '%s' for '%s'\n", + ast_devstate2str(state), device); event = ast_event_get_cached(AST_EVENT_DEVICE_STATE, AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, device, diff --git a/main/features.c b/main/features.c index fd78a5a29..70df404a1 100644 --- a/main/features.c +++ b/main/features.c @@ -2277,7 +2277,7 @@ static struct ast_channel *feature_request_and_dial(struct ast_channel *caller, if (chan && (chan == active_channel)){ if (!ast_strlen_zero(chan->call_forward)) { - if (!(chan = ast_call_forward(caller, chan, &to, format, NULL, outstate))) { + if (!(chan = ast_call_forward(caller, chan, NULL, format, NULL, outstate))) { return NULL; } continue; @@ -3680,6 +3680,17 @@ static struct ast_parkinglot *build_parkinglot(char *name, struct ast_variable * } } else if (!strcasecmp(confvar->name, "findslot")) { parkinglot->parkfindnext = (!strcasecmp(confvar->value, "next")); + } else if (!strcasecmp(confvar->name, "parkedcalltransfers") || + !strcasecmp(confvar->name, "parkedcallreparking") || + !strcasecmp(confvar->name, "parkedcallhangup") || + !strcasecmp(confvar->name, "parkedcallrecording")) { + if (!strcasecmp(confvar->value, "both")) { + parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH; + } else if (!strcasecmp(confvar->value, "caller")) { + parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYCALLER; + } else if (!strcasecmp(confvar->value, "callee")) { + parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE; + } } confvar = confvar->next; } diff --git a/main/file.c b/main/file.c index ae67f8bc9..20cda4929 100644 --- a/main/file.c +++ b/main/file.c @@ -961,10 +961,12 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p * done this way because there is no where for ast_openstream_full to * return the file had no data. */ seekattempt = fseek(fs->f, -1, SEEK_END); - if (!seekattempt) - ast_seekstream(fs, 0, SEEK_SET); - else + if (seekattempt && errno == EINVAL) { + /* Zero-length file, as opposed to a pipe */ return 0; + } else { + ast_seekstream(fs, 0, SEEK_SET); + } vfs = ast_openvstream(chan, filename, preflang); if (vfs) { diff --git a/main/manager.c b/main/manager.c index b1ea5d374..5d30789dd 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2432,6 +2432,7 @@ static char mandescr_originate[] = " Timeout: How long to wait for call to be answered (in ms. Default: 30000)\n" " CallerID: Caller ID to be set on the outgoing channel\n" " Variable: Channel variable to set, multiple Variable: headers are allowed\n" +" Codecs: Comma-separated list of codecs to use for the new channels\n" " Account: Account code\n" " Async: Set to 'true' for fast origination\n"; diff --git a/main/pbx.c b/main/pbx.c index 7a2e0eb4b..acf7297f2 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -12,7 +12,7 @@ * channels for your use. * * This program is free software, distributed under the terms of -* the GNU General Public License Version 2. See the LICENSE file + * the GNU General Public License Version 2. See the LICENSE file * at the top of the source tree. */ @@ -64,6 +64,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/indications.h" #include "asterisk/taskprocessor.h" #include "asterisk/xmldoc.h" +#include "asterisk/astobj2.h" /*! * \note I M P O R T A N T : @@ -886,9 +887,15 @@ struct ast_hint { struct ast_exten *exten; /*!< Extension */ int laststate; /*!< Last known state */ AST_LIST_HEAD_NOLOCK(, ast_state_cb) callbacks; /*!< Callback list for this extension */ - AST_RWLIST_ENTRY(ast_hint) list;/*!< Pointer to next hint in list */ }; +/* --- Hash tables of various objects --------*/ +#ifdef LOW_MEMORY +static const int HASH_EXTENHINT_SIZE = 17; +#else +static const int HASH_EXTENHINT_SIZE = 563; +#endif + static const struct cfextension_states { int extension_state; const char * const text; @@ -1131,13 +1138,14 @@ static AST_RWLIST_HEAD_STATIC(switches, ast_switch); static int stateid = 1; /* WARNING: - When holding this list's lock, do _not_ do anything that will cause conlock + When holding this container's lock, do _not_ do anything that will cause conlock to be taken, unless you _already_ hold it. The ast_merge_contexts_and_delete function will take the locks in conlock/hints order, so any other paths that require both locks must also take them in that order. */ -static AST_RWLIST_HEAD_STATIC(hints, ast_hint); +static struct ao2_container *hints; +/* XXX TODO Convert this to an astobj2 container, too. */ static AST_LIST_HEAD_NOLOCK_STATIC(statecbs, ast_state_cb); #ifdef CONTEXT_DEBUG @@ -1947,6 +1955,10 @@ static struct match_char *add_exten_to_pattern_tree(struct ast_context *con, str qsort(buf, specif, 1, compare_char); specif <<= 8; specif += buf[0]; + } else if (*s1 == '-') { + /* Skip dashes in patterns */ + s1++; + continue; } else { if (*s1 == '\\') { @@ -3861,15 +3873,15 @@ static int handle_statechange(void *datap) struct ast_hint *hint; struct ast_str *str; struct statechange *sc = datap; + struct ao2_iterator i; if (!(str = ast_str_create(1024))) { return -1; } - ast_rdlock_contexts(); - AST_RWLIST_RDLOCK(&hints); - AST_RWLIST_TRAVERSE(&hints, hint, list) { + i = ao2_iterator_init(hints, 0); + for (hint = ao2_iterator_next(&i); hint; ao2_ref(hint, -1), hint = ao2_iterator_next(&i)) { struct ast_state_cb *cblist; char *cur, *parse; int state; @@ -3896,6 +3908,18 @@ static int handle_statechange(void *datap) /* Device state changed since last check - notify the watchers */ + ast_rdlock_contexts(); + ao2_lock(hints); + ao2_lock(hint); + + if (hint->exten == NULL) { + /* the extension has been destroyed */ + ao2_unlock(hint); + ao2_unlock(hints); + ast_unlock_contexts(); + continue; + } + /* For general callbacks */ AST_LIST_TRAVERSE(&statecbs, cblist, entry) { cblist->callback(hint->exten->parent->name, hint->exten->exten, state, cblist->data); @@ -3907,9 +3931,11 @@ static int handle_statechange(void *datap) } hint->laststate = state; /* record we saw the change */ + ao2_unlock(hint); + ao2_unlock(hints); + ast_unlock_contexts(); } - AST_RWLIST_UNLOCK(&hints); - ast_unlock_contexts(); + ao2_iterator_destroy(&i); ast_free(str); ast_free(sc); return 0; @@ -3925,19 +3951,19 @@ int ast_extension_state_add(const char *context, const char *exten, /* If there's no context and extension: add callback to statecbs list */ if (!context && !exten) { - AST_RWLIST_WRLOCK(&hints); + ao2_lock(hints); AST_LIST_TRAVERSE(&statecbs, cblist, entry) { if (cblist->callback == callback) { cblist->data = data; - AST_RWLIST_UNLOCK(&hints); + ao2_unlock(hints); return 0; } } /* Now insert the callback */ if (!(cblist = ast_calloc(1, sizeof(*cblist)))) { - AST_RWLIST_UNLOCK(&hints); + ao2_unlock(hints); return -1; } cblist->id = 0; @@ -3946,8 +3972,7 @@ int ast_extension_state_add(const char *context, const char *exten, AST_LIST_INSERT_HEAD(&statecbs, cblist, entry); - AST_RWLIST_UNLOCK(&hints); - + ao2_unlock(hints); return 0; } @@ -3975,22 +4000,15 @@ int ast_extension_state_add(const char *context, const char *exten, } /* Find the hint in the list of hints */ - AST_RWLIST_WRLOCK(&hints); - - AST_RWLIST_TRAVERSE(&hints, hint, list) { - if (hint->exten == e) - break; - } + hint = ao2_find(hints, e, 0); if (!hint) { - /* We have no hint, sorry */ - AST_RWLIST_UNLOCK(&hints); return -1; } /* Now insert the callback in the callback list */ if (!(cblist = ast_calloc(1, sizeof(*cblist)))) { - AST_RWLIST_UNLOCK(&hints); + ao2_ref(hint, -1); return -1; } @@ -3998,25 +4016,43 @@ int ast_extension_state_add(const char *context, const char *exten, cblist->callback = callback; /* Pointer to callback routine */ cblist->data = data; /* Data for the callback */ + ao2_lock(hint); AST_LIST_INSERT_HEAD(&hint->callbacks, cblist, entry); + ao2_unlock(hint); - AST_RWLIST_UNLOCK(&hints); + ao2_ref(hint, -1); return cblist->id; } /*! \brief Remove a watcher from the callback list */ +static int find_hint_by_cb_id(void *obj, void *arg, int flags) +{ + const struct ast_hint *hint = obj; + int *id = arg; + struct ast_state_cb *cb; + + AST_LIST_TRAVERSE(&hint->callbacks, cb, entry) { + if (cb->id == *id) { + return CMP_MATCH | CMP_STOP; + } + } + + return 0; +} + +/*! \brief ast_extension_state_del: Remove a watcher from the callback list */ int ast_extension_state_del(int id, ast_state_cb_type callback) { struct ast_state_cb *p_cur = NULL; int ret = -1; - if (!id && !callback) + if (!id && !callback) { return -1; - - AST_RWLIST_WRLOCK(&hints); + } if (!id) { /* id == 0 is a callback without extension */ + ao2_lock(hints); AST_LIST_TRAVERSE_SAFE_BEGIN(&statecbs, p_cur, entry) { if (p_cur->callback == callback) { AST_LIST_REMOVE_CURRENT(entry); @@ -4024,19 +4060,25 @@ int ast_extension_state_del(int id, ast_state_cb_type callback) } } AST_LIST_TRAVERSE_SAFE_END; + ao2_unlock(hints); } else { /* callback with extension, find the callback based on ID */ struct ast_hint *hint; - AST_RWLIST_TRAVERSE(&hints, hint, list) { + + hint = ao2_callback(hints, 0, find_hint_by_cb_id, &id); + + if (hint) { + ao2_lock(hint); AST_LIST_TRAVERSE_SAFE_BEGIN(&hint->callbacks, p_cur, entry) { if (p_cur->id == id) { AST_LIST_REMOVE_CURRENT(entry); + ret = 0; break; } } AST_LIST_TRAVERSE_SAFE_END; - if (p_cur) - break; + ao2_unlock(hint); + ao2_ref(hint, -1); } } @@ -4044,70 +4086,61 @@ int ast_extension_state_del(int id, ast_state_cb_type callback) ast_free(p_cur); } - AST_RWLIST_UNLOCK(&hints); - return ret; } -/*! \brief Add hint to hint list, check initial extension state; the hints had better be WRLOCKED already! */ -static int ast_add_hint_nolock(struct ast_exten *e) +/*! \brief Add hint to hint list, check initial extension state */ +static int ast_add_hint(struct ast_exten *e) { struct ast_hint *hint; - if (!e) + if (!e) { return -1; + } - /* Search if hint exists, do nothing */ - AST_RWLIST_TRAVERSE(&hints, hint, list) { - if (hint->exten == e) { - ast_debug(2, "HINTS: Not re-adding existing hint %s: %s\n", ast_get_extension_name(e), ast_get_extension_app(e)); - return -1; - } + /* Search if hint exists, do nothing */ + hint = ao2_find(hints, e, 0); + if (hint) { + ast_debug(2, "HINTS: Not re-adding existing hint %s: %s\n", ast_get_extension_name(e), ast_get_extension_app(e)); + ao2_ref(hint, -1); + return -1; } ast_debug(2, "HINTS: Adding hint %s: %s\n", ast_get_extension_name(e), ast_get_extension_app(e)); - if (!(hint = ast_calloc(1, sizeof(*hint)))) { + if (!(hint = ao2_alloc(sizeof(*hint), NULL))) { return -1; } + /* Initialize and insert new item at the top */ hint->exten = e; hint->laststate = ast_extension_state2(e); - AST_RWLIST_INSERT_HEAD(&hints, hint, list); - - return 0; -} -/*! \brief Add hint to hint list, check initial extension state */ -static int ast_add_hint(struct ast_exten *e) -{ - int ret; + ao2_link(hints, hint); - AST_RWLIST_WRLOCK(&hints); - ret = ast_add_hint_nolock(e); - AST_RWLIST_UNLOCK(&hints); + ao2_ref(hint, -1); - return ret; + return 0; } /*! \brief Change hint for an extension */ static int ast_change_hint(struct ast_exten *oe, struct ast_exten *ne) { struct ast_hint *hint; - int res = -1; - AST_RWLIST_WRLOCK(&hints); - AST_RWLIST_TRAVERSE(&hints, hint, list) { - if (hint->exten == oe) { - hint->exten = ne; - res = 0; - break; - } + hint = ao2_find(hints, oe, 0); + + if (!hint) { + return -1; } - AST_RWLIST_UNLOCK(&hints); - return res; + ao2_lock(hint); + hint->exten = ne; + ao2_unlock(hint); + ao2_ref(hint, -1); + + return 0; } /*! \brief Remove hint from extension */ @@ -4116,32 +4149,31 @@ static int ast_remove_hint(struct ast_exten *e) /* Cleanup the Notifys if hint is removed */ struct ast_hint *hint; struct ast_state_cb *cblist; - int res = -1; - if (!e) + if (!e) { return -1; + } - AST_RWLIST_TRAVERSE_SAFE_BEGIN(&hints, hint, list) { - if (hint->exten != e) - continue; - - while ((cblist = AST_LIST_REMOVE_HEAD(&hint->callbacks, entry))) { - /* Notify with -1 and remove all callbacks */ - cblist->callback(hint->exten->parent->name, hint->exten->exten, - AST_EXTENSION_DEACTIVATED, cblist->data); - ast_free(cblist); - } - - AST_RWLIST_REMOVE_CURRENT(list); - ast_free(hint); + hint = ao2_find(hints, e, 0); - res = 0; + if (!hint) { + return -1; + } + ao2_lock(hint); - break; + while ((cblist = AST_LIST_REMOVE_HEAD(&hint->callbacks, entry))) { + /* Notify with -1 and remove all callbacks */ + cblist->callback(hint->exten->parent->name, hint->exten->exten, + AST_EXTENSION_DEACTIVATED, cblist->data); + ast_free(cblist); } - AST_RWLIST_TRAVERSE_SAFE_END; - return res; + hint->exten = NULL; + ao2_unlink(hints, hint); + ao2_unlock(hint); + ao2_ref(hint, -1); + + return 0; } @@ -5352,6 +5384,7 @@ static char *handle_show_hints(struct ast_cli_entry *e, int cmd, struct ast_cli_ int num = 0; int watchers; struct ast_state_cb *watcher; + struct ao2_iterator i; switch (cmd) { case CLI_INIT: @@ -5364,15 +5397,16 @@ static char *handle_show_hints(struct ast_cli_entry *e, int cmd, struct ast_cli_ return NULL; } - AST_RWLIST_RDLOCK(&hints); - if (AST_RWLIST_EMPTY(&hints)) { + if (ao2_container_count(hints) == 0) { ast_cli(a->fd, "There are no registered dialplan hints\n"); - AST_RWLIST_UNLOCK(&hints); return CLI_SUCCESS; } /* ... we have hints ... */ ast_cli(a->fd, "\n -= Registered Asterisk Dial Plan Hints =-\n"); - AST_RWLIST_TRAVERSE(&hints, hint, list) { + + i = ao2_iterator_init(hints, 0); + for (hint = ao2_iterator_next(&i); hint; ao2_ref(hint, -1), hint = ao2_iterator_next(&i)) { + watchers = 0; AST_LIST_TRAVERSE(&hint->callbacks, watcher, entry) { watchers++; @@ -5384,9 +5418,10 @@ static char *handle_show_hints(struct ast_cli_entry *e, int cmd, struct ast_cli_ ast_extension_state2str(hint->laststate), watchers); num++; } + + ao2_iterator_destroy(&i); ast_cli(a->fd, "----------------\n"); ast_cli(a->fd, "- %d hints registered\n", num); - AST_RWLIST_UNLOCK(&hints); return CLI_SUCCESS; } @@ -5397,21 +5432,24 @@ static char *complete_core_show_hint(const char *line, const char *word, int pos char *ret = NULL; int which = 0; int wordlen; + struct ao2_iterator i; if (pos != 3) return NULL; wordlen = strlen(word); - AST_RWLIST_RDLOCK(&hints); /* walk through all hints */ - AST_RWLIST_TRAVERSE(&hints, hint, list) { - if (!strncasecmp(word, ast_get_extension_name(hint->exten), wordlen) && ++which > state) { + i = ao2_iterator_init(hints, 0); + for (hint = ao2_iterator_next(&i); hint; ao2_unlock(hint), ao2_ref(hint, -1), hint = ao2_iterator_next(&i)) { + ao2_lock(hint); + if (!strncasecmp(word, hint->exten ? ast_get_extension_name(hint->exten) : "", wordlen) && ++which > state) { ret = ast_strdup(ast_get_extension_name(hint->exten)); + ao2_unlock(hint); break; } } - AST_RWLIST_UNLOCK(&hints); + ao2_iterator_destroy(&i); return ret; } @@ -5423,6 +5461,7 @@ static char *handle_show_hint(struct ast_cli_entry *e, int cmd, struct ast_cli_a int watchers; int num = 0, extenlen; struct ast_state_cb *watcher; + struct ao2_iterator i; switch (cmd) { case CLI_INIT: @@ -5438,15 +5477,16 @@ static char *handle_show_hint(struct ast_cli_entry *e, int cmd, struct ast_cli_a if (a->argc < 4) return CLI_SHOWUSAGE; - AST_RWLIST_RDLOCK(&hints); - if (AST_RWLIST_EMPTY(&hints)) { + if (ao2_container_count(hints) == 0) { ast_cli(a->fd, "There are no registered dialplan hints\n"); - AST_RWLIST_UNLOCK(&hints); return CLI_SUCCESS; } + extenlen = strlen(a->argv[3]); - AST_RWLIST_TRAVERSE(&hints, hint, list) { - if (!strncasecmp(ast_get_extension_name(hint->exten), a->argv[3], extenlen)) { + i = ao2_iterator_init(hints, 0); + for (hint = ao2_iterator_next(&i); hint; ao2_unlock(hint), ao2_ref(hint, -1), hint = ao2_iterator_next(&i)) { + ao2_lock(hint); + if (!strncasecmp(hint->exten ? ast_get_extension_name(hint->exten) : "", a->argv[3], extenlen)) { watchers = 0; AST_LIST_TRAVERSE(&hint->callbacks, watcher, entry) { watchers++; @@ -5459,7 +5499,7 @@ static char *handle_show_hint(struct ast_cli_entry *e, int cmd, struct ast_cli_a num++; } } - AST_RWLIST_UNLOCK(&hints); + ao2_iterator_destroy(&i); if (!num) ast_cli(a->fd, "No hints matching extension %s\n", a->argv[3]); else @@ -6655,6 +6695,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ int length; struct ast_state_cb *thiscb; struct ast_hashtab_iter *iter; + struct ao2_iterator i; /* it is very important that this function hold the hint list lock _and_ the conlock during its operation; not only do we need to ensure that the list of contexts @@ -6675,15 +6716,24 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ } ast_hashtab_end_traversal(iter); - AST_RWLIST_WRLOCK(&hints); + ao2_lock(hints); writelocktime = ast_tvnow(); /* preserve all watchers for hints */ - AST_RWLIST_TRAVERSE(&hints, hint, list) { + i = ao2_iterator_init(hints, AO2_ITERATOR_DONTLOCK); + for (hint = ao2_iterator_next(&i); hint; ao2_ref(hint, -1), hint = ao2_iterator_next(&i)) { if (!AST_LIST_EMPTY(&hint->callbacks)) { length = strlen(hint->exten->exten) + strlen(hint->exten->parent->name) + 2 + sizeof(*this); - if (!(this = ast_calloc(1, length))) + if (!(this = ast_calloc(1, length))) { + continue; + } + ao2_lock(hint); + + if (hint->exten == NULL) { + ao2_unlock(hint); continue; + } + /* this removes all the callbacks from the hint into this. */ AST_LIST_APPEND_LIST(&this->callbacks, &hint->callbacks, entry); this->laststate = hint->laststate; @@ -6691,6 +6741,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ strcpy(this->data, hint->exten->parent->name); this->exten = this->data + strlen(this->context) + 1; strcpy(this->exten, hint->exten->exten); + ao2_unlock(hint); AST_LIST_INSERT_HEAD(&store, this, list); } } @@ -6721,10 +6772,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ } /* Find the hint in the list of hints */ - AST_RWLIST_TRAVERSE(&hints, hint, list) { - if (hint->exten == exten) - break; - } + hint = ao2_find(hints, exten, 0); if (!exten || !hint) { /* this hint has been removed, notify the watchers */ while ((thiscb = AST_LIST_REMOVE_HEAD(&this->callbacks, entry))) { @@ -6732,13 +6780,18 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ ast_free(thiscb); } } else { + ao2_lock(hint); AST_LIST_APPEND_LIST(&hint->callbacks, &this->callbacks, entry); hint->laststate = this->laststate; + ao2_unlock(hint); } ast_free(this); + if (hint) { + ao2_ref(hint, -1); + } } - AST_RWLIST_UNLOCK(&hints); + ao2_unlock(hints); ast_unlock_contexts(); endlocktime = ast_tvnow(); @@ -7602,7 +7655,7 @@ static int add_pri_lockopt(struct ast_context *con, struct ast_exten *tmp, if (lockhints) { ast_add_hint(tmp); } else { - ast_add_hint_nolock(tmp); + ast_add_hint(tmp); } } } @@ -7827,7 +7880,7 @@ static int ast_add_extension2_lockopt(struct ast_context *con, if (lockhints) { ast_add_hint(tmp); } else { - ast_add_hint_nolock(tmp); + ast_add_hint(tmp); } } } @@ -9107,11 +9160,18 @@ int pbx_builtin_setvar(struct ast_channel *chan, void *data) mydata = ast_strdupa(data); name = strsep(&mydata, "="); value = mydata; - if (strchr(name, ' ')) + if (!value) { + ast_log(LOG_WARNING, "Set requires an '=' to be a valid assignment.\n"); + return 0; + } + + if (strchr(name, ' ')) { ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", name, mydata); + } pbx_builtin_setvar_helper(chan, name, value); - return(0); + + return 0; } int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata) @@ -9643,3 +9703,31 @@ int ast_async_parseable_goto(struct ast_channel *chan, const char *goto_string) { return pbx_parseable_goto(chan, goto_string, 1); } + +static int hint_hash(const void *obj, const int flags) +{ + const struct ast_hint *hint = obj; + + int res = -1; + + if (ast_get_extension_name(hint->exten)) { + res = ast_str_case_hash(ast_get_extension_name(hint->exten)); + } + + return res; +} + +static int hint_cmp(void *obj, void *arg, int flags) +{ + const struct ast_hint *hint = obj; + const struct ast_exten *exten = arg; + + return (hint->exten == exten) ? CMP_MATCH | CMP_STOP : 0; +} + +int ast_pbx_init(void) +{ + hints = ao2_container_alloc(HASH_EXTENHINT_SIZE, hint_hash, hint_cmp); + + return hints ? 0 : -1; +} diff --git a/main/rtp.c b/main/rtp.c index 2ed677769..7d60ad0bd 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -206,6 +206,7 @@ static int ast_rtcp_write_rr(const void *data); static unsigned int ast_rtcp_calc_interval(struct ast_rtp *rtp); static int ast_rtp_senddigit_continuation(struct ast_rtp *rtp); int ast_rtp_senddigit_end(struct ast_rtp *rtp, char digit); +int ast_rtp_senddigit_end_with_duration(struct ast_rtp *rtp, char digit, unsigned int duration); #define FLAG_3389_WARNING (1 << 0) #define FLAG_NAT_ACTIVE (3 << 1) @@ -3285,12 +3286,18 @@ static int ast_rtp_senddigit_continuation(struct ast_rtp *rtp) return 0; } -/*! \brief Send end packets for DTMF */ int ast_rtp_senddigit_end(struct ast_rtp *rtp, char digit) { + return ast_rtp_senddigit_end_with_duration(rtp, digit, 0); +} + +/*! \brief Send end packets for DTMF */ +int ast_rtp_senddigit_end_with_duration(struct ast_rtp *rtp, char digit, unsigned int duration) +{ unsigned int *rtpheader; int hdrlen = 12, res = 0, i = 0; char data[256]; + unsigned int measured_samples; /* If no address, then bail out */ if (!rtp->them.sin_addr.s_addr || !rtp->them.sin_port) @@ -3313,6 +3320,11 @@ int ast_rtp_senddigit_end(struct ast_rtp *rtp, char digit) rtp->dtmfmute = ast_tvadd(ast_tvnow(), ast_tv(0, 500000)); + if (duration > 0 && (measured_samples = duration * rtp_get_rate(rtp->f.subclass) / 1000) > rtp->send_duration) { + ast_debug(2, "Adjusting final end duration from %u to %u\n", rtp->send_duration, measured_samples); + rtp->send_duration = measured_samples; + } + rtpheader = (unsigned int *)data; rtpheader[1] = htonl(rtp->lastdigitts); rtpheader[2] = htonl(rtp->ssrc); diff --git a/main/strcompat.c b/main/strcompat.c index a3f0e1497..efd85c3bb 100644 --- a/main/strcompat.c +++ b/main/strcompat.c @@ -163,6 +163,19 @@ int vasprintf(char **strp, const char *fmt, va_list ap) } #endif /* !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC) */ +#ifndef HAVE_TIMERSUB +void timersub(struct timeval *tvend, struct timeval *tvstart, struct timeval *tvdiff) +{ + tvdiff->tv_sec = tvend->tv_sec - tvstart->tv_sec; + tvdiff->tv_usec = tvend->tv_usec - tvstart->tv_usec; + if (tvdiff->tv_usec < 0) { + tvdiff->tv_sec --; + tvdiff->tv_usec += 1000000; + } + +} +#endif + /* * Based on Code from bsd-asprintf from OpenSSH * Copyright (c) 2004 Darren Tucker. diff --git a/main/timing.c b/main/timing.c index 751008ecf..7fc50c50a 100644 --- a/main/timing.c +++ b/main/timing.c @@ -205,6 +205,11 @@ unsigned int ast_timer_get_max_rate(const struct ast_timer *handle) return res; } +const char *ast_timer_get_name(const struct ast_timer *handle) +{ + return handle->holder->iface->name; +} + static char *timing_test(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { struct ast_timer *timer; diff --git a/pbx/ael/ael-test/ref.ael-ntest10 b/pbx/ael/ael-test/ref.ael-ntest10 index 1b72c5387..d81f33947 100644 --- a/pbx/ael/ael-test/ref.ael-ntest10 +++ b/pbx/ael/ael-test/ref.ael-ntest10 @@ -5,26 +5,26 @@ (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump) -LOG: lev:2 file:pbx_ael.c line:115 func: pbx_load_module Starting AEL load process. -LOG: lev:2 file:pbx_ael.c line:128 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1-4: The macro endsess does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 6-9: The macro nullchk does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 11-26: The macro endcall does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 28-44: The macro endcall2 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 46-68: The macro endcall3 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 70-96: The macro endcall4 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 98-131: The macro endcall5 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 122-122: A default case was automatically added to the switch. -LOG: lev:2 file:pbx_ael.c line:131 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process. +LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1-4: The macro endsess does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 6-9: The macro nullchk does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 11-26: The macro endcall does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 28-44: The macro endcall2 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 46-68: The macro endcall3 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 70-96: The macro endcall4 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 98-131: The macro endcall5 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 122-122: A default case was automatically added to the switch. +LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. Executed ast_context_find_or_create(conts, name=endsess, registrar=pbx_ael); Executed ast_context_find_or_create(conts, name=nullchk, registrar=pbx_ael); Executed ast_context_find_or_create(conts, name=endcall, registrar=pbx_ael); @@ -38,139 +38,144 @@ Executed ast_add_extension2(context=nullchk, rep=0, exten=s, priority=1, label=( Executed ast_add_extension2(context=nullchk, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=NoOp, data=${type} is this, FREE, registrar=pbx_ael); Executed ast_add_extension2(context=nullchk, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-1-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall-1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=_sw-1-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-1-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:15, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-1-out,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=14, label=(null), callerid=(null), appl=Goto, data=17, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=15, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=16, label=(null), callerid=(null), appl=Goto, data=s,4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=17, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall-out-1-2, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=18, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=19, label=(null), callerid=(null), appl=Goto, data=sw-1-.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_1_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall_1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=_sw_1_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_1_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:15, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_1_out,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=14, label=(null), callerid=(null), appl=Goto, data=17, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=15, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=16, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=17, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall_out_1_2, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=18, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=19, label=(null), callerid=(null), appl=Goto, data=sw_1_.,10, FREE, registrar=pbx_ael); Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-3-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall2-3, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=_sw-3-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-3-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out2, priority=10, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out2, priority=11, label=(null), callerid=(null), appl=Goto, data=s,4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out2, priority=12, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out2, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-3-.,10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-3-out2,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall2-out-3-4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-3-out2,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_3_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall2_3, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=_sw_3_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_3_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out2, priority=10, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out2, priority=11, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out2, priority=12, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out2, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_3_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_3_out2,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall2_out_3_4, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw_3_out2,10, FREE, registrar=pbx_ael); Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-5-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall3-5, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?6:7, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Goto, data=sw-8-out,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall3-7, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=Goto, data=sw-8-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall3-8, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=_sw-8-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,9, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-8-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-8-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-8-out, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-8-out, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-8-out, priority=12, label=(null), callerid=(null), appl=Goto, data=s,9, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-8-out, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall3-out-8-9, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-8-out, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-8-out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-8-.,10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=_sw-5-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-5-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-8-out,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall3-out-5-6, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=16, label=(null), callerid=(null), appl=Goto, data=sw-5-.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_5_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall3_5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?7:8, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw_8_out,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish if_endcall3_7, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=Goto, data=sw_8_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall3_8, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=11, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=_sw_8_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_8_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_8_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_8_out, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_8_out, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_8_out, priority=12, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_8_out, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall3_out_8_9, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_8_out, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_8_out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw_8_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=_sw_5_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_5_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_8_out,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall3_out_5_6, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=16, label=(null), callerid=(null), appl=Goto, data=sw_5_.,10, FREE, registrar=pbx_ael); Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-10-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall4-10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?6:7, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Goto, data=sw-14-in,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall4-12, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=Goto, data=sw-13-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall4-13, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=_sw-13-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,9, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-13-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-13-out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-14-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-13-out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall4-out-13-14, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-13-out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-.,10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=_sw-14-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-out,11, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-14-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-14-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-14-in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-14-in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-14-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-out,11, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-14-in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-sw-endcall4-out-13-in-14-15, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-14-in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-14-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-14-.,10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=_sw-10-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-10-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-14-in,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall4-out-10-11, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=16, label=(null), callerid=(null), appl=Goto, data=sw-10-.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_10_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall4_10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?7:8, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw_14_in,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish if_endcall4_12, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=Goto, data=sw_13_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall4_13, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=11, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=_sw_13_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_13_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_13_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_13_out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_14_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_13_out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch_sw_endcall4_out_13_14, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_13_out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw_13_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=_sw_14_., priority=10, label=(null), callerid=(null), appl=Goto, data=sw_13_out,11, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_14_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_14_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_14_in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_14_in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_14_in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw_13_out,11, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_14_in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_sw_endcall4_out_13_in_14_15, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_14_in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_14_in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw_14_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=_sw_10_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_10_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_14_in,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall4_out_10_11, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=16, label=(null), callerid=(null), appl=Goto, data=sw_10_.,10, FREE, registrar=pbx_ael); Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-16-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall5-16, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?6:7, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Goto, data=sw-21-in,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall5-19, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=Goto, data=sw-20-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall5-20, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=_sw-20-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,9, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-20-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-20-out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-21-${type},10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-20-out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall5-out-20-21, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-20-out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-.,10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=_sw-21-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-out,11, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-21-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-21-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-21-in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-21-in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-21-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-out,11, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-21-in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-sw-endcall5-out-20-in-21-22, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-21-in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-21-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-21-.,10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=_sw-16-., priority=10, label=(null), callerid=(null), appl=Goto, data=s,4, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-16-.|10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=11, label=ptr2, callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-21-in,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall5-in-16-18, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=16, label=(null), callerid=(null), appl=Goto, data=sw-16-.,10, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-21-in,ptr1, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall5-out-16-17, FREE, registrar=pbx_ael); -Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-16-in,10, FREE, registrar=pbx_ael); -LOG: lev:2 file:pbx_ael.c line:134 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_16_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall5_16, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?7:8, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw_21_in,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish if_endcall5_19, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=Goto, data=sw_20_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall5_20, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=11, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=_sw_20_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_20_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_20_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_20_out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_21_${type},10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_20_out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch_sw_endcall5_out_20_21, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_20_out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw_20_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=_sw_21_., priority=10, label=(null), callerid=(null), appl=Goto, data=sw_20_out,11, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_21_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_21_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_21_in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_21_in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_21_in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw_20_out,11, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_21_in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_sw_endcall5_out_20_in_21_22, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_21_in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_21_in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw_21_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=_sw_16_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_, priority=10, label=(null), callerid=(null), appl=Goto, data=sw_16_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=11, label=ptr2, callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_21_in,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall5_in_16_18, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=16, label=(null), callerid=(null), appl=Goto, data=sw_16_.,10, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_21_in,ptr1, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall5_out_16_17, FREE, registrar=pbx_ael); +Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw_16_in,10, FREE, registrar=pbx_ael); +LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. Executed ast_merge_contexts_and_delete(); -LOG: lev:2 file:pbx_ael.c line:139 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. Executed ast_walk_contexts(); -LOG: lev:2 file:pbx_ael.c line:142 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:518 func: main 7 contexts, 37 extensions, 136 priorities +LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. +LOG: lev:4 file:ael2_parse line:516 func: main 7 contexts, 37 extensions, 141 priorities diff --git a/pbx/ael/ael-test/ref.ael-test1 b/pbx/ael/ael-test/ref.ael-test1 index 636aae134..4257fa04c 100644 --- a/pbx/ael/ael-test/ref.ael-test1 +++ b/pbx/ael/ael-test/ref.ael-test1 @@ -2,17 +2,17 @@ (If you find progress and other non-error messages irritating, you can use -q to suppress them) (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump) -LOG: lev:2 file:pbx_ael.c line:115 func: pbx_load_module Starting AEL load process. -LOG: lev:2 file:pbx_ael.c line:128 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 2-16: The macro testdial does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 18-25: The macro exten-gen does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:1362 func: check_goto Warning: file ./extensions.ael, line 21-21: It's bad form to have a goto in a macro to a target outside the macro! -LOG: lev:3 file:pval.c line:1362 func: check_goto Warning: file ./extensions.ael, line 23-23: It's bad form to have a goto in a macro to a target outside the macro! -LOG: lev:3 file:pval.c line:2284 func: check_switch_expr Warning: file ./extensions.ael, line 58-58: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:922 func: check_dow Warning: file ./extensions.ael, line 67-67: The day (m0n) must be one of 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', or 'sat'! -LOG: lev:3 file:pval.c line:880 func: check_timerange Warning: file ./extensions.ael, line 78-78: The end time (25:00) is out of range! -LOG: lev:2 file:pbx_ael.c line:131 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:134 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:139 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:142 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:518 func: main 5 contexts, 16 extensions, 159 priorities +LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process. +LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 2-16: The macro testdial does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 18-25: The macro exten-gen does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:1365 func: check_goto Warning: file ./extensions.ael, line 21-21: It's bad form to have a goto in a macro to a target outside the macro! +LOG: lev:3 file:pval.c line:1365 func: check_goto Warning: file ./extensions.ael, line 23-23: It's bad form to have a goto in a macro to a target outside the macro! +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 58-58: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:925 func: check_dow Warning: file ./extensions.ael, line 67-67: The day (m0n) must be one of 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', or 'sat'! +LOG: lev:3 file:pval.c line:883 func: check_timerange Warning: file ./extensions.ael, line 78-78: The end time (25:00) is out of range! +LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. +LOG: lev:4 file:ael2_parse line:516 func: main 5 contexts, 16 extensions, 160 priorities diff --git a/pbx/ael/ael-test/ref.ael-test19 b/pbx/ael/ael-test/ref.ael-test19 index 67519dafd..47db4079e 100644 --- a/pbx/ael/ael-test/ref.ael-test19 +++ b/pbx/ael/ael-test/ref.ael-test19 @@ -2,17 +2,17 @@ (If you find progress and other non-error messages irritating, you can use -q to suppress them) (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump) -LOG: lev:2 file:pbx_ael.c line:115 func: pbx_load_module Starting AEL load process. -LOG: lev:2 file:pbx_ael.c line:128 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. -LOG: lev:3 file:pval.c line:2313 func: check_context_names Warning: file ./extensions.ael, line 49-62: The context name (incoming) is also declared in file ./extensions.ael, line 62-69! (and neither is marked 'extend') -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 71-175: The macro std-priv-exten does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:2297 func: check_switch_expr Warning: file ./extensions.ael, line 245-246: A default case was automatically added to the switch. -LOG: lev:3 file:pval.c line:2439 func: check_pval_item Warning: file ./extensions.ael, line 312-312: macro call to non-existent funcA! (Not even in the extensions.conf stuff!) -LOG: lev:3 file:pval.c line:2439 func: check_pval_item Warning: file ./extensions.ael, line 313-313: macro call to non-existent funcD! (Not even in the extensions.conf stuff!) -LOG: lev:3 file:pval.c line:1346 func: check_goto Warning: file ./extensions.ael, line 319-319: goto: Couldn't find goto target test5|s|1, not even in extensions.conf! -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 363-366: The macro dialoutpstn does not end with a return; I will insert one. -LOG: lev:2 file:pbx_ael.c line:131 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:134 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:139 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:142 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:518 func: main 13 contexts, 57 extensions, 190 priorities +LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process. +LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. +LOG: lev:3 file:pval.c line:2316 func: check_context_names Warning: file ./extensions.ael, line 49-62: The context name (incoming) is also declared in file ./extensions.ael, line 62-69! (and neither is marked 'extend') +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 71-175: The macro std-priv-exten does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:2300 func: check_switch_expr Warning: file ./extensions.ael, line 245-246: A default case was automatically added to the switch. +LOG: lev:3 file:pval.c line:2442 func: check_pval_item Warning: file ./extensions.ael, line 312-312: macro call to non-existent funcA! (Not even in the extensions.conf stuff!) +LOG: lev:3 file:pval.c line:2442 func: check_pval_item Warning: file ./extensions.ael, line 313-313: macro call to non-existent funcD! (Not even in the extensions.conf stuff!) +LOG: lev:3 file:pval.c line:1349 func: check_goto Warning: file ./extensions.ael, line 319-319: goto: Couldn't find goto target test5|s|1, not even in extensions.conf! +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 363-366: The macro dialoutpstn does not end with a return; I will insert one. +LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. +LOG: lev:4 file:ael2_parse line:516 func: main 13 contexts, 57 extensions, 191 priorities diff --git a/pbx/ael/ael-test/ref.ael-test2 b/pbx/ael/ael-test/ref.ael-test2 index 892b63464..bd4edc3df 100644 --- a/pbx/ael/ael-test/ref.ael-test2 +++ b/pbx/ael/ael-test/ref.ael-test2 @@ -2,27 +2,26 @@ (If you find progress and other non-error messages irritating, you can use -q to suppress them) (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump) -LOG: lev:2 file:pbx_ael.c line:113 func: pbx_load_module Starting AEL load process. -LOG: lev:2 file:ael.flex line:662 func: setup_filestack --Read in included file ././apptest.ael2, 3474 chars -LOG: lev:3 file:ael.y line:546 func: ael_yyparse ==== File: ././apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL. -LOG: lev:2 file:pbx_ael.c line:126 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:1346 func: check_goto Warning: file ././apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2512 func: check_pval_item Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement. -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:2 file:pbx_ael.c line:129 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:131 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:134 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:137 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:531 func: main 1 contexts, 1 extensions, 142 priorities +LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process. +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././apptest.ael2, 3474 chars +LOG: lev:3 file:ael.y line:605 func: ael_yyparse ==== File: ././apptest.ael2, Line 46, Cols: 8-12: Suggestion: Use the goto statement instead of the Goto() application call in AEL. +LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:1349 func: check_goto Warning: file ././apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2527 func: check_pval_item Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement. +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. +LOG: lev:4 file:ael2_parse line:516 func: main 1 contexts, 1 extensions, 142 priorities diff --git a/pbx/ael/ael-test/ref.ael-test3 b/pbx/ael/ael-test/ref.ael-test3 index 775203b7e..48b4252d8 100644 --- a/pbx/ael/ael-test/ref.ael-test3 +++ b/pbx/ael/ael-test/ref.ael-test3 @@ -2,98 +2,98 @@ (If you find progress and other non-error messages irritating, you can use -q to suppress them) (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump) -LOG: lev:2 file:pbx_ael.c line:115 func: pbx_load_module Starting AEL load process. -LOG: lev:2 file:ael.flex line:672 func: setup_filestack --Read in included file ././include1.ael2, 78 chars -LOG: lev:2 file:ael.flex line:672 func: setup_filestack --Read in included file ././include2.ael2, 98 chars -LOG: lev:2 file:ael.flex line:672 func: setup_filestack --Read in included file ././include3.ael2, 57 chars -LOG: lev:2 file:ael.flex line:672 func: setup_filestack --Read in included file ././include5.ael2, 56 chars -LOG: lev:2 file:ael.flex line:672 func: setup_filestack --Read in included file ././include4.ael2, 87 chars -LOG: lev:2 file:ael.flex line:672 func: setup_filestack --Read in included file ././telemarket_torture.ael2, 28036 chars -LOG: lev:2 file:pbx_ael.c line:128 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 14-34: The macro std-exten does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:1362 func: check_goto Warning: file ./extensions.ael, line 17-17: It's bad form to have a goto in a macro to a target outside the macro! -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 36-59: The macro std-priv-exten_1 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 62-85: The macro std-priv-exten_2 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 88-111: The macro std-priv-exten_3 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 114-137: The macro std-priv-exten_4 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 140-163: The macro std-priv-exten_5 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 166-189: The macro std-priv-exten_6 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 192-215: The macro std-priv-exten_7 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 218-241: The macro std-priv-exten_8 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 244-267: The macro std-priv-exten_9 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 270-293: The macro std-priv-exten_10 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 296-319: The macro std-priv-exten_11 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 322-345: The macro std-priv-exten_12 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 348-371: The macro std-priv-exten_13 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 374-397: The macro std-priv-exten_14 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 400-423: The macro std-priv-exten_15 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 426-449: The macro std-priv-exten_16 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 452-475: The macro std-priv-exten_17 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 478-501: The macro std-priv-exten_18 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 504-527: The macro std-priv-exten_19 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 530-553: The macro std-priv-exten_20 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 556-579: The macro std-priv-exten_21 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 582-605: The macro std-priv-exten_22 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 608-631: The macro std-priv-exten_23 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 634-657: The macro std-priv-exten_24 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 660-683: The macro std-priv-exten_25 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 686-709: The macro std-priv-exten_26 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 712-735: The macro std-priv-exten_27 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 738-761: The macro std-priv-exten_28 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 764-787: The macro std-priv-exten_29 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 790-813: The macro std-priv-exten_30 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 816-839: The macro std-priv-exten_31 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 842-865: The macro std-priv-exten_32 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 868-891: The macro std-priv-exten_33 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 894-917: The macro std-priv-exten_34 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 920-943: The macro std-priv-exten_35 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 946-969: The macro std-priv-exten_36 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 972-995: The macro std-priv-exten_37 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 998-1021: The macro std-priv-exten_38 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1024-1047: The macro std-priv-exten_39 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1050-1073: The macro std-priv-exten_40 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1076-1099: The macro std-priv-exten_41 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1102-1125: The macro std-priv-exten_42 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1128-1151: The macro std-priv-exten_43 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1154-1177: The macro std-priv-exten_44 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1180-1203: The macro std-priv-exten_45 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1206-1229: The macro std-priv-exten_46 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1232-1255: The macro std-priv-exten_47 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1258-1281: The macro std-priv-exten_48 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1284-1307: The macro std-priv-exten_49 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1310-1333: The macro std-priv-exten_50 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1336-1359: The macro std-priv-exten_51 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1362-1385: The macro std-priv-exten_52 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1388-1411: The macro std-priv-exten_53 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1414-1437: The macro std-priv-exten_54 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1440-1463: The macro std-priv-exten_55 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1466-1489: The macro std-priv-exten_56 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1492-1515: The macro std-priv-exten_57 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1518-1541: The macro std-priv-exten_58 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1544-1567: The macro std-priv-exten_59 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1570-1593: The macro std-priv-exten_60 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1596-1619: The macro std-priv-exten_61 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1622-1645: The macro std-priv-exten_62 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1648-1671: The macro std-priv-exten_63 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1674-1697: The macro std-priv-exten_64 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1700-1723: The macro std-priv-exten_65 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1726-1749: The macro std-priv-exten_66 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1752-1775: The macro std-priv-exten_67 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1778-1801: The macro std-priv-exten_68 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1804-1827: The macro std-priv-exten_69 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1830-1853: The macro std-priv-exten_70 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1856-1879: The macro std-priv-exten_71 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1882-1905: The macro std-priv-exten_72 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1908-1931: The macro std-priv-exten_73 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1934-1957: The macro std-priv-exten does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1959-1995: The macro fillcidname does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 1997-2015: The macro ciddial does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 2017-2028: The macro ciddial3 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 2030-2048: The macro ciddial2 does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 2050-2065: The macro callerid-liar does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 2067-2072: The macro callerid-bad does not end with a return; I will insert one. -LOG: lev:2 file:pbx_ael.c line:131 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:134 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:139 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:142 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:518 func: main 172 contexts, 934 extensions, 2558 priorities +LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process. +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include1.ael2, 78 chars +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include2.ael2, 98 chars +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include3.ael2, 57 chars +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include5.ael2, 56 chars +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include4.ael2, 87 chars +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././telemarket_torture.ael2, 28036 chars +LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 14-34: The macro std-exten does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:1365 func: check_goto Warning: file ./extensions.ael, line 17-17: It's bad form to have a goto in a macro to a target outside the macro! +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 36-59: The macro std-priv-exten_1 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 62-85: The macro std-priv-exten_2 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 88-111: The macro std-priv-exten_3 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 114-137: The macro std-priv-exten_4 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 140-163: The macro std-priv-exten_5 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 166-189: The macro std-priv-exten_6 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 192-215: The macro std-priv-exten_7 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 218-241: The macro std-priv-exten_8 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 244-267: The macro std-priv-exten_9 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 270-293: The macro std-priv-exten_10 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 296-319: The macro std-priv-exten_11 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 322-345: The macro std-priv-exten_12 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 348-371: The macro std-priv-exten_13 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 374-397: The macro std-priv-exten_14 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 400-423: The macro std-priv-exten_15 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 426-449: The macro std-priv-exten_16 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 452-475: The macro std-priv-exten_17 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 478-501: The macro std-priv-exten_18 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 504-527: The macro std-priv-exten_19 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 530-553: The macro std-priv-exten_20 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 556-579: The macro std-priv-exten_21 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 582-605: The macro std-priv-exten_22 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 608-631: The macro std-priv-exten_23 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 634-657: The macro std-priv-exten_24 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 660-683: The macro std-priv-exten_25 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 686-709: The macro std-priv-exten_26 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 712-735: The macro std-priv-exten_27 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 738-761: The macro std-priv-exten_28 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 764-787: The macro std-priv-exten_29 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 790-813: The macro std-priv-exten_30 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 816-839: The macro std-priv-exten_31 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 842-865: The macro std-priv-exten_32 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 868-891: The macro std-priv-exten_33 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 894-917: The macro std-priv-exten_34 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 920-943: The macro std-priv-exten_35 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 946-969: The macro std-priv-exten_36 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 972-995: The macro std-priv-exten_37 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 998-1021: The macro std-priv-exten_38 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1024-1047: The macro std-priv-exten_39 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1050-1073: The macro std-priv-exten_40 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1076-1099: The macro std-priv-exten_41 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1102-1125: The macro std-priv-exten_42 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1128-1151: The macro std-priv-exten_43 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1154-1177: The macro std-priv-exten_44 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1180-1203: The macro std-priv-exten_45 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1206-1229: The macro std-priv-exten_46 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1232-1255: The macro std-priv-exten_47 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1258-1281: The macro std-priv-exten_48 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1284-1307: The macro std-priv-exten_49 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1310-1333: The macro std-priv-exten_50 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1336-1359: The macro std-priv-exten_51 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1362-1385: The macro std-priv-exten_52 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1388-1411: The macro std-priv-exten_53 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1414-1437: The macro std-priv-exten_54 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1440-1463: The macro std-priv-exten_55 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1466-1489: The macro std-priv-exten_56 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1492-1515: The macro std-priv-exten_57 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1518-1541: The macro std-priv-exten_58 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1544-1567: The macro std-priv-exten_59 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1570-1593: The macro std-priv-exten_60 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1596-1619: The macro std-priv-exten_61 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1622-1645: The macro std-priv-exten_62 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1648-1671: The macro std-priv-exten_63 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1674-1697: The macro std-priv-exten_64 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1700-1723: The macro std-priv-exten_65 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1726-1749: The macro std-priv-exten_66 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1752-1775: The macro std-priv-exten_67 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1778-1801: The macro std-priv-exten_68 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1804-1827: The macro std-priv-exten_69 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1830-1853: The macro std-priv-exten_70 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1856-1879: The macro std-priv-exten_71 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1882-1905: The macro std-priv-exten_72 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1908-1931: The macro std-priv-exten_73 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1934-1957: The macro std-priv-exten does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1959-1995: The macro fillcidname does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 1997-2015: The macro ciddial does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 2017-2028: The macro ciddial3 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 2030-2048: The macro ciddial2 does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 2050-2065: The macro callerid-liar does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 2067-2072: The macro callerid-bad does not end with a return; I will insert one. +LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. +LOG: lev:4 file:ael2_parse line:516 func: main 172 contexts, 934 extensions, 2634 priorities diff --git a/pbx/ael/ael-test/ref.ael-test4 b/pbx/ael/ael-test/ref.ael-test4 index 892b63464..bd4edc3df 100644 --- a/pbx/ael/ael-test/ref.ael-test4 +++ b/pbx/ael/ael-test/ref.ael-test4 @@ -2,27 +2,26 @@ (If you find progress and other non-error messages irritating, you can use -q to suppress them) (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump) -LOG: lev:2 file:pbx_ael.c line:113 func: pbx_load_module Starting AEL load process. -LOG: lev:2 file:ael.flex line:662 func: setup_filestack --Read in included file ././apptest.ael2, 3474 chars -LOG: lev:3 file:ael.y line:546 func: ael_yyparse ==== File: ././apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL. -LOG: lev:2 file:pbx_ael.c line:126 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:1346 func: check_goto Warning: file ././apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2512 func: check_pval_item Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement. -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:3 file:pval.c line:2507 func: check_pval_item Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! -LOG: lev:2 file:pbx_ael.c line:129 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:131 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:134 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:137 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:531 func: main 1 contexts, 1 extensions, 142 priorities +LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process. +LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././apptest.ael2, 3474 chars +LOG: lev:3 file:ael.y line:605 func: ael_yyparse ==== File: ././apptest.ael2, Line 46, Cols: 8-12: Suggestion: Use the goto statement instead of the Goto() application call in AEL. +LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:1349 func: check_goto Warning: file ././apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2527 func: check_pval_item Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement. +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:3 file:pval.c line:2522 func: check_pval_item Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead! +LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. +LOG: lev:4 file:ael2_parse line:516 func: main 1 contexts, 1 extensions, 142 priorities diff --git a/pbx/ael/ael-test/ref.ael-test5 b/pbx/ael/ael-test/ref.ael-test5 index 7be8a951f..10657ce63 100644 --- a/pbx/ael/ael-test/ref.ael-test5 +++ b/pbx/ael/ael-test/ref.ael-test5 @@ -2,13 +2,13 @@ (If you find progress and other non-error messages irritating, you can use -q to suppress them) (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump) -LOG: lev:2 file:pbx_ael.c line:115 func: pbx_load_module Starting AEL load process. -LOG: lev:2 file:pbx_ael.c line:128 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 130-183: The macro stdexten does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 185-192: The macro uvm does not end with a return; I will insert one. -LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 194-201: The macro bvm does not end with a return; I will insert one. -LOG: lev:2 file:pbx_ael.c line:131 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:134 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:139 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. -LOG: lev:2 file:pbx_ael.c line:142 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. -LOG: lev:4 file:ael2_parse line:518 func: main 38 contexts, 91 extensions, 494 priorities +LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process. +LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 130-183: The macro stdexten does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 185-192: The macro uvm does not end with a return; I will insert one. +LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 194-201: The macro bvm does not end with a return; I will insert one. +LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: checked config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'. +LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'. +LOG: lev:4 file:ael2_parse line:516 func: main 38 contexts, 91 extensions, 495 priorities diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13 index 07ae29ed3..acecaaacf 100644 --- a/pbx/ael/ael-test/ref.ael-vtest13 +++ b/pbx/ael/ael-test/ref.ael-vtest13 @@ -13,20 +13,21 @@ FWDVMBOX=1 [std-exten] exten => s,1,Set(LOCAL(ext)=${ARG1}) exten => s,2,Set(LOCAL(dev)=${ARG2}) -exten => s,3,Set(~~EXTEN~~=${EXTEN}) -exten => s,4,Dial(${dev}/${ext},20) -exten => s,5,Goto(sw-1-${DIALSTATUS},10) -exten => s,6,NoOp(Finish switch-std-exten-1) -exten => s,7,Return() +exten => s,3,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,4,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,5,Dial(${dev}/${ext},20) +exten => s,6,Goto(sw_1_${DIALSTATUS},10) +exten => s,7,NoOp(Finish switch_std-exten_1) +exten => s,8,Return() exten => a,1,VoiceMailMain(${ext}) -exten => _sw-1-.,10,Voicemail(u${ext}) -exten => _sw-1-.,11,Goto(s,6) -exten => sw-1-,10,Goto(sw-1-.,10) -exten => sw-1-ANSWER,10,Goto(s,6) -exten => sw-1-NOANSWER,10,Voicemail(u${ext}) -exten => sw-1-NOANSWER,11,Goto(s,6) -exten => sw-1-BUSY,10,Voicemail(b${ext}) -exten => sw-1-BUSY,11,Goto(s,6) +exten => _sw_1_.,10,Voicemail(u${ext}) +exten => _sw_1_.,11,Goto(s,7) +exten => sw_1_,10,Goto(sw_1_.,10) +exten => sw_1_ANSWER,10,Goto(s,7) +exten => sw_1_NOANSWER,10,Voicemail(u${ext}) +exten => sw_1_NOANSWER,11,Goto(s,7) +exten => sw_1_BUSY,10,Voicemail(b${ext}) +exten => sw_1_BUSY,11,Goto(s,7) [std-priv-exten_1] @@ -36,24 +37,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-3-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_1-3) -exten => s,12,Return() -exten => _sw-3-.,10,Voicemail(u${ext}) -exten => _sw-3-.,11,Goto(s,11) -exten => sw-3-,10,Goto(sw-3-.,10) -exten => sw-3-NOANSWER,10,Voicemail(u${ext}) -exten => sw-3-NOANSWER,11,Goto(s,11) -exten => sw-3-ANSWER,10,Goto(s,11) -exten => sw-3-BUSY,10,Voicemail(b${ext}) -exten => sw-3-BUSY,11,Goto(s,11) -exten => sw-3-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-3-DONTCALL,11,Goto(s,11) -exten => sw-3-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-3-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_3_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_1_3) +exten => s,13,Return() +exten => _sw_3_.,10,Voicemail(u${ext}) +exten => _sw_3_.,11,Goto(s,12) +exten => sw_3_,10,Goto(sw_3_.,10) +exten => sw_3_NOANSWER,10,Voicemail(u${ext}) +exten => sw_3_NOANSWER,11,Goto(s,12) +exten => sw_3_ANSWER,10,Goto(s,12) +exten => sw_3_BUSY,10,Voicemail(b${ext}) +exten => sw_3_BUSY,11,Goto(s,12) +exten => sw_3_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_3_DONTCALL,11,Goto(s,12) +exten => sw_3_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_3_TORTURE,11,Goto(s,12) [std-priv-exten_2] @@ -63,24 +65,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-4-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_2-4) -exten => s,12,Return() -exten => _sw-4-.,10,Voicemail(u${ext}) -exten => _sw-4-.,11,Goto(s,11) -exten => sw-4-,10,Goto(sw-4-.,10) -exten => sw-4-NOANSWER,10,Voicemail(u${ext}) -exten => sw-4-NOANSWER,11,Goto(s,11) -exten => sw-4-ANSWER,10,Goto(s,11) -exten => sw-4-BUSY,10,Voicemail(b${ext}) -exten => sw-4-BUSY,11,Goto(s,11) -exten => sw-4-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-4-DONTCALL,11,Goto(s,11) -exten => sw-4-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-4-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_4_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_2_4) +exten => s,13,Return() +exten => _sw_4_.,10,Voicemail(u${ext}) +exten => _sw_4_.,11,Goto(s,12) +exten => sw_4_,10,Goto(sw_4_.,10) +exten => sw_4_NOANSWER,10,Voicemail(u${ext}) +exten => sw_4_NOANSWER,11,Goto(s,12) +exten => sw_4_ANSWER,10,Goto(s,12) +exten => sw_4_BUSY,10,Voicemail(b${ext}) +exten => sw_4_BUSY,11,Goto(s,12) +exten => sw_4_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_4_DONTCALL,11,Goto(s,12) +exten => sw_4_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_4_TORTURE,11,Goto(s,12) [std-priv-exten_3] @@ -90,24 +93,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-5-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_3-5) -exten => s,12,Return() -exten => _sw-5-.,10,Voicemail(u${ext}) -exten => _sw-5-.,11,Goto(s,11) -exten => sw-5-,10,Goto(sw-5-.,10) -exten => sw-5-NOANSWER,10,Voicemail(u${ext}) -exten => sw-5-NOANSWER,11,Goto(s,11) -exten => sw-5-ANSWER,10,Goto(s,11) -exten => sw-5-BUSY,10,Voicemail(b${ext}) -exten => sw-5-BUSY,11,Goto(s,11) -exten => sw-5-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-5-DONTCALL,11,Goto(s,11) -exten => sw-5-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-5-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_5_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_3_5) +exten => s,13,Return() +exten => _sw_5_.,10,Voicemail(u${ext}) +exten => _sw_5_.,11,Goto(s,12) +exten => sw_5_,10,Goto(sw_5_.,10) +exten => sw_5_NOANSWER,10,Voicemail(u${ext}) +exten => sw_5_NOANSWER,11,Goto(s,12) +exten => sw_5_ANSWER,10,Goto(s,12) +exten => sw_5_BUSY,10,Voicemail(b${ext}) +exten => sw_5_BUSY,11,Goto(s,12) +exten => sw_5_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_5_DONTCALL,11,Goto(s,12) +exten => sw_5_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_5_TORTURE,11,Goto(s,12) [std-priv-exten_4] @@ -117,24 +121,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-6-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_4-6) -exten => s,12,Return() -exten => _sw-6-.,10,Voicemail(u${ext}) -exten => _sw-6-.,11,Goto(s,11) -exten => sw-6-,10,Goto(sw-6-.,10) -exten => sw-6-NOANSWER,10,Voicemail(u${ext}) -exten => sw-6-NOANSWER,11,Goto(s,11) -exten => sw-6-ANSWER,10,Goto(s,11) -exten => sw-6-BUSY,10,Voicemail(b${ext}) -exten => sw-6-BUSY,11,Goto(s,11) -exten => sw-6-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-6-DONTCALL,11,Goto(s,11) -exten => sw-6-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-6-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_6_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_4_6) +exten => s,13,Return() +exten => _sw_6_.,10,Voicemail(u${ext}) +exten => _sw_6_.,11,Goto(s,12) +exten => sw_6_,10,Goto(sw_6_.,10) +exten => sw_6_NOANSWER,10,Voicemail(u${ext}) +exten => sw_6_NOANSWER,11,Goto(s,12) +exten => sw_6_ANSWER,10,Goto(s,12) +exten => sw_6_BUSY,10,Voicemail(b${ext}) +exten => sw_6_BUSY,11,Goto(s,12) +exten => sw_6_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_6_DONTCALL,11,Goto(s,12) +exten => sw_6_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_6_TORTURE,11,Goto(s,12) [std-priv-exten_5] @@ -144,24 +149,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-7-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_5-7) -exten => s,12,Return() -exten => _sw-7-.,10,Voicemail(u${ext}) -exten => _sw-7-.,11,Goto(s,11) -exten => sw-7-,10,Goto(sw-7-.,10) -exten => sw-7-NOANSWER,10,Voicemail(u${ext}) -exten => sw-7-NOANSWER,11,Goto(s,11) -exten => sw-7-ANSWER,10,Goto(s,11) -exten => sw-7-BUSY,10,Voicemail(b${ext}) -exten => sw-7-BUSY,11,Goto(s,11) -exten => sw-7-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-7-DONTCALL,11,Goto(s,11) -exten => sw-7-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-7-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_7_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_5_7) +exten => s,13,Return() +exten => _sw_7_.,10,Voicemail(u${ext}) +exten => _sw_7_.,11,Goto(s,12) +exten => sw_7_,10,Goto(sw_7_.,10) +exten => sw_7_NOANSWER,10,Voicemail(u${ext}) +exten => sw_7_NOANSWER,11,Goto(s,12) +exten => sw_7_ANSWER,10,Goto(s,12) +exten => sw_7_BUSY,10,Voicemail(b${ext}) +exten => sw_7_BUSY,11,Goto(s,12) +exten => sw_7_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_7_DONTCALL,11,Goto(s,12) +exten => sw_7_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_7_TORTURE,11,Goto(s,12) [std-priv-exten_6] @@ -171,24 +177,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-8-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_6-8) -exten => s,12,Return() -exten => _sw-8-.,10,Voicemail(u${ext}) -exten => _sw-8-.,11,Goto(s,11) -exten => sw-8-,10,Goto(sw-8-.,10) -exten => sw-8-NOANSWER,10,Voicemail(u${ext}) -exten => sw-8-NOANSWER,11,Goto(s,11) -exten => sw-8-ANSWER,10,Goto(s,11) -exten => sw-8-BUSY,10,Voicemail(b${ext}) -exten => sw-8-BUSY,11,Goto(s,11) -exten => sw-8-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-8-DONTCALL,11,Goto(s,11) -exten => sw-8-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-8-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_8_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_6_8) +exten => s,13,Return() +exten => _sw_8_.,10,Voicemail(u${ext}) +exten => _sw_8_.,11,Goto(s,12) +exten => sw_8_,10,Goto(sw_8_.,10) +exten => sw_8_NOANSWER,10,Voicemail(u${ext}) +exten => sw_8_NOANSWER,11,Goto(s,12) +exten => sw_8_ANSWER,10,Goto(s,12) +exten => sw_8_BUSY,10,Voicemail(b${ext}) +exten => sw_8_BUSY,11,Goto(s,12) +exten => sw_8_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_8_DONTCALL,11,Goto(s,12) +exten => sw_8_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_8_TORTURE,11,Goto(s,12) [std-priv-exten_7] @@ -198,24 +205,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-9-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_7-9) -exten => s,12,Return() -exten => _sw-9-.,10,Voicemail(u${ext}) -exten => _sw-9-.,11,Goto(s,11) -exten => sw-9-,10,Goto(sw-9-.,10) -exten => sw-9-NOANSWER,10,Voicemail(u${ext}) -exten => sw-9-NOANSWER,11,Goto(s,11) -exten => sw-9-ANSWER,10,Goto(s,11) -exten => sw-9-BUSY,10,Voicemail(b${ext}) -exten => sw-9-BUSY,11,Goto(s,11) -exten => sw-9-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-9-DONTCALL,11,Goto(s,11) -exten => sw-9-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-9-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_9_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_7_9) +exten => s,13,Return() +exten => _sw_9_.,10,Voicemail(u${ext}) +exten => _sw_9_.,11,Goto(s,12) +exten => sw_9_,10,Goto(sw_9_.,10) +exten => sw_9_NOANSWER,10,Voicemail(u${ext}) +exten => sw_9_NOANSWER,11,Goto(s,12) +exten => sw_9_ANSWER,10,Goto(s,12) +exten => sw_9_BUSY,10,Voicemail(b${ext}) +exten => sw_9_BUSY,11,Goto(s,12) +exten => sw_9_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_9_DONTCALL,11,Goto(s,12) +exten => sw_9_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_9_TORTURE,11,Goto(s,12) [std-priv-exten_8] @@ -225,24 +233,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-10-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_8-10) -exten => s,12,Return() -exten => _sw-10-.,10,Voicemail(u${ext}) -exten => _sw-10-.,11,Goto(s,11) -exten => sw-10-,10,Goto(sw-10-.,10) -exten => sw-10-NOANSWER,10,Voicemail(u${ext}) -exten => sw-10-NOANSWER,11,Goto(s,11) -exten => sw-10-ANSWER,10,Goto(s,11) -exten => sw-10-BUSY,10,Voicemail(b${ext}) -exten => sw-10-BUSY,11,Goto(s,11) -exten => sw-10-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-10-DONTCALL,11,Goto(s,11) -exten => sw-10-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-10-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_10_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_8_10) +exten => s,13,Return() +exten => _sw_10_.,10,Voicemail(u${ext}) +exten => _sw_10_.,11,Goto(s,12) +exten => sw_10_,10,Goto(sw_10_.,10) +exten => sw_10_NOANSWER,10,Voicemail(u${ext}) +exten => sw_10_NOANSWER,11,Goto(s,12) +exten => sw_10_ANSWER,10,Goto(s,12) +exten => sw_10_BUSY,10,Voicemail(b${ext}) +exten => sw_10_BUSY,11,Goto(s,12) +exten => sw_10_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_10_DONTCALL,11,Goto(s,12) +exten => sw_10_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_10_TORTURE,11,Goto(s,12) [std-priv-exten_9] @@ -252,24 +261,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-11-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_9-11) -exten => s,12,Return() -exten => _sw-11-.,10,Voicemail(u${ext}) -exten => _sw-11-.,11,Goto(s,11) -exten => sw-11-,10,Goto(sw-11-.,10) -exten => sw-11-NOANSWER,10,Voicemail(u${ext}) -exten => sw-11-NOANSWER,11,Goto(s,11) -exten => sw-11-ANSWER,10,Goto(s,11) -exten => sw-11-BUSY,10,Voicemail(b${ext}) -exten => sw-11-BUSY,11,Goto(s,11) -exten => sw-11-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-11-DONTCALL,11,Goto(s,11) -exten => sw-11-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-11-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_11_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_9_11) +exten => s,13,Return() +exten => _sw_11_.,10,Voicemail(u${ext}) +exten => _sw_11_.,11,Goto(s,12) +exten => sw_11_,10,Goto(sw_11_.,10) +exten => sw_11_NOANSWER,10,Voicemail(u${ext}) +exten => sw_11_NOANSWER,11,Goto(s,12) +exten => sw_11_ANSWER,10,Goto(s,12) +exten => sw_11_BUSY,10,Voicemail(b${ext}) +exten => sw_11_BUSY,11,Goto(s,12) +exten => sw_11_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_11_DONTCALL,11,Goto(s,12) +exten => sw_11_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_11_TORTURE,11,Goto(s,12) [std-priv-exten_10] @@ -279,24 +289,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-12-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_10-12) -exten => s,12,Return() -exten => _sw-12-.,10,Voicemail(u${ext}) -exten => _sw-12-.,11,Goto(s,11) -exten => sw-12-,10,Goto(sw-12-.,10) -exten => sw-12-NOANSWER,10,Voicemail(u${ext}) -exten => sw-12-NOANSWER,11,Goto(s,11) -exten => sw-12-ANSWER,10,Goto(s,11) -exten => sw-12-BUSY,10,Voicemail(b${ext}) -exten => sw-12-BUSY,11,Goto(s,11) -exten => sw-12-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-12-DONTCALL,11,Goto(s,11) -exten => sw-12-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-12-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_12_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_10_12) +exten => s,13,Return() +exten => _sw_12_.,10,Voicemail(u${ext}) +exten => _sw_12_.,11,Goto(s,12) +exten => sw_12_,10,Goto(sw_12_.,10) +exten => sw_12_NOANSWER,10,Voicemail(u${ext}) +exten => sw_12_NOANSWER,11,Goto(s,12) +exten => sw_12_ANSWER,10,Goto(s,12) +exten => sw_12_BUSY,10,Voicemail(b${ext}) +exten => sw_12_BUSY,11,Goto(s,12) +exten => sw_12_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_12_DONTCALL,11,Goto(s,12) +exten => sw_12_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_12_TORTURE,11,Goto(s,12) [std-priv-exten_11] @@ -306,24 +317,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-13-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_11-13) -exten => s,12,Return() -exten => _sw-13-.,10,Voicemail(u${ext}) -exten => _sw-13-.,11,Goto(s,11) -exten => sw-13-,10,Goto(sw-13-.,10) -exten => sw-13-NOANSWER,10,Voicemail(u${ext}) -exten => sw-13-NOANSWER,11,Goto(s,11) -exten => sw-13-ANSWER,10,Goto(s,11) -exten => sw-13-BUSY,10,Voicemail(b${ext}) -exten => sw-13-BUSY,11,Goto(s,11) -exten => sw-13-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-13-DONTCALL,11,Goto(s,11) -exten => sw-13-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-13-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_13_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_11_13) +exten => s,13,Return() +exten => _sw_13_.,10,Voicemail(u${ext}) +exten => _sw_13_.,11,Goto(s,12) +exten => sw_13_,10,Goto(sw_13_.,10) +exten => sw_13_NOANSWER,10,Voicemail(u${ext}) +exten => sw_13_NOANSWER,11,Goto(s,12) +exten => sw_13_ANSWER,10,Goto(s,12) +exten => sw_13_BUSY,10,Voicemail(b${ext}) +exten => sw_13_BUSY,11,Goto(s,12) +exten => sw_13_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_13_DONTCALL,11,Goto(s,12) +exten => sw_13_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_13_TORTURE,11,Goto(s,12) [std-priv-exten_12] @@ -333,24 +345,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-14-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_12-14) -exten => s,12,Return() -exten => _sw-14-.,10,Voicemail(u${ext}) -exten => _sw-14-.,11,Goto(s,11) -exten => sw-14-,10,Goto(sw-14-.,10) -exten => sw-14-NOANSWER,10,Voicemail(u${ext}) -exten => sw-14-NOANSWER,11,Goto(s,11) -exten => sw-14-ANSWER,10,Goto(s,11) -exten => sw-14-BUSY,10,Voicemail(b${ext}) -exten => sw-14-BUSY,11,Goto(s,11) -exten => sw-14-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-14-DONTCALL,11,Goto(s,11) -exten => sw-14-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-14-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_14_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_12_14) +exten => s,13,Return() +exten => _sw_14_.,10,Voicemail(u${ext}) +exten => _sw_14_.,11,Goto(s,12) +exten => sw_14_,10,Goto(sw_14_.,10) +exten => sw_14_NOANSWER,10,Voicemail(u${ext}) +exten => sw_14_NOANSWER,11,Goto(s,12) +exten => sw_14_ANSWER,10,Goto(s,12) +exten => sw_14_BUSY,10,Voicemail(b${ext}) +exten => sw_14_BUSY,11,Goto(s,12) +exten => sw_14_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_14_DONTCALL,11,Goto(s,12) +exten => sw_14_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_14_TORTURE,11,Goto(s,12) [std-priv-exten_13] @@ -360,24 +373,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-15-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_13-15) -exten => s,12,Return() -exten => _sw-15-.,10,Voicemail(u${ext}) -exten => _sw-15-.,11,Goto(s,11) -exten => sw-15-,10,Goto(sw-15-.,10) -exten => sw-15-NOANSWER,10,Voicemail(u${ext}) -exten => sw-15-NOANSWER,11,Goto(s,11) -exten => sw-15-ANSWER,10,Goto(s,11) -exten => sw-15-BUSY,10,Voicemail(b${ext}) -exten => sw-15-BUSY,11,Goto(s,11) -exten => sw-15-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-15-DONTCALL,11,Goto(s,11) -exten => sw-15-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-15-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_15_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_13_15) +exten => s,13,Return() +exten => _sw_15_.,10,Voicemail(u${ext}) +exten => _sw_15_.,11,Goto(s,12) +exten => sw_15_,10,Goto(sw_15_.,10) +exten => sw_15_NOANSWER,10,Voicemail(u${ext}) +exten => sw_15_NOANSWER,11,Goto(s,12) +exten => sw_15_ANSWER,10,Goto(s,12) +exten => sw_15_BUSY,10,Voicemail(b${ext}) +exten => sw_15_BUSY,11,Goto(s,12) +exten => sw_15_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_15_DONTCALL,11,Goto(s,12) +exten => sw_15_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_15_TORTURE,11,Goto(s,12) [std-priv-exten_14] @@ -387,24 +401,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-16-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_14-16) -exten => s,12,Return() -exten => _sw-16-.,10,Voicemail(u${ext}) -exten => _sw-16-.,11,Goto(s,11) -exten => sw-16-,10,Goto(sw-16-.,10) -exten => sw-16-NOANSWER,10,Voicemail(u${ext}) -exten => sw-16-NOANSWER,11,Goto(s,11) -exten => sw-16-ANSWER,10,Goto(s,11) -exten => sw-16-BUSY,10,Voicemail(b${ext}) -exten => sw-16-BUSY,11,Goto(s,11) -exten => sw-16-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-16-DONTCALL,11,Goto(s,11) -exten => sw-16-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-16-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_16_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_14_16) +exten => s,13,Return() +exten => _sw_16_.,10,Voicemail(u${ext}) +exten => _sw_16_.,11,Goto(s,12) +exten => sw_16_,10,Goto(sw_16_.,10) +exten => sw_16_NOANSWER,10,Voicemail(u${ext}) +exten => sw_16_NOANSWER,11,Goto(s,12) +exten => sw_16_ANSWER,10,Goto(s,12) +exten => sw_16_BUSY,10,Voicemail(b${ext}) +exten => sw_16_BUSY,11,Goto(s,12) +exten => sw_16_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_16_DONTCALL,11,Goto(s,12) +exten => sw_16_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_16_TORTURE,11,Goto(s,12) [std-priv-exten_15] @@ -414,24 +429,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-17-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_15-17) -exten => s,12,Return() -exten => _sw-17-.,10,Voicemail(u${ext}) -exten => _sw-17-.,11,Goto(s,11) -exten => sw-17-,10,Goto(sw-17-.,10) -exten => sw-17-NOANSWER,10,Voicemail(u${ext}) -exten => sw-17-NOANSWER,11,Goto(s,11) -exten => sw-17-ANSWER,10,Goto(s,11) -exten => sw-17-BUSY,10,Voicemail(b${ext}) -exten => sw-17-BUSY,11,Goto(s,11) -exten => sw-17-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-17-DONTCALL,11,Goto(s,11) -exten => sw-17-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-17-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_17_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_15_17) +exten => s,13,Return() +exten => _sw_17_.,10,Voicemail(u${ext}) +exten => _sw_17_.,11,Goto(s,12) +exten => sw_17_,10,Goto(sw_17_.,10) +exten => sw_17_NOANSWER,10,Voicemail(u${ext}) +exten => sw_17_NOANSWER,11,Goto(s,12) +exten => sw_17_ANSWER,10,Goto(s,12) +exten => sw_17_BUSY,10,Voicemail(b${ext}) +exten => sw_17_BUSY,11,Goto(s,12) +exten => sw_17_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_17_DONTCALL,11,Goto(s,12) +exten => sw_17_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_17_TORTURE,11,Goto(s,12) [std-priv-exten_16] @@ -441,24 +457,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-18-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_16-18) -exten => s,12,Return() -exten => _sw-18-.,10,Voicemail(u${ext}) -exten => _sw-18-.,11,Goto(s,11) -exten => sw-18-,10,Goto(sw-18-.,10) -exten => sw-18-NOANSWER,10,Voicemail(u${ext}) -exten => sw-18-NOANSWER,11,Goto(s,11) -exten => sw-18-ANSWER,10,Goto(s,11) -exten => sw-18-BUSY,10,Voicemail(b${ext}) -exten => sw-18-BUSY,11,Goto(s,11) -exten => sw-18-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-18-DONTCALL,11,Goto(s,11) -exten => sw-18-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-18-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_18_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_16_18) +exten => s,13,Return() +exten => _sw_18_.,10,Voicemail(u${ext}) +exten => _sw_18_.,11,Goto(s,12) +exten => sw_18_,10,Goto(sw_18_.,10) +exten => sw_18_NOANSWER,10,Voicemail(u${ext}) +exten => sw_18_NOANSWER,11,Goto(s,12) +exten => sw_18_ANSWER,10,Goto(s,12) +exten => sw_18_BUSY,10,Voicemail(b${ext}) +exten => sw_18_BUSY,11,Goto(s,12) +exten => sw_18_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_18_DONTCALL,11,Goto(s,12) +exten => sw_18_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_18_TORTURE,11,Goto(s,12) [std-priv-exten_17] @@ -468,24 +485,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-19-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_17-19) -exten => s,12,Return() -exten => _sw-19-.,10,Voicemail(u${ext}) -exten => _sw-19-.,11,Goto(s,11) -exten => sw-19-,10,Goto(sw-19-.,10) -exten => sw-19-NOANSWER,10,Voicemail(u${ext}) -exten => sw-19-NOANSWER,11,Goto(s,11) -exten => sw-19-ANSWER,10,Goto(s,11) -exten => sw-19-BUSY,10,Voicemail(b${ext}) -exten => sw-19-BUSY,11,Goto(s,11) -exten => sw-19-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-19-DONTCALL,11,Goto(s,11) -exten => sw-19-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-19-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_19_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_17_19) +exten => s,13,Return() +exten => _sw_19_.,10,Voicemail(u${ext}) +exten => _sw_19_.,11,Goto(s,12) +exten => sw_19_,10,Goto(sw_19_.,10) +exten => sw_19_NOANSWER,10,Voicemail(u${ext}) +exten => sw_19_NOANSWER,11,Goto(s,12) +exten => sw_19_ANSWER,10,Goto(s,12) +exten => sw_19_BUSY,10,Voicemail(b${ext}) +exten => sw_19_BUSY,11,Goto(s,12) +exten => sw_19_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_19_DONTCALL,11,Goto(s,12) +exten => sw_19_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_19_TORTURE,11,Goto(s,12) [std-priv-exten_18] @@ -495,24 +513,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-20-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_18-20) -exten => s,12,Return() -exten => _sw-20-.,10,Voicemail(u${ext}) -exten => _sw-20-.,11,Goto(s,11) -exten => sw-20-,10,Goto(sw-20-.,10) -exten => sw-20-NOANSWER,10,Voicemail(u${ext}) -exten => sw-20-NOANSWER,11,Goto(s,11) -exten => sw-20-ANSWER,10,Goto(s,11) -exten => sw-20-BUSY,10,Voicemail(b${ext}) -exten => sw-20-BUSY,11,Goto(s,11) -exten => sw-20-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-20-DONTCALL,11,Goto(s,11) -exten => sw-20-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-20-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_20_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_18_20) +exten => s,13,Return() +exten => _sw_20_.,10,Voicemail(u${ext}) +exten => _sw_20_.,11,Goto(s,12) +exten => sw_20_,10,Goto(sw_20_.,10) +exten => sw_20_NOANSWER,10,Voicemail(u${ext}) +exten => sw_20_NOANSWER,11,Goto(s,12) +exten => sw_20_ANSWER,10,Goto(s,12) +exten => sw_20_BUSY,10,Voicemail(b${ext}) +exten => sw_20_BUSY,11,Goto(s,12) +exten => sw_20_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_20_DONTCALL,11,Goto(s,12) +exten => sw_20_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_20_TORTURE,11,Goto(s,12) [std-priv-exten_19] @@ -522,24 +541,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-21-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_19-21) -exten => s,12,Return() -exten => _sw-21-.,10,Voicemail(u${ext}) -exten => _sw-21-.,11,Goto(s,11) -exten => sw-21-,10,Goto(sw-21-.,10) -exten => sw-21-NOANSWER,10,Voicemail(u${ext}) -exten => sw-21-NOANSWER,11,Goto(s,11) -exten => sw-21-ANSWER,10,Goto(s,11) -exten => sw-21-BUSY,10,Voicemail(b${ext}) -exten => sw-21-BUSY,11,Goto(s,11) -exten => sw-21-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-21-DONTCALL,11,Goto(s,11) -exten => sw-21-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-21-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_21_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_19_21) +exten => s,13,Return() +exten => _sw_21_.,10,Voicemail(u${ext}) +exten => _sw_21_.,11,Goto(s,12) +exten => sw_21_,10,Goto(sw_21_.,10) +exten => sw_21_NOANSWER,10,Voicemail(u${ext}) +exten => sw_21_NOANSWER,11,Goto(s,12) +exten => sw_21_ANSWER,10,Goto(s,12) +exten => sw_21_BUSY,10,Voicemail(b${ext}) +exten => sw_21_BUSY,11,Goto(s,12) +exten => sw_21_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_21_DONTCALL,11,Goto(s,12) +exten => sw_21_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_21_TORTURE,11,Goto(s,12) [std-priv-exten_20] @@ -549,24 +569,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-22-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_20-22) -exten => s,12,Return() -exten => _sw-22-.,10,Voicemail(u${ext}) -exten => _sw-22-.,11,Goto(s,11) -exten => sw-22-,10,Goto(sw-22-.,10) -exten => sw-22-NOANSWER,10,Voicemail(u${ext}) -exten => sw-22-NOANSWER,11,Goto(s,11) -exten => sw-22-ANSWER,10,Goto(s,11) -exten => sw-22-BUSY,10,Voicemail(b${ext}) -exten => sw-22-BUSY,11,Goto(s,11) -exten => sw-22-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-22-DONTCALL,11,Goto(s,11) -exten => sw-22-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-22-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_22_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_20_22) +exten => s,13,Return() +exten => _sw_22_.,10,Voicemail(u${ext}) +exten => _sw_22_.,11,Goto(s,12) +exten => sw_22_,10,Goto(sw_22_.,10) +exten => sw_22_NOANSWER,10,Voicemail(u${ext}) +exten => sw_22_NOANSWER,11,Goto(s,12) +exten => sw_22_ANSWER,10,Goto(s,12) +exten => sw_22_BUSY,10,Voicemail(b${ext}) +exten => sw_22_BUSY,11,Goto(s,12) +exten => sw_22_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_22_DONTCALL,11,Goto(s,12) +exten => sw_22_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_22_TORTURE,11,Goto(s,12) [std-priv-exten_21] @@ -576,24 +597,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-23-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_21-23) -exten => s,12,Return() -exten => _sw-23-.,10,Voicemail(u${ext}) -exten => _sw-23-.,11,Goto(s,11) -exten => sw-23-,10,Goto(sw-23-.,10) -exten => sw-23-NOANSWER,10,Voicemail(u${ext}) -exten => sw-23-NOANSWER,11,Goto(s,11) -exten => sw-23-ANSWER,10,Goto(s,11) -exten => sw-23-BUSY,10,Voicemail(b${ext}) -exten => sw-23-BUSY,11,Goto(s,11) -exten => sw-23-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-23-DONTCALL,11,Goto(s,11) -exten => sw-23-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-23-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_23_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_21_23) +exten => s,13,Return() +exten => _sw_23_.,10,Voicemail(u${ext}) +exten => _sw_23_.,11,Goto(s,12) +exten => sw_23_,10,Goto(sw_23_.,10) +exten => sw_23_NOANSWER,10,Voicemail(u${ext}) +exten => sw_23_NOANSWER,11,Goto(s,12) +exten => sw_23_ANSWER,10,Goto(s,12) +exten => sw_23_BUSY,10,Voicemail(b${ext}) +exten => sw_23_BUSY,11,Goto(s,12) +exten => sw_23_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_23_DONTCALL,11,Goto(s,12) +exten => sw_23_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_23_TORTURE,11,Goto(s,12) [std-priv-exten_22] @@ -603,24 +625,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-24-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_22-24) -exten => s,12,Return() -exten => _sw-24-.,10,Voicemail(u${ext}) -exten => _sw-24-.,11,Goto(s,11) -exten => sw-24-,10,Goto(sw-24-.,10) -exten => sw-24-NOANSWER,10,Voicemail(u${ext}) -exten => sw-24-NOANSWER,11,Goto(s,11) -exten => sw-24-ANSWER,10,Goto(s,11) -exten => sw-24-BUSY,10,Voicemail(b${ext}) -exten => sw-24-BUSY,11,Goto(s,11) -exten => sw-24-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-24-DONTCALL,11,Goto(s,11) -exten => sw-24-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-24-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_24_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_22_24) +exten => s,13,Return() +exten => _sw_24_.,10,Voicemail(u${ext}) +exten => _sw_24_.,11,Goto(s,12) +exten => sw_24_,10,Goto(sw_24_.,10) +exten => sw_24_NOANSWER,10,Voicemail(u${ext}) +exten => sw_24_NOANSWER,11,Goto(s,12) +exten => sw_24_ANSWER,10,Goto(s,12) +exten => sw_24_BUSY,10,Voicemail(b${ext}) +exten => sw_24_BUSY,11,Goto(s,12) +exten => sw_24_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_24_DONTCALL,11,Goto(s,12) +exten => sw_24_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_24_TORTURE,11,Goto(s,12) [std-priv-exten_23] @@ -630,24 +653,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-25-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_23-25) -exten => s,12,Return() -exten => _sw-25-.,10,Voicemail(u${ext}) -exten => _sw-25-.,11,Goto(s,11) -exten => sw-25-,10,Goto(sw-25-.,10) -exten => sw-25-NOANSWER,10,Voicemail(u${ext}) -exten => sw-25-NOANSWER,11,Goto(s,11) -exten => sw-25-ANSWER,10,Goto(s,11) -exten => sw-25-BUSY,10,Voicemail(b${ext}) -exten => sw-25-BUSY,11,Goto(s,11) -exten => sw-25-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-25-DONTCALL,11,Goto(s,11) -exten => sw-25-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-25-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_25_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_23_25) +exten => s,13,Return() +exten => _sw_25_.,10,Voicemail(u${ext}) +exten => _sw_25_.,11,Goto(s,12) +exten => sw_25_,10,Goto(sw_25_.,10) +exten => sw_25_NOANSWER,10,Voicemail(u${ext}) +exten => sw_25_NOANSWER,11,Goto(s,12) +exten => sw_25_ANSWER,10,Goto(s,12) +exten => sw_25_BUSY,10,Voicemail(b${ext}) +exten => sw_25_BUSY,11,Goto(s,12) +exten => sw_25_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_25_DONTCALL,11,Goto(s,12) +exten => sw_25_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_25_TORTURE,11,Goto(s,12) [std-priv-exten_24] @@ -657,24 +681,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-26-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_24-26) -exten => s,12,Return() -exten => _sw-26-.,10,Voicemail(u${ext}) -exten => _sw-26-.,11,Goto(s,11) -exten => sw-26-,10,Goto(sw-26-.,10) -exten => sw-26-NOANSWER,10,Voicemail(u${ext}) -exten => sw-26-NOANSWER,11,Goto(s,11) -exten => sw-26-ANSWER,10,Goto(s,11) -exten => sw-26-BUSY,10,Voicemail(b${ext}) -exten => sw-26-BUSY,11,Goto(s,11) -exten => sw-26-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-26-DONTCALL,11,Goto(s,11) -exten => sw-26-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-26-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_26_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_24_26) +exten => s,13,Return() +exten => _sw_26_.,10,Voicemail(u${ext}) +exten => _sw_26_.,11,Goto(s,12) +exten => sw_26_,10,Goto(sw_26_.,10) +exten => sw_26_NOANSWER,10,Voicemail(u${ext}) +exten => sw_26_NOANSWER,11,Goto(s,12) +exten => sw_26_ANSWER,10,Goto(s,12) +exten => sw_26_BUSY,10,Voicemail(b${ext}) +exten => sw_26_BUSY,11,Goto(s,12) +exten => sw_26_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_26_DONTCALL,11,Goto(s,12) +exten => sw_26_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_26_TORTURE,11,Goto(s,12) [std-priv-exten_25] @@ -684,24 +709,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-27-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_25-27) -exten => s,12,Return() -exten => _sw-27-.,10,Voicemail(u${ext}) -exten => _sw-27-.,11,Goto(s,11) -exten => sw-27-,10,Goto(sw-27-.,10) -exten => sw-27-NOANSWER,10,Voicemail(u${ext}) -exten => sw-27-NOANSWER,11,Goto(s,11) -exten => sw-27-ANSWER,10,Goto(s,11) -exten => sw-27-BUSY,10,Voicemail(b${ext}) -exten => sw-27-BUSY,11,Goto(s,11) -exten => sw-27-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-27-DONTCALL,11,Goto(s,11) -exten => sw-27-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-27-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_27_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_25_27) +exten => s,13,Return() +exten => _sw_27_.,10,Voicemail(u${ext}) +exten => _sw_27_.,11,Goto(s,12) +exten => sw_27_,10,Goto(sw_27_.,10) +exten => sw_27_NOANSWER,10,Voicemail(u${ext}) +exten => sw_27_NOANSWER,11,Goto(s,12) +exten => sw_27_ANSWER,10,Goto(s,12) +exten => sw_27_BUSY,10,Voicemail(b${ext}) +exten => sw_27_BUSY,11,Goto(s,12) +exten => sw_27_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_27_DONTCALL,11,Goto(s,12) +exten => sw_27_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_27_TORTURE,11,Goto(s,12) [std-priv-exten_26] @@ -711,24 +737,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-28-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_26-28) -exten => s,12,Return() -exten => _sw-28-.,10,Voicemail(u${ext}) -exten => _sw-28-.,11,Goto(s,11) -exten => sw-28-,10,Goto(sw-28-.,10) -exten => sw-28-NOANSWER,10,Voicemail(u${ext}) -exten => sw-28-NOANSWER,11,Goto(s,11) -exten => sw-28-ANSWER,10,Goto(s,11) -exten => sw-28-BUSY,10,Voicemail(b${ext}) -exten => sw-28-BUSY,11,Goto(s,11) -exten => sw-28-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-28-DONTCALL,11,Goto(s,11) -exten => sw-28-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-28-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_28_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_26_28) +exten => s,13,Return() +exten => _sw_28_.,10,Voicemail(u${ext}) +exten => _sw_28_.,11,Goto(s,12) +exten => sw_28_,10,Goto(sw_28_.,10) +exten => sw_28_NOANSWER,10,Voicemail(u${ext}) +exten => sw_28_NOANSWER,11,Goto(s,12) +exten => sw_28_ANSWER,10,Goto(s,12) +exten => sw_28_BUSY,10,Voicemail(b${ext}) +exten => sw_28_BUSY,11,Goto(s,12) +exten => sw_28_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_28_DONTCALL,11,Goto(s,12) +exten => sw_28_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_28_TORTURE,11,Goto(s,12) [std-priv-exten_27] @@ -738,24 +765,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-29-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_27-29) -exten => s,12,Return() -exten => _sw-29-.,10,Voicemail(u${ext}) -exten => _sw-29-.,11,Goto(s,11) -exten => sw-29-,10,Goto(sw-29-.,10) -exten => sw-29-NOANSWER,10,Voicemail(u${ext}) -exten => sw-29-NOANSWER,11,Goto(s,11) -exten => sw-29-ANSWER,10,Goto(s,11) -exten => sw-29-BUSY,10,Voicemail(b${ext}) -exten => sw-29-BUSY,11,Goto(s,11) -exten => sw-29-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-29-DONTCALL,11,Goto(s,11) -exten => sw-29-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-29-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_29_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_27_29) +exten => s,13,Return() +exten => _sw_29_.,10,Voicemail(u${ext}) +exten => _sw_29_.,11,Goto(s,12) +exten => sw_29_,10,Goto(sw_29_.,10) +exten => sw_29_NOANSWER,10,Voicemail(u${ext}) +exten => sw_29_NOANSWER,11,Goto(s,12) +exten => sw_29_ANSWER,10,Goto(s,12) +exten => sw_29_BUSY,10,Voicemail(b${ext}) +exten => sw_29_BUSY,11,Goto(s,12) +exten => sw_29_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_29_DONTCALL,11,Goto(s,12) +exten => sw_29_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_29_TORTURE,11,Goto(s,12) [std-priv-exten_28] @@ -765,24 +793,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-30-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_28-30) -exten => s,12,Return() -exten => _sw-30-.,10,Voicemail(u${ext}) -exten => _sw-30-.,11,Goto(s,11) -exten => sw-30-,10,Goto(sw-30-.,10) -exten => sw-30-NOANSWER,10,Voicemail(u${ext}) -exten => sw-30-NOANSWER,11,Goto(s,11) -exten => sw-30-ANSWER,10,Goto(s,11) -exten => sw-30-BUSY,10,Voicemail(b${ext}) -exten => sw-30-BUSY,11,Goto(s,11) -exten => sw-30-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-30-DONTCALL,11,Goto(s,11) -exten => sw-30-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-30-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_30_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_28_30) +exten => s,13,Return() +exten => _sw_30_.,10,Voicemail(u${ext}) +exten => _sw_30_.,11,Goto(s,12) +exten => sw_30_,10,Goto(sw_30_.,10) +exten => sw_30_NOANSWER,10,Voicemail(u${ext}) +exten => sw_30_NOANSWER,11,Goto(s,12) +exten => sw_30_ANSWER,10,Goto(s,12) +exten => sw_30_BUSY,10,Voicemail(b${ext}) +exten => sw_30_BUSY,11,Goto(s,12) +exten => sw_30_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_30_DONTCALL,11,Goto(s,12) +exten => sw_30_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_30_TORTURE,11,Goto(s,12) [std-priv-exten_29] @@ -792,24 +821,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-31-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_29-31) -exten => s,12,Return() -exten => _sw-31-.,10,Voicemail(u${ext}) -exten => _sw-31-.,11,Goto(s,11) -exten => sw-31-,10,Goto(sw-31-.,10) -exten => sw-31-NOANSWER,10,Voicemail(u${ext}) -exten => sw-31-NOANSWER,11,Goto(s,11) -exten => sw-31-ANSWER,10,Goto(s,11) -exten => sw-31-BUSY,10,Voicemail(b${ext}) -exten => sw-31-BUSY,11,Goto(s,11) -exten => sw-31-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-31-DONTCALL,11,Goto(s,11) -exten => sw-31-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-31-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_31_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_29_31) +exten => s,13,Return() +exten => _sw_31_.,10,Voicemail(u${ext}) +exten => _sw_31_.,11,Goto(s,12) +exten => sw_31_,10,Goto(sw_31_.,10) +exten => sw_31_NOANSWER,10,Voicemail(u${ext}) +exten => sw_31_NOANSWER,11,Goto(s,12) +exten => sw_31_ANSWER,10,Goto(s,12) +exten => sw_31_BUSY,10,Voicemail(b${ext}) +exten => sw_31_BUSY,11,Goto(s,12) +exten => sw_31_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_31_DONTCALL,11,Goto(s,12) +exten => sw_31_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_31_TORTURE,11,Goto(s,12) [std-priv-exten_30] @@ -819,24 +849,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-32-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_30-32) -exten => s,12,Return() -exten => _sw-32-.,10,Voicemail(u${ext}) -exten => _sw-32-.,11,Goto(s,11) -exten => sw-32-,10,Goto(sw-32-.,10) -exten => sw-32-NOANSWER,10,Voicemail(u${ext}) -exten => sw-32-NOANSWER,11,Goto(s,11) -exten => sw-32-ANSWER,10,Goto(s,11) -exten => sw-32-BUSY,10,Voicemail(b${ext}) -exten => sw-32-BUSY,11,Goto(s,11) -exten => sw-32-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-32-DONTCALL,11,Goto(s,11) -exten => sw-32-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-32-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_32_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_30_32) +exten => s,13,Return() +exten => _sw_32_.,10,Voicemail(u${ext}) +exten => _sw_32_.,11,Goto(s,12) +exten => sw_32_,10,Goto(sw_32_.,10) +exten => sw_32_NOANSWER,10,Voicemail(u${ext}) +exten => sw_32_NOANSWER,11,Goto(s,12) +exten => sw_32_ANSWER,10,Goto(s,12) +exten => sw_32_BUSY,10,Voicemail(b${ext}) +exten => sw_32_BUSY,11,Goto(s,12) +exten => sw_32_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_32_DONTCALL,11,Goto(s,12) +exten => sw_32_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_32_TORTURE,11,Goto(s,12) [std-priv-exten_31] @@ -846,24 +877,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-33-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_31-33) -exten => s,12,Return() -exten => _sw-33-.,10,Voicemail(u${ext}) -exten => _sw-33-.,11,Goto(s,11) -exten => sw-33-,10,Goto(sw-33-.,10) -exten => sw-33-NOANSWER,10,Voicemail(u${ext}) -exten => sw-33-NOANSWER,11,Goto(s,11) -exten => sw-33-ANSWER,10,Goto(s,11) -exten => sw-33-BUSY,10,Voicemail(b${ext}) -exten => sw-33-BUSY,11,Goto(s,11) -exten => sw-33-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-33-DONTCALL,11,Goto(s,11) -exten => sw-33-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-33-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_33_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_31_33) +exten => s,13,Return() +exten => _sw_33_.,10,Voicemail(u${ext}) +exten => _sw_33_.,11,Goto(s,12) +exten => sw_33_,10,Goto(sw_33_.,10) +exten => sw_33_NOANSWER,10,Voicemail(u${ext}) +exten => sw_33_NOANSWER,11,Goto(s,12) +exten => sw_33_ANSWER,10,Goto(s,12) +exten => sw_33_BUSY,10,Voicemail(b${ext}) +exten => sw_33_BUSY,11,Goto(s,12) +exten => sw_33_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_33_DONTCALL,11,Goto(s,12) +exten => sw_33_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_33_TORTURE,11,Goto(s,12) [std-priv-exten_32] @@ -873,24 +905,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-34-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_32-34) -exten => s,12,Return() -exten => _sw-34-.,10,Voicemail(u${ext}) -exten => _sw-34-.,11,Goto(s,11) -exten => sw-34-,10,Goto(sw-34-.,10) -exten => sw-34-NOANSWER,10,Voicemail(u${ext}) -exten => sw-34-NOANSWER,11,Goto(s,11) -exten => sw-34-ANSWER,10,Goto(s,11) -exten => sw-34-BUSY,10,Voicemail(b${ext}) -exten => sw-34-BUSY,11,Goto(s,11) -exten => sw-34-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-34-DONTCALL,11,Goto(s,11) -exten => sw-34-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-34-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_34_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_32_34) +exten => s,13,Return() +exten => _sw_34_.,10,Voicemail(u${ext}) +exten => _sw_34_.,11,Goto(s,12) +exten => sw_34_,10,Goto(sw_34_.,10) +exten => sw_34_NOANSWER,10,Voicemail(u${ext}) +exten => sw_34_NOANSWER,11,Goto(s,12) +exten => sw_34_ANSWER,10,Goto(s,12) +exten => sw_34_BUSY,10,Voicemail(b${ext}) +exten => sw_34_BUSY,11,Goto(s,12) +exten => sw_34_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_34_DONTCALL,11,Goto(s,12) +exten => sw_34_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_34_TORTURE,11,Goto(s,12) [std-priv-exten_33] @@ -900,24 +933,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-35-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_33-35) -exten => s,12,Return() -exten => _sw-35-.,10,Voicemail(u${ext}) -exten => _sw-35-.,11,Goto(s,11) -exten => sw-35-,10,Goto(sw-35-.,10) -exten => sw-35-NOANSWER,10,Voicemail(u${ext}) -exten => sw-35-NOANSWER,11,Goto(s,11) -exten => sw-35-ANSWER,10,Goto(s,11) -exten => sw-35-BUSY,10,Voicemail(b${ext}) -exten => sw-35-BUSY,11,Goto(s,11) -exten => sw-35-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-35-DONTCALL,11,Goto(s,11) -exten => sw-35-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-35-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_35_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_33_35) +exten => s,13,Return() +exten => _sw_35_.,10,Voicemail(u${ext}) +exten => _sw_35_.,11,Goto(s,12) +exten => sw_35_,10,Goto(sw_35_.,10) +exten => sw_35_NOANSWER,10,Voicemail(u${ext}) +exten => sw_35_NOANSWER,11,Goto(s,12) +exten => sw_35_ANSWER,10,Goto(s,12) +exten => sw_35_BUSY,10,Voicemail(b${ext}) +exten => sw_35_BUSY,11,Goto(s,12) +exten => sw_35_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_35_DONTCALL,11,Goto(s,12) +exten => sw_35_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_35_TORTURE,11,Goto(s,12) [std-priv-exten_34] @@ -927,24 +961,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-36-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_34-36) -exten => s,12,Return() -exten => _sw-36-.,10,Voicemail(u${ext}) -exten => _sw-36-.,11,Goto(s,11) -exten => sw-36-,10,Goto(sw-36-.,10) -exten => sw-36-NOANSWER,10,Voicemail(u${ext}) -exten => sw-36-NOANSWER,11,Goto(s,11) -exten => sw-36-ANSWER,10,Goto(s,11) -exten => sw-36-BUSY,10,Voicemail(b${ext}) -exten => sw-36-BUSY,11,Goto(s,11) -exten => sw-36-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-36-DONTCALL,11,Goto(s,11) -exten => sw-36-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-36-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_36_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_34_36) +exten => s,13,Return() +exten => _sw_36_.,10,Voicemail(u${ext}) +exten => _sw_36_.,11,Goto(s,12) +exten => sw_36_,10,Goto(sw_36_.,10) +exten => sw_36_NOANSWER,10,Voicemail(u${ext}) +exten => sw_36_NOANSWER,11,Goto(s,12) +exten => sw_36_ANSWER,10,Goto(s,12) +exten => sw_36_BUSY,10,Voicemail(b${ext}) +exten => sw_36_BUSY,11,Goto(s,12) +exten => sw_36_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_36_DONTCALL,11,Goto(s,12) +exten => sw_36_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_36_TORTURE,11,Goto(s,12) [std-priv-exten_35] @@ -954,24 +989,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-37-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_35-37) -exten => s,12,Return() -exten => _sw-37-.,10,Voicemail(u${ext}) -exten => _sw-37-.,11,Goto(s,11) -exten => sw-37-,10,Goto(sw-37-.,10) -exten => sw-37-NOANSWER,10,Voicemail(u${ext}) -exten => sw-37-NOANSWER,11,Goto(s,11) -exten => sw-37-ANSWER,10,Goto(s,11) -exten => sw-37-BUSY,10,Voicemail(b${ext}) -exten => sw-37-BUSY,11,Goto(s,11) -exten => sw-37-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-37-DONTCALL,11,Goto(s,11) -exten => sw-37-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-37-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_37_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_35_37) +exten => s,13,Return() +exten => _sw_37_.,10,Voicemail(u${ext}) +exten => _sw_37_.,11,Goto(s,12) +exten => sw_37_,10,Goto(sw_37_.,10) +exten => sw_37_NOANSWER,10,Voicemail(u${ext}) +exten => sw_37_NOANSWER,11,Goto(s,12) +exten => sw_37_ANSWER,10,Goto(s,12) +exten => sw_37_BUSY,10,Voicemail(b${ext}) +exten => sw_37_BUSY,11,Goto(s,12) +exten => sw_37_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_37_DONTCALL,11,Goto(s,12) +exten => sw_37_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_37_TORTURE,11,Goto(s,12) [std-priv-exten_36] @@ -981,24 +1017,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-38-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_36-38) -exten => s,12,Return() -exten => _sw-38-.,10,Voicemail(u${ext}) -exten => _sw-38-.,11,Goto(s,11) -exten => sw-38-,10,Goto(sw-38-.,10) -exten => sw-38-NOANSWER,10,Voicemail(u${ext}) -exten => sw-38-NOANSWER,11,Goto(s,11) -exten => sw-38-ANSWER,10,Goto(s,11) -exten => sw-38-BUSY,10,Voicemail(b${ext}) -exten => sw-38-BUSY,11,Goto(s,11) -exten => sw-38-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-38-DONTCALL,11,Goto(s,11) -exten => sw-38-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-38-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_38_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_36_38) +exten => s,13,Return() +exten => _sw_38_.,10,Voicemail(u${ext}) +exten => _sw_38_.,11,Goto(s,12) +exten => sw_38_,10,Goto(sw_38_.,10) +exten => sw_38_NOANSWER,10,Voicemail(u${ext}) +exten => sw_38_NOANSWER,11,Goto(s,12) +exten => sw_38_ANSWER,10,Goto(s,12) +exten => sw_38_BUSY,10,Voicemail(b${ext}) +exten => sw_38_BUSY,11,Goto(s,12) +exten => sw_38_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_38_DONTCALL,11,Goto(s,12) +exten => sw_38_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_38_TORTURE,11,Goto(s,12) [std-priv-exten_37] @@ -1008,24 +1045,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-39-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_37-39) -exten => s,12,Return() -exten => _sw-39-.,10,Voicemail(u${ext}) -exten => _sw-39-.,11,Goto(s,11) -exten => sw-39-,10,Goto(sw-39-.,10) -exten => sw-39-NOANSWER,10,Voicemail(u${ext}) -exten => sw-39-NOANSWER,11,Goto(s,11) -exten => sw-39-ANSWER,10,Goto(s,11) -exten => sw-39-BUSY,10,Voicemail(b${ext}) -exten => sw-39-BUSY,11,Goto(s,11) -exten => sw-39-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-39-DONTCALL,11,Goto(s,11) -exten => sw-39-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-39-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_39_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_37_39) +exten => s,13,Return() +exten => _sw_39_.,10,Voicemail(u${ext}) +exten => _sw_39_.,11,Goto(s,12) +exten => sw_39_,10,Goto(sw_39_.,10) +exten => sw_39_NOANSWER,10,Voicemail(u${ext}) +exten => sw_39_NOANSWER,11,Goto(s,12) +exten => sw_39_ANSWER,10,Goto(s,12) +exten => sw_39_BUSY,10,Voicemail(b${ext}) +exten => sw_39_BUSY,11,Goto(s,12) +exten => sw_39_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_39_DONTCALL,11,Goto(s,12) +exten => sw_39_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_39_TORTURE,11,Goto(s,12) [std-priv-exten_38] @@ -1035,24 +1073,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-40-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_38-40) -exten => s,12,Return() -exten => _sw-40-.,10,Voicemail(u${ext}) -exten => _sw-40-.,11,Goto(s,11) -exten => sw-40-,10,Goto(sw-40-.,10) -exten => sw-40-NOANSWER,10,Voicemail(u${ext}) -exten => sw-40-NOANSWER,11,Goto(s,11) -exten => sw-40-ANSWER,10,Goto(s,11) -exten => sw-40-BUSY,10,Voicemail(b${ext}) -exten => sw-40-BUSY,11,Goto(s,11) -exten => sw-40-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-40-DONTCALL,11,Goto(s,11) -exten => sw-40-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-40-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_40_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_38_40) +exten => s,13,Return() +exten => _sw_40_.,10,Voicemail(u${ext}) +exten => _sw_40_.,11,Goto(s,12) +exten => sw_40_,10,Goto(sw_40_.,10) +exten => sw_40_NOANSWER,10,Voicemail(u${ext}) +exten => sw_40_NOANSWER,11,Goto(s,12) +exten => sw_40_ANSWER,10,Goto(s,12) +exten => sw_40_BUSY,10,Voicemail(b${ext}) +exten => sw_40_BUSY,11,Goto(s,12) +exten => sw_40_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_40_DONTCALL,11,Goto(s,12) +exten => sw_40_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_40_TORTURE,11,Goto(s,12) [std-priv-exten_39] @@ -1062,24 +1101,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-41-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_39-41) -exten => s,12,Return() -exten => _sw-41-.,10,Voicemail(u${ext}) -exten => _sw-41-.,11,Goto(s,11) -exten => sw-41-,10,Goto(sw-41-.,10) -exten => sw-41-NOANSWER,10,Voicemail(u${ext}) -exten => sw-41-NOANSWER,11,Goto(s,11) -exten => sw-41-ANSWER,10,Goto(s,11) -exten => sw-41-BUSY,10,Voicemail(b${ext}) -exten => sw-41-BUSY,11,Goto(s,11) -exten => sw-41-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-41-DONTCALL,11,Goto(s,11) -exten => sw-41-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-41-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_41_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_39_41) +exten => s,13,Return() +exten => _sw_41_.,10,Voicemail(u${ext}) +exten => _sw_41_.,11,Goto(s,12) +exten => sw_41_,10,Goto(sw_41_.,10) +exten => sw_41_NOANSWER,10,Voicemail(u${ext}) +exten => sw_41_NOANSWER,11,Goto(s,12) +exten => sw_41_ANSWER,10,Goto(s,12) +exten => sw_41_BUSY,10,Voicemail(b${ext}) +exten => sw_41_BUSY,11,Goto(s,12) +exten => sw_41_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_41_DONTCALL,11,Goto(s,12) +exten => sw_41_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_41_TORTURE,11,Goto(s,12) [std-priv-exten_40] @@ -1089,24 +1129,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-42-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_40-42) -exten => s,12,Return() -exten => _sw-42-.,10,Voicemail(u${ext}) -exten => _sw-42-.,11,Goto(s,11) -exten => sw-42-,10,Goto(sw-42-.,10) -exten => sw-42-NOANSWER,10,Voicemail(u${ext}) -exten => sw-42-NOANSWER,11,Goto(s,11) -exten => sw-42-ANSWER,10,Goto(s,11) -exten => sw-42-BUSY,10,Voicemail(b${ext}) -exten => sw-42-BUSY,11,Goto(s,11) -exten => sw-42-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-42-DONTCALL,11,Goto(s,11) -exten => sw-42-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-42-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_42_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_40_42) +exten => s,13,Return() +exten => _sw_42_.,10,Voicemail(u${ext}) +exten => _sw_42_.,11,Goto(s,12) +exten => sw_42_,10,Goto(sw_42_.,10) +exten => sw_42_NOANSWER,10,Voicemail(u${ext}) +exten => sw_42_NOANSWER,11,Goto(s,12) +exten => sw_42_ANSWER,10,Goto(s,12) +exten => sw_42_BUSY,10,Voicemail(b${ext}) +exten => sw_42_BUSY,11,Goto(s,12) +exten => sw_42_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_42_DONTCALL,11,Goto(s,12) +exten => sw_42_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_42_TORTURE,11,Goto(s,12) [std-priv-exten_41] @@ -1116,24 +1157,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-43-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_41-43) -exten => s,12,Return() -exten => _sw-43-.,10,Voicemail(u${ext}) -exten => _sw-43-.,11,Goto(s,11) -exten => sw-43-,10,Goto(sw-43-.,10) -exten => sw-43-NOANSWER,10,Voicemail(u${ext}) -exten => sw-43-NOANSWER,11,Goto(s,11) -exten => sw-43-ANSWER,10,Goto(s,11) -exten => sw-43-BUSY,10,Voicemail(b${ext}) -exten => sw-43-BUSY,11,Goto(s,11) -exten => sw-43-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-43-DONTCALL,11,Goto(s,11) -exten => sw-43-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-43-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_43_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_41_43) +exten => s,13,Return() +exten => _sw_43_.,10,Voicemail(u${ext}) +exten => _sw_43_.,11,Goto(s,12) +exten => sw_43_,10,Goto(sw_43_.,10) +exten => sw_43_NOANSWER,10,Voicemail(u${ext}) +exten => sw_43_NOANSWER,11,Goto(s,12) +exten => sw_43_ANSWER,10,Goto(s,12) +exten => sw_43_BUSY,10,Voicemail(b${ext}) +exten => sw_43_BUSY,11,Goto(s,12) +exten => sw_43_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_43_DONTCALL,11,Goto(s,12) +exten => sw_43_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_43_TORTURE,11,Goto(s,12) [std-priv-exten_42] @@ -1143,24 +1185,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-44-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_42-44) -exten => s,12,Return() -exten => _sw-44-.,10,Voicemail(u${ext}) -exten => _sw-44-.,11,Goto(s,11) -exten => sw-44-,10,Goto(sw-44-.,10) -exten => sw-44-NOANSWER,10,Voicemail(u${ext}) -exten => sw-44-NOANSWER,11,Goto(s,11) -exten => sw-44-ANSWER,10,Goto(s,11) -exten => sw-44-BUSY,10,Voicemail(b${ext}) -exten => sw-44-BUSY,11,Goto(s,11) -exten => sw-44-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-44-DONTCALL,11,Goto(s,11) -exten => sw-44-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-44-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_44_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_42_44) +exten => s,13,Return() +exten => _sw_44_.,10,Voicemail(u${ext}) +exten => _sw_44_.,11,Goto(s,12) +exten => sw_44_,10,Goto(sw_44_.,10) +exten => sw_44_NOANSWER,10,Voicemail(u${ext}) +exten => sw_44_NOANSWER,11,Goto(s,12) +exten => sw_44_ANSWER,10,Goto(s,12) +exten => sw_44_BUSY,10,Voicemail(b${ext}) +exten => sw_44_BUSY,11,Goto(s,12) +exten => sw_44_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_44_DONTCALL,11,Goto(s,12) +exten => sw_44_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_44_TORTURE,11,Goto(s,12) [std-priv-exten_43] @@ -1170,24 +1213,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-45-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_43-45) -exten => s,12,Return() -exten => _sw-45-.,10,Voicemail(u${ext}) -exten => _sw-45-.,11,Goto(s,11) -exten => sw-45-,10,Goto(sw-45-.,10) -exten => sw-45-NOANSWER,10,Voicemail(u${ext}) -exten => sw-45-NOANSWER,11,Goto(s,11) -exten => sw-45-ANSWER,10,Goto(s,11) -exten => sw-45-BUSY,10,Voicemail(b${ext}) -exten => sw-45-BUSY,11,Goto(s,11) -exten => sw-45-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-45-DONTCALL,11,Goto(s,11) -exten => sw-45-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-45-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_45_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_43_45) +exten => s,13,Return() +exten => _sw_45_.,10,Voicemail(u${ext}) +exten => _sw_45_.,11,Goto(s,12) +exten => sw_45_,10,Goto(sw_45_.,10) +exten => sw_45_NOANSWER,10,Voicemail(u${ext}) +exten => sw_45_NOANSWER,11,Goto(s,12) +exten => sw_45_ANSWER,10,Goto(s,12) +exten => sw_45_BUSY,10,Voicemail(b${ext}) +exten => sw_45_BUSY,11,Goto(s,12) +exten => sw_45_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_45_DONTCALL,11,Goto(s,12) +exten => sw_45_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_45_TORTURE,11,Goto(s,12) [std-priv-exten_44] @@ -1197,24 +1241,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-46-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_44-46) -exten => s,12,Return() -exten => _sw-46-.,10,Voicemail(u${ext}) -exten => _sw-46-.,11,Goto(s,11) -exten => sw-46-,10,Goto(sw-46-.,10) -exten => sw-46-NOANSWER,10,Voicemail(u${ext}) -exten => sw-46-NOANSWER,11,Goto(s,11) -exten => sw-46-ANSWER,10,Goto(s,11) -exten => sw-46-BUSY,10,Voicemail(b${ext}) -exten => sw-46-BUSY,11,Goto(s,11) -exten => sw-46-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-46-DONTCALL,11,Goto(s,11) -exten => sw-46-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-46-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_46_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_44_46) +exten => s,13,Return() +exten => _sw_46_.,10,Voicemail(u${ext}) +exten => _sw_46_.,11,Goto(s,12) +exten => sw_46_,10,Goto(sw_46_.,10) +exten => sw_46_NOANSWER,10,Voicemail(u${ext}) +exten => sw_46_NOANSWER,11,Goto(s,12) +exten => sw_46_ANSWER,10,Goto(s,12) +exten => sw_46_BUSY,10,Voicemail(b${ext}) +exten => sw_46_BUSY,11,Goto(s,12) +exten => sw_46_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_46_DONTCALL,11,Goto(s,12) +exten => sw_46_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_46_TORTURE,11,Goto(s,12) [std-priv-exten_45] @@ -1224,24 +1269,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-47-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_45-47) -exten => s,12,Return() -exten => _sw-47-.,10,Voicemail(u${ext}) -exten => _sw-47-.,11,Goto(s,11) -exten => sw-47-,10,Goto(sw-47-.,10) -exten => sw-47-NOANSWER,10,Voicemail(u${ext}) -exten => sw-47-NOANSWER,11,Goto(s,11) -exten => sw-47-ANSWER,10,Goto(s,11) -exten => sw-47-BUSY,10,Voicemail(b${ext}) -exten => sw-47-BUSY,11,Goto(s,11) -exten => sw-47-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-47-DONTCALL,11,Goto(s,11) -exten => sw-47-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-47-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_47_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_45_47) +exten => s,13,Return() +exten => _sw_47_.,10,Voicemail(u${ext}) +exten => _sw_47_.,11,Goto(s,12) +exten => sw_47_,10,Goto(sw_47_.,10) +exten => sw_47_NOANSWER,10,Voicemail(u${ext}) +exten => sw_47_NOANSWER,11,Goto(s,12) +exten => sw_47_ANSWER,10,Goto(s,12) +exten => sw_47_BUSY,10,Voicemail(b${ext}) +exten => sw_47_BUSY,11,Goto(s,12) +exten => sw_47_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_47_DONTCALL,11,Goto(s,12) +exten => sw_47_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_47_TORTURE,11,Goto(s,12) [std-priv-exten_46] @@ -1251,24 +1297,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-48-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_46-48) -exten => s,12,Return() -exten => _sw-48-.,10,Voicemail(u${ext}) -exten => _sw-48-.,11,Goto(s,11) -exten => sw-48-,10,Goto(sw-48-.,10) -exten => sw-48-NOANSWER,10,Voicemail(u${ext}) -exten => sw-48-NOANSWER,11,Goto(s,11) -exten => sw-48-ANSWER,10,Goto(s,11) -exten => sw-48-BUSY,10,Voicemail(b${ext}) -exten => sw-48-BUSY,11,Goto(s,11) -exten => sw-48-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-48-DONTCALL,11,Goto(s,11) -exten => sw-48-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-48-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_48_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_46_48) +exten => s,13,Return() +exten => _sw_48_.,10,Voicemail(u${ext}) +exten => _sw_48_.,11,Goto(s,12) +exten => sw_48_,10,Goto(sw_48_.,10) +exten => sw_48_NOANSWER,10,Voicemail(u${ext}) +exten => sw_48_NOANSWER,11,Goto(s,12) +exten => sw_48_ANSWER,10,Goto(s,12) +exten => sw_48_BUSY,10,Voicemail(b${ext}) +exten => sw_48_BUSY,11,Goto(s,12) +exten => sw_48_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_48_DONTCALL,11,Goto(s,12) +exten => sw_48_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_48_TORTURE,11,Goto(s,12) [std-priv-exten_47] @@ -1278,24 +1325,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-49-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_47-49) -exten => s,12,Return() -exten => _sw-49-.,10,Voicemail(u${ext}) -exten => _sw-49-.,11,Goto(s,11) -exten => sw-49-,10,Goto(sw-49-.,10) -exten => sw-49-NOANSWER,10,Voicemail(u${ext}) -exten => sw-49-NOANSWER,11,Goto(s,11) -exten => sw-49-ANSWER,10,Goto(s,11) -exten => sw-49-BUSY,10,Voicemail(b${ext}) -exten => sw-49-BUSY,11,Goto(s,11) -exten => sw-49-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-49-DONTCALL,11,Goto(s,11) -exten => sw-49-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-49-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_49_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_47_49) +exten => s,13,Return() +exten => _sw_49_.,10,Voicemail(u${ext}) +exten => _sw_49_.,11,Goto(s,12) +exten => sw_49_,10,Goto(sw_49_.,10) +exten => sw_49_NOANSWER,10,Voicemail(u${ext}) +exten => sw_49_NOANSWER,11,Goto(s,12) +exten => sw_49_ANSWER,10,Goto(s,12) +exten => sw_49_BUSY,10,Voicemail(b${ext}) +exten => sw_49_BUSY,11,Goto(s,12) +exten => sw_49_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_49_DONTCALL,11,Goto(s,12) +exten => sw_49_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_49_TORTURE,11,Goto(s,12) [std-priv-exten_48] @@ -1305,24 +1353,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-50-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_48-50) -exten => s,12,Return() -exten => _sw-50-.,10,Voicemail(u${ext}) -exten => _sw-50-.,11,Goto(s,11) -exten => sw-50-,10,Goto(sw-50-.,10) -exten => sw-50-NOANSWER,10,Voicemail(u${ext}) -exten => sw-50-NOANSWER,11,Goto(s,11) -exten => sw-50-ANSWER,10,Goto(s,11) -exten => sw-50-BUSY,10,Voicemail(b${ext}) -exten => sw-50-BUSY,11,Goto(s,11) -exten => sw-50-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-50-DONTCALL,11,Goto(s,11) -exten => sw-50-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-50-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_50_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_48_50) +exten => s,13,Return() +exten => _sw_50_.,10,Voicemail(u${ext}) +exten => _sw_50_.,11,Goto(s,12) +exten => sw_50_,10,Goto(sw_50_.,10) +exten => sw_50_NOANSWER,10,Voicemail(u${ext}) +exten => sw_50_NOANSWER,11,Goto(s,12) +exten => sw_50_ANSWER,10,Goto(s,12) +exten => sw_50_BUSY,10,Voicemail(b${ext}) +exten => sw_50_BUSY,11,Goto(s,12) +exten => sw_50_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_50_DONTCALL,11,Goto(s,12) +exten => sw_50_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_50_TORTURE,11,Goto(s,12) [std-priv-exten_49] @@ -1332,24 +1381,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-51-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_49-51) -exten => s,12,Return() -exten => _sw-51-.,10,Voicemail(u${ext}) -exten => _sw-51-.,11,Goto(s,11) -exten => sw-51-,10,Goto(sw-51-.,10) -exten => sw-51-NOANSWER,10,Voicemail(u${ext}) -exten => sw-51-NOANSWER,11,Goto(s,11) -exten => sw-51-ANSWER,10,Goto(s,11) -exten => sw-51-BUSY,10,Voicemail(b${ext}) -exten => sw-51-BUSY,11,Goto(s,11) -exten => sw-51-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-51-DONTCALL,11,Goto(s,11) -exten => sw-51-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-51-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_51_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_49_51) +exten => s,13,Return() +exten => _sw_51_.,10,Voicemail(u${ext}) +exten => _sw_51_.,11,Goto(s,12) +exten => sw_51_,10,Goto(sw_51_.,10) +exten => sw_51_NOANSWER,10,Voicemail(u${ext}) +exten => sw_51_NOANSWER,11,Goto(s,12) +exten => sw_51_ANSWER,10,Goto(s,12) +exten => sw_51_BUSY,10,Voicemail(b${ext}) +exten => sw_51_BUSY,11,Goto(s,12) +exten => sw_51_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_51_DONTCALL,11,Goto(s,12) +exten => sw_51_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_51_TORTURE,11,Goto(s,12) [std-priv-exten_50] @@ -1359,24 +1409,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-52-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_50-52) -exten => s,12,Return() -exten => _sw-52-.,10,Voicemail(u${ext}) -exten => _sw-52-.,11,Goto(s,11) -exten => sw-52-,10,Goto(sw-52-.,10) -exten => sw-52-NOANSWER,10,Voicemail(u${ext}) -exten => sw-52-NOANSWER,11,Goto(s,11) -exten => sw-52-ANSWER,10,Goto(s,11) -exten => sw-52-BUSY,10,Voicemail(b${ext}) -exten => sw-52-BUSY,11,Goto(s,11) -exten => sw-52-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-52-DONTCALL,11,Goto(s,11) -exten => sw-52-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-52-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_52_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_50_52) +exten => s,13,Return() +exten => _sw_52_.,10,Voicemail(u${ext}) +exten => _sw_52_.,11,Goto(s,12) +exten => sw_52_,10,Goto(sw_52_.,10) +exten => sw_52_NOANSWER,10,Voicemail(u${ext}) +exten => sw_52_NOANSWER,11,Goto(s,12) +exten => sw_52_ANSWER,10,Goto(s,12) +exten => sw_52_BUSY,10,Voicemail(b${ext}) +exten => sw_52_BUSY,11,Goto(s,12) +exten => sw_52_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_52_DONTCALL,11,Goto(s,12) +exten => sw_52_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_52_TORTURE,11,Goto(s,12) [std-priv-exten_51] @@ -1386,24 +1437,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-53-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_51-53) -exten => s,12,Return() -exten => _sw-53-.,10,Voicemail(u${ext}) -exten => _sw-53-.,11,Goto(s,11) -exten => sw-53-,10,Goto(sw-53-.,10) -exten => sw-53-NOANSWER,10,Voicemail(u${ext}) -exten => sw-53-NOANSWER,11,Goto(s,11) -exten => sw-53-ANSWER,10,Goto(s,11) -exten => sw-53-BUSY,10,Voicemail(b${ext}) -exten => sw-53-BUSY,11,Goto(s,11) -exten => sw-53-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-53-DONTCALL,11,Goto(s,11) -exten => sw-53-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-53-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_53_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_51_53) +exten => s,13,Return() +exten => _sw_53_.,10,Voicemail(u${ext}) +exten => _sw_53_.,11,Goto(s,12) +exten => sw_53_,10,Goto(sw_53_.,10) +exten => sw_53_NOANSWER,10,Voicemail(u${ext}) +exten => sw_53_NOANSWER,11,Goto(s,12) +exten => sw_53_ANSWER,10,Goto(s,12) +exten => sw_53_BUSY,10,Voicemail(b${ext}) +exten => sw_53_BUSY,11,Goto(s,12) +exten => sw_53_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_53_DONTCALL,11,Goto(s,12) +exten => sw_53_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_53_TORTURE,11,Goto(s,12) [std-priv-exten_52] @@ -1413,24 +1465,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-54-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_52-54) -exten => s,12,Return() -exten => _sw-54-.,10,Voicemail(u${ext}) -exten => _sw-54-.,11,Goto(s,11) -exten => sw-54-,10,Goto(sw-54-.,10) -exten => sw-54-NOANSWER,10,Voicemail(u${ext}) -exten => sw-54-NOANSWER,11,Goto(s,11) -exten => sw-54-ANSWER,10,Goto(s,11) -exten => sw-54-BUSY,10,Voicemail(b${ext}) -exten => sw-54-BUSY,11,Goto(s,11) -exten => sw-54-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-54-DONTCALL,11,Goto(s,11) -exten => sw-54-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-54-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_54_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_52_54) +exten => s,13,Return() +exten => _sw_54_.,10,Voicemail(u${ext}) +exten => _sw_54_.,11,Goto(s,12) +exten => sw_54_,10,Goto(sw_54_.,10) +exten => sw_54_NOANSWER,10,Voicemail(u${ext}) +exten => sw_54_NOANSWER,11,Goto(s,12) +exten => sw_54_ANSWER,10,Goto(s,12) +exten => sw_54_BUSY,10,Voicemail(b${ext}) +exten => sw_54_BUSY,11,Goto(s,12) +exten => sw_54_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_54_DONTCALL,11,Goto(s,12) +exten => sw_54_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_54_TORTURE,11,Goto(s,12) [std-priv-exten_53] @@ -1440,24 +1493,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-55-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_53-55) -exten => s,12,Return() -exten => _sw-55-.,10,Voicemail(u${ext}) -exten => _sw-55-.,11,Goto(s,11) -exten => sw-55-,10,Goto(sw-55-.,10) -exten => sw-55-NOANSWER,10,Voicemail(u${ext}) -exten => sw-55-NOANSWER,11,Goto(s,11) -exten => sw-55-ANSWER,10,Goto(s,11) -exten => sw-55-BUSY,10,Voicemail(b${ext}) -exten => sw-55-BUSY,11,Goto(s,11) -exten => sw-55-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-55-DONTCALL,11,Goto(s,11) -exten => sw-55-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-55-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_55_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_53_55) +exten => s,13,Return() +exten => _sw_55_.,10,Voicemail(u${ext}) +exten => _sw_55_.,11,Goto(s,12) +exten => sw_55_,10,Goto(sw_55_.,10) +exten => sw_55_NOANSWER,10,Voicemail(u${ext}) +exten => sw_55_NOANSWER,11,Goto(s,12) +exten => sw_55_ANSWER,10,Goto(s,12) +exten => sw_55_BUSY,10,Voicemail(b${ext}) +exten => sw_55_BUSY,11,Goto(s,12) +exten => sw_55_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_55_DONTCALL,11,Goto(s,12) +exten => sw_55_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_55_TORTURE,11,Goto(s,12) [std-priv-exten_54] @@ -1467,24 +1521,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-56-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_54-56) -exten => s,12,Return() -exten => _sw-56-.,10,Voicemail(u${ext}) -exten => _sw-56-.,11,Goto(s,11) -exten => sw-56-,10,Goto(sw-56-.,10) -exten => sw-56-NOANSWER,10,Voicemail(u${ext}) -exten => sw-56-NOANSWER,11,Goto(s,11) -exten => sw-56-ANSWER,10,Goto(s,11) -exten => sw-56-BUSY,10,Voicemail(b${ext}) -exten => sw-56-BUSY,11,Goto(s,11) -exten => sw-56-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-56-DONTCALL,11,Goto(s,11) -exten => sw-56-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-56-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_56_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_54_56) +exten => s,13,Return() +exten => _sw_56_.,10,Voicemail(u${ext}) +exten => _sw_56_.,11,Goto(s,12) +exten => sw_56_,10,Goto(sw_56_.,10) +exten => sw_56_NOANSWER,10,Voicemail(u${ext}) +exten => sw_56_NOANSWER,11,Goto(s,12) +exten => sw_56_ANSWER,10,Goto(s,12) +exten => sw_56_BUSY,10,Voicemail(b${ext}) +exten => sw_56_BUSY,11,Goto(s,12) +exten => sw_56_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_56_DONTCALL,11,Goto(s,12) +exten => sw_56_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_56_TORTURE,11,Goto(s,12) [std-priv-exten_55] @@ -1494,24 +1549,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-57-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_55-57) -exten => s,12,Return() -exten => _sw-57-.,10,Voicemail(u${ext}) -exten => _sw-57-.,11,Goto(s,11) -exten => sw-57-,10,Goto(sw-57-.,10) -exten => sw-57-NOANSWER,10,Voicemail(u${ext}) -exten => sw-57-NOANSWER,11,Goto(s,11) -exten => sw-57-ANSWER,10,Goto(s,11) -exten => sw-57-BUSY,10,Voicemail(b${ext}) -exten => sw-57-BUSY,11,Goto(s,11) -exten => sw-57-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-57-DONTCALL,11,Goto(s,11) -exten => sw-57-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-57-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_57_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_55_57) +exten => s,13,Return() +exten => _sw_57_.,10,Voicemail(u${ext}) +exten => _sw_57_.,11,Goto(s,12) +exten => sw_57_,10,Goto(sw_57_.,10) +exten => sw_57_NOANSWER,10,Voicemail(u${ext}) +exten => sw_57_NOANSWER,11,Goto(s,12) +exten => sw_57_ANSWER,10,Goto(s,12) +exten => sw_57_BUSY,10,Voicemail(b${ext}) +exten => sw_57_BUSY,11,Goto(s,12) +exten => sw_57_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_57_DONTCALL,11,Goto(s,12) +exten => sw_57_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_57_TORTURE,11,Goto(s,12) [std-priv-exten_56] @@ -1521,24 +1577,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-58-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_56-58) -exten => s,12,Return() -exten => _sw-58-.,10,Voicemail(u${ext}) -exten => _sw-58-.,11,Goto(s,11) -exten => sw-58-,10,Goto(sw-58-.,10) -exten => sw-58-NOANSWER,10,Voicemail(u${ext}) -exten => sw-58-NOANSWER,11,Goto(s,11) -exten => sw-58-ANSWER,10,Goto(s,11) -exten => sw-58-BUSY,10,Voicemail(b${ext}) -exten => sw-58-BUSY,11,Goto(s,11) -exten => sw-58-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-58-DONTCALL,11,Goto(s,11) -exten => sw-58-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-58-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_58_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_56_58) +exten => s,13,Return() +exten => _sw_58_.,10,Voicemail(u${ext}) +exten => _sw_58_.,11,Goto(s,12) +exten => sw_58_,10,Goto(sw_58_.,10) +exten => sw_58_NOANSWER,10,Voicemail(u${ext}) +exten => sw_58_NOANSWER,11,Goto(s,12) +exten => sw_58_ANSWER,10,Goto(s,12) +exten => sw_58_BUSY,10,Voicemail(b${ext}) +exten => sw_58_BUSY,11,Goto(s,12) +exten => sw_58_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_58_DONTCALL,11,Goto(s,12) +exten => sw_58_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_58_TORTURE,11,Goto(s,12) [std-priv-exten_57] @@ -1548,24 +1605,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-59-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_57-59) -exten => s,12,Return() -exten => _sw-59-.,10,Voicemail(u${ext}) -exten => _sw-59-.,11,Goto(s,11) -exten => sw-59-,10,Goto(sw-59-.,10) -exten => sw-59-NOANSWER,10,Voicemail(u${ext}) -exten => sw-59-NOANSWER,11,Goto(s,11) -exten => sw-59-ANSWER,10,Goto(s,11) -exten => sw-59-BUSY,10,Voicemail(b${ext}) -exten => sw-59-BUSY,11,Goto(s,11) -exten => sw-59-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-59-DONTCALL,11,Goto(s,11) -exten => sw-59-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-59-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_59_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_57_59) +exten => s,13,Return() +exten => _sw_59_.,10,Voicemail(u${ext}) +exten => _sw_59_.,11,Goto(s,12) +exten => sw_59_,10,Goto(sw_59_.,10) +exten => sw_59_NOANSWER,10,Voicemail(u${ext}) +exten => sw_59_NOANSWER,11,Goto(s,12) +exten => sw_59_ANSWER,10,Goto(s,12) +exten => sw_59_BUSY,10,Voicemail(b${ext}) +exten => sw_59_BUSY,11,Goto(s,12) +exten => sw_59_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_59_DONTCALL,11,Goto(s,12) +exten => sw_59_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_59_TORTURE,11,Goto(s,12) [std-priv-exten_58] @@ -1575,24 +1633,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-60-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_58-60) -exten => s,12,Return() -exten => _sw-60-.,10,Voicemail(u${ext}) -exten => _sw-60-.,11,Goto(s,11) -exten => sw-60-,10,Goto(sw-60-.,10) -exten => sw-60-NOANSWER,10,Voicemail(u${ext}) -exten => sw-60-NOANSWER,11,Goto(s,11) -exten => sw-60-ANSWER,10,Goto(s,11) -exten => sw-60-BUSY,10,Voicemail(b${ext}) -exten => sw-60-BUSY,11,Goto(s,11) -exten => sw-60-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-60-DONTCALL,11,Goto(s,11) -exten => sw-60-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-60-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_60_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_58_60) +exten => s,13,Return() +exten => _sw_60_.,10,Voicemail(u${ext}) +exten => _sw_60_.,11,Goto(s,12) +exten => sw_60_,10,Goto(sw_60_.,10) +exten => sw_60_NOANSWER,10,Voicemail(u${ext}) +exten => sw_60_NOANSWER,11,Goto(s,12) +exten => sw_60_ANSWER,10,Goto(s,12) +exten => sw_60_BUSY,10,Voicemail(b${ext}) +exten => sw_60_BUSY,11,Goto(s,12) +exten => sw_60_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_60_DONTCALL,11,Goto(s,12) +exten => sw_60_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_60_TORTURE,11,Goto(s,12) [std-priv-exten_59] @@ -1602,24 +1661,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-61-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_59-61) -exten => s,12,Return() -exten => _sw-61-.,10,Voicemail(u${ext}) -exten => _sw-61-.,11,Goto(s,11) -exten => sw-61-,10,Goto(sw-61-.,10) -exten => sw-61-NOANSWER,10,Voicemail(u${ext}) -exten => sw-61-NOANSWER,11,Goto(s,11) -exten => sw-61-ANSWER,10,Goto(s,11) -exten => sw-61-BUSY,10,Voicemail(b${ext}) -exten => sw-61-BUSY,11,Goto(s,11) -exten => sw-61-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-61-DONTCALL,11,Goto(s,11) -exten => sw-61-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-61-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_61_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_59_61) +exten => s,13,Return() +exten => _sw_61_.,10,Voicemail(u${ext}) +exten => _sw_61_.,11,Goto(s,12) +exten => sw_61_,10,Goto(sw_61_.,10) +exten => sw_61_NOANSWER,10,Voicemail(u${ext}) +exten => sw_61_NOANSWER,11,Goto(s,12) +exten => sw_61_ANSWER,10,Goto(s,12) +exten => sw_61_BUSY,10,Voicemail(b${ext}) +exten => sw_61_BUSY,11,Goto(s,12) +exten => sw_61_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_61_DONTCALL,11,Goto(s,12) +exten => sw_61_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_61_TORTURE,11,Goto(s,12) [std-priv-exten_60] @@ -1629,24 +1689,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-62-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_60-62) -exten => s,12,Return() -exten => _sw-62-.,10,Voicemail(u${ext}) -exten => _sw-62-.,11,Goto(s,11) -exten => sw-62-,10,Goto(sw-62-.,10) -exten => sw-62-NOANSWER,10,Voicemail(u${ext}) -exten => sw-62-NOANSWER,11,Goto(s,11) -exten => sw-62-ANSWER,10,Goto(s,11) -exten => sw-62-BUSY,10,Voicemail(b${ext}) -exten => sw-62-BUSY,11,Goto(s,11) -exten => sw-62-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-62-DONTCALL,11,Goto(s,11) -exten => sw-62-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-62-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_62_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_60_62) +exten => s,13,Return() +exten => _sw_62_.,10,Voicemail(u${ext}) +exten => _sw_62_.,11,Goto(s,12) +exten => sw_62_,10,Goto(sw_62_.,10) +exten => sw_62_NOANSWER,10,Voicemail(u${ext}) +exten => sw_62_NOANSWER,11,Goto(s,12) +exten => sw_62_ANSWER,10,Goto(s,12) +exten => sw_62_BUSY,10,Voicemail(b${ext}) +exten => sw_62_BUSY,11,Goto(s,12) +exten => sw_62_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_62_DONTCALL,11,Goto(s,12) +exten => sw_62_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_62_TORTURE,11,Goto(s,12) [std-priv-exten_61] @@ -1656,24 +1717,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-63-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_61-63) -exten => s,12,Return() -exten => _sw-63-.,10,Voicemail(u${ext}) -exten => _sw-63-.,11,Goto(s,11) -exten => sw-63-,10,Goto(sw-63-.,10) -exten => sw-63-NOANSWER,10,Voicemail(u${ext}) -exten => sw-63-NOANSWER,11,Goto(s,11) -exten => sw-63-ANSWER,10,Goto(s,11) -exten => sw-63-BUSY,10,Voicemail(b${ext}) -exten => sw-63-BUSY,11,Goto(s,11) -exten => sw-63-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-63-DONTCALL,11,Goto(s,11) -exten => sw-63-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-63-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_63_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_61_63) +exten => s,13,Return() +exten => _sw_63_.,10,Voicemail(u${ext}) +exten => _sw_63_.,11,Goto(s,12) +exten => sw_63_,10,Goto(sw_63_.,10) +exten => sw_63_NOANSWER,10,Voicemail(u${ext}) +exten => sw_63_NOANSWER,11,Goto(s,12) +exten => sw_63_ANSWER,10,Goto(s,12) +exten => sw_63_BUSY,10,Voicemail(b${ext}) +exten => sw_63_BUSY,11,Goto(s,12) +exten => sw_63_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_63_DONTCALL,11,Goto(s,12) +exten => sw_63_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_63_TORTURE,11,Goto(s,12) [std-priv-exten_62] @@ -1683,24 +1745,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-64-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_62-64) -exten => s,12,Return() -exten => _sw-64-.,10,Voicemail(u${ext}) -exten => _sw-64-.,11,Goto(s,11) -exten => sw-64-,10,Goto(sw-64-.,10) -exten => sw-64-NOANSWER,10,Voicemail(u${ext}) -exten => sw-64-NOANSWER,11,Goto(s,11) -exten => sw-64-ANSWER,10,Goto(s,11) -exten => sw-64-BUSY,10,Voicemail(b${ext}) -exten => sw-64-BUSY,11,Goto(s,11) -exten => sw-64-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-64-DONTCALL,11,Goto(s,11) -exten => sw-64-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-64-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_64_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_62_64) +exten => s,13,Return() +exten => _sw_64_.,10,Voicemail(u${ext}) +exten => _sw_64_.,11,Goto(s,12) +exten => sw_64_,10,Goto(sw_64_.,10) +exten => sw_64_NOANSWER,10,Voicemail(u${ext}) +exten => sw_64_NOANSWER,11,Goto(s,12) +exten => sw_64_ANSWER,10,Goto(s,12) +exten => sw_64_BUSY,10,Voicemail(b${ext}) +exten => sw_64_BUSY,11,Goto(s,12) +exten => sw_64_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_64_DONTCALL,11,Goto(s,12) +exten => sw_64_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_64_TORTURE,11,Goto(s,12) [std-priv-exten_63] @@ -1710,24 +1773,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-65-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_63-65) -exten => s,12,Return() -exten => _sw-65-.,10,Voicemail(u${ext}) -exten => _sw-65-.,11,Goto(s,11) -exten => sw-65-,10,Goto(sw-65-.,10) -exten => sw-65-NOANSWER,10,Voicemail(u${ext}) -exten => sw-65-NOANSWER,11,Goto(s,11) -exten => sw-65-ANSWER,10,Goto(s,11) -exten => sw-65-BUSY,10,Voicemail(b${ext}) -exten => sw-65-BUSY,11,Goto(s,11) -exten => sw-65-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-65-DONTCALL,11,Goto(s,11) -exten => sw-65-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-65-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_65_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_63_65) +exten => s,13,Return() +exten => _sw_65_.,10,Voicemail(u${ext}) +exten => _sw_65_.,11,Goto(s,12) +exten => sw_65_,10,Goto(sw_65_.,10) +exten => sw_65_NOANSWER,10,Voicemail(u${ext}) +exten => sw_65_NOANSWER,11,Goto(s,12) +exten => sw_65_ANSWER,10,Goto(s,12) +exten => sw_65_BUSY,10,Voicemail(b${ext}) +exten => sw_65_BUSY,11,Goto(s,12) +exten => sw_65_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_65_DONTCALL,11,Goto(s,12) +exten => sw_65_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_65_TORTURE,11,Goto(s,12) [std-priv-exten_64] @@ -1737,24 +1801,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-66-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_64-66) -exten => s,12,Return() -exten => _sw-66-.,10,Voicemail(u${ext}) -exten => _sw-66-.,11,Goto(s,11) -exten => sw-66-,10,Goto(sw-66-.,10) -exten => sw-66-NOANSWER,10,Voicemail(u${ext}) -exten => sw-66-NOANSWER,11,Goto(s,11) -exten => sw-66-ANSWER,10,Goto(s,11) -exten => sw-66-BUSY,10,Voicemail(b${ext}) -exten => sw-66-BUSY,11,Goto(s,11) -exten => sw-66-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-66-DONTCALL,11,Goto(s,11) -exten => sw-66-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-66-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_66_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_64_66) +exten => s,13,Return() +exten => _sw_66_.,10,Voicemail(u${ext}) +exten => _sw_66_.,11,Goto(s,12) +exten => sw_66_,10,Goto(sw_66_.,10) +exten => sw_66_NOANSWER,10,Voicemail(u${ext}) +exten => sw_66_NOANSWER,11,Goto(s,12) +exten => sw_66_ANSWER,10,Goto(s,12) +exten => sw_66_BUSY,10,Voicemail(b${ext}) +exten => sw_66_BUSY,11,Goto(s,12) +exten => sw_66_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_66_DONTCALL,11,Goto(s,12) +exten => sw_66_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_66_TORTURE,11,Goto(s,12) [std-priv-exten_65] @@ -1764,24 +1829,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-67-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_65-67) -exten => s,12,Return() -exten => _sw-67-.,10,Voicemail(u${ext}) -exten => _sw-67-.,11,Goto(s,11) -exten => sw-67-,10,Goto(sw-67-.,10) -exten => sw-67-NOANSWER,10,Voicemail(u${ext}) -exten => sw-67-NOANSWER,11,Goto(s,11) -exten => sw-67-ANSWER,10,Goto(s,11) -exten => sw-67-BUSY,10,Voicemail(b${ext}) -exten => sw-67-BUSY,11,Goto(s,11) -exten => sw-67-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-67-DONTCALL,11,Goto(s,11) -exten => sw-67-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-67-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_67_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_65_67) +exten => s,13,Return() +exten => _sw_67_.,10,Voicemail(u${ext}) +exten => _sw_67_.,11,Goto(s,12) +exten => sw_67_,10,Goto(sw_67_.,10) +exten => sw_67_NOANSWER,10,Voicemail(u${ext}) +exten => sw_67_NOANSWER,11,Goto(s,12) +exten => sw_67_ANSWER,10,Goto(s,12) +exten => sw_67_BUSY,10,Voicemail(b${ext}) +exten => sw_67_BUSY,11,Goto(s,12) +exten => sw_67_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_67_DONTCALL,11,Goto(s,12) +exten => sw_67_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_67_TORTURE,11,Goto(s,12) [std-priv-exten_66] @@ -1791,24 +1857,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-68-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_66-68) -exten => s,12,Return() -exten => _sw-68-.,10,Voicemail(u${ext}) -exten => _sw-68-.,11,Goto(s,11) -exten => sw-68-,10,Goto(sw-68-.,10) -exten => sw-68-NOANSWER,10,Voicemail(u${ext}) -exten => sw-68-NOANSWER,11,Goto(s,11) -exten => sw-68-ANSWER,10,Goto(s,11) -exten => sw-68-BUSY,10,Voicemail(b${ext}) -exten => sw-68-BUSY,11,Goto(s,11) -exten => sw-68-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-68-DONTCALL,11,Goto(s,11) -exten => sw-68-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-68-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_68_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_66_68) +exten => s,13,Return() +exten => _sw_68_.,10,Voicemail(u${ext}) +exten => _sw_68_.,11,Goto(s,12) +exten => sw_68_,10,Goto(sw_68_.,10) +exten => sw_68_NOANSWER,10,Voicemail(u${ext}) +exten => sw_68_NOANSWER,11,Goto(s,12) +exten => sw_68_ANSWER,10,Goto(s,12) +exten => sw_68_BUSY,10,Voicemail(b${ext}) +exten => sw_68_BUSY,11,Goto(s,12) +exten => sw_68_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_68_DONTCALL,11,Goto(s,12) +exten => sw_68_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_68_TORTURE,11,Goto(s,12) [std-priv-exten_67] @@ -1818,24 +1885,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-69-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_67-69) -exten => s,12,Return() -exten => _sw-69-.,10,Voicemail(u${ext}) -exten => _sw-69-.,11,Goto(s,11) -exten => sw-69-,10,Goto(sw-69-.,10) -exten => sw-69-NOANSWER,10,Voicemail(u${ext}) -exten => sw-69-NOANSWER,11,Goto(s,11) -exten => sw-69-ANSWER,10,Goto(s,11) -exten => sw-69-BUSY,10,Voicemail(b${ext}) -exten => sw-69-BUSY,11,Goto(s,11) -exten => sw-69-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-69-DONTCALL,11,Goto(s,11) -exten => sw-69-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-69-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_69_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_67_69) +exten => s,13,Return() +exten => _sw_69_.,10,Voicemail(u${ext}) +exten => _sw_69_.,11,Goto(s,12) +exten => sw_69_,10,Goto(sw_69_.,10) +exten => sw_69_NOANSWER,10,Voicemail(u${ext}) +exten => sw_69_NOANSWER,11,Goto(s,12) +exten => sw_69_ANSWER,10,Goto(s,12) +exten => sw_69_BUSY,10,Voicemail(b${ext}) +exten => sw_69_BUSY,11,Goto(s,12) +exten => sw_69_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_69_DONTCALL,11,Goto(s,12) +exten => sw_69_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_69_TORTURE,11,Goto(s,12) [std-priv-exten_68] @@ -1845,24 +1913,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-70-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_68-70) -exten => s,12,Return() -exten => _sw-70-.,10,Voicemail(u${ext}) -exten => _sw-70-.,11,Goto(s,11) -exten => sw-70-,10,Goto(sw-70-.,10) -exten => sw-70-NOANSWER,10,Voicemail(u${ext}) -exten => sw-70-NOANSWER,11,Goto(s,11) -exten => sw-70-ANSWER,10,Goto(s,11) -exten => sw-70-BUSY,10,Voicemail(b${ext}) -exten => sw-70-BUSY,11,Goto(s,11) -exten => sw-70-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-70-DONTCALL,11,Goto(s,11) -exten => sw-70-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-70-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_70_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_68_70) +exten => s,13,Return() +exten => _sw_70_.,10,Voicemail(u${ext}) +exten => _sw_70_.,11,Goto(s,12) +exten => sw_70_,10,Goto(sw_70_.,10) +exten => sw_70_NOANSWER,10,Voicemail(u${ext}) +exten => sw_70_NOANSWER,11,Goto(s,12) +exten => sw_70_ANSWER,10,Goto(s,12) +exten => sw_70_BUSY,10,Voicemail(b${ext}) +exten => sw_70_BUSY,11,Goto(s,12) +exten => sw_70_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_70_DONTCALL,11,Goto(s,12) +exten => sw_70_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_70_TORTURE,11,Goto(s,12) [std-priv-exten_69] @@ -1872,24 +1941,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-71-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_69-71) -exten => s,12,Return() -exten => _sw-71-.,10,Voicemail(u${ext}) -exten => _sw-71-.,11,Goto(s,11) -exten => sw-71-,10,Goto(sw-71-.,10) -exten => sw-71-NOANSWER,10,Voicemail(u${ext}) -exten => sw-71-NOANSWER,11,Goto(s,11) -exten => sw-71-ANSWER,10,Goto(s,11) -exten => sw-71-BUSY,10,Voicemail(b${ext}) -exten => sw-71-BUSY,11,Goto(s,11) -exten => sw-71-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-71-DONTCALL,11,Goto(s,11) -exten => sw-71-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-71-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_71_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_69_71) +exten => s,13,Return() +exten => _sw_71_.,10,Voicemail(u${ext}) +exten => _sw_71_.,11,Goto(s,12) +exten => sw_71_,10,Goto(sw_71_.,10) +exten => sw_71_NOANSWER,10,Voicemail(u${ext}) +exten => sw_71_NOANSWER,11,Goto(s,12) +exten => sw_71_ANSWER,10,Goto(s,12) +exten => sw_71_BUSY,10,Voicemail(b${ext}) +exten => sw_71_BUSY,11,Goto(s,12) +exten => sw_71_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_71_DONTCALL,11,Goto(s,12) +exten => sw_71_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_71_TORTURE,11,Goto(s,12) [std-priv-exten_70] @@ -1899,24 +1969,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-72-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_70-72) -exten => s,12,Return() -exten => _sw-72-.,10,Voicemail(u${ext}) -exten => _sw-72-.,11,Goto(s,11) -exten => sw-72-,10,Goto(sw-72-.,10) -exten => sw-72-NOANSWER,10,Voicemail(u${ext}) -exten => sw-72-NOANSWER,11,Goto(s,11) -exten => sw-72-ANSWER,10,Goto(s,11) -exten => sw-72-BUSY,10,Voicemail(b${ext}) -exten => sw-72-BUSY,11,Goto(s,11) -exten => sw-72-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-72-DONTCALL,11,Goto(s,11) -exten => sw-72-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-72-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_72_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_70_72) +exten => s,13,Return() +exten => _sw_72_.,10,Voicemail(u${ext}) +exten => _sw_72_.,11,Goto(s,12) +exten => sw_72_,10,Goto(sw_72_.,10) +exten => sw_72_NOANSWER,10,Voicemail(u${ext}) +exten => sw_72_NOANSWER,11,Goto(s,12) +exten => sw_72_ANSWER,10,Goto(s,12) +exten => sw_72_BUSY,10,Voicemail(b${ext}) +exten => sw_72_BUSY,11,Goto(s,12) +exten => sw_72_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_72_DONTCALL,11,Goto(s,12) +exten => sw_72_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_72_TORTURE,11,Goto(s,12) [std-priv-exten_71] @@ -1926,24 +1997,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-73-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_71-73) -exten => s,12,Return() -exten => _sw-73-.,10,Voicemail(u${ext}) -exten => _sw-73-.,11,Goto(s,11) -exten => sw-73-,10,Goto(sw-73-.,10) -exten => sw-73-NOANSWER,10,Voicemail(u${ext}) -exten => sw-73-NOANSWER,11,Goto(s,11) -exten => sw-73-ANSWER,10,Goto(s,11) -exten => sw-73-BUSY,10,Voicemail(b${ext}) -exten => sw-73-BUSY,11,Goto(s,11) -exten => sw-73-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-73-DONTCALL,11,Goto(s,11) -exten => sw-73-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-73-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_73_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_71_73) +exten => s,13,Return() +exten => _sw_73_.,10,Voicemail(u${ext}) +exten => _sw_73_.,11,Goto(s,12) +exten => sw_73_,10,Goto(sw_73_.,10) +exten => sw_73_NOANSWER,10,Voicemail(u${ext}) +exten => sw_73_NOANSWER,11,Goto(s,12) +exten => sw_73_ANSWER,10,Goto(s,12) +exten => sw_73_BUSY,10,Voicemail(b${ext}) +exten => sw_73_BUSY,11,Goto(s,12) +exten => sw_73_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_73_DONTCALL,11,Goto(s,12) +exten => sw_73_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_73_TORTURE,11,Goto(s,12) [std-priv-exten_72] @@ -1953,24 +2025,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-74-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_72-74) -exten => s,12,Return() -exten => _sw-74-.,10,Voicemail(u${ext}) -exten => _sw-74-.,11,Goto(s,11) -exten => sw-74-,10,Goto(sw-74-.,10) -exten => sw-74-NOANSWER,10,Voicemail(u${ext}) -exten => sw-74-NOANSWER,11,Goto(s,11) -exten => sw-74-ANSWER,10,Goto(s,11) -exten => sw-74-BUSY,10,Voicemail(b${ext}) -exten => sw-74-BUSY,11,Goto(s,11) -exten => sw-74-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-74-DONTCALL,11,Goto(s,11) -exten => sw-74-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-74-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_74_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_72_74) +exten => s,13,Return() +exten => _sw_74_.,10,Voicemail(u${ext}) +exten => _sw_74_.,11,Goto(s,12) +exten => sw_74_,10,Goto(sw_74_.,10) +exten => sw_74_NOANSWER,10,Voicemail(u${ext}) +exten => sw_74_NOANSWER,11,Goto(s,12) +exten => sw_74_ANSWER,10,Goto(s,12) +exten => sw_74_BUSY,10,Voicemail(b${ext}) +exten => sw_74_BUSY,11,Goto(s,12) +exten => sw_74_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_74_DONTCALL,11,Goto(s,12) +exten => sw_74_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_74_TORTURE,11,Goto(s,12) [std-priv-exten_73] @@ -1980,24 +2053,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-75-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten_73-75) -exten => s,12,Return() -exten => _sw-75-.,10,Voicemail(u${ext}) -exten => _sw-75-.,11,Goto(s,11) -exten => sw-75-,10,Goto(sw-75-.,10) -exten => sw-75-NOANSWER,10,Voicemail(u${ext}) -exten => sw-75-NOANSWER,11,Goto(s,11) -exten => sw-75-ANSWER,10,Goto(s,11) -exten => sw-75-BUSY,10,Voicemail(b${ext}) -exten => sw-75-BUSY,11,Goto(s,11) -exten => sw-75-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-75-DONTCALL,11,Goto(s,11) -exten => sw-75-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-75-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_75_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_73_75) +exten => s,13,Return() +exten => _sw_75_.,10,Voicemail(u${ext}) +exten => _sw_75_.,11,Goto(s,12) +exten => sw_75_,10,Goto(sw_75_.,10) +exten => sw_75_NOANSWER,10,Voicemail(u${ext}) +exten => sw_75_NOANSWER,11,Goto(s,12) +exten => sw_75_ANSWER,10,Goto(s,12) +exten => sw_75_BUSY,10,Voicemail(b${ext}) +exten => sw_75_BUSY,11,Goto(s,12) +exten => sw_75_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_75_DONTCALL,11,Goto(s,12) +exten => sw_75_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_75_TORTURE,11,Goto(s,12) [std-priv-exten] @@ -2007,39 +2081,40 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3}) exten => s,4,Set(LOCAL(opts)=${ARG4}) exten => s,5,Set(LOCAL(torcont)=${ARG5}) exten => s,6,Set(LOCAL(dontcont)=${ARG6}) -exten => s,7,Set(~~EXTEN~~=${EXTEN}) -exten => s,8,Dial(${dev},${timeout},${opts}) -exten => s,9,NoOp(${DIALSTATUS} was chosen) -exten => s,10,Goto(sw-76-${DIALSTATUS},10) -exten => s,11,NoOp(Finish switch-std-priv-exten-76) -exten => s,12,Return() -exten => _sw-76-.,10,Voicemail(u${ext}) -exten => _sw-76-.,11,Goto(s,11) -exten => sw-76-,10,Goto(sw-76-.,10) -exten => sw-76-NOANSWER,10,Voicemail(u${ext}) -exten => sw-76-NOANSWER,11,Goto(s,11) -exten => sw-76-ANSWER,10,Goto(s,11) -exten => sw-76-BUSY,10,Voicemail(b${ext}) -exten => sw-76-BUSY,11,Goto(s,11) -exten => sw-76-DONTCALL,10,Goto(${dontcont},s,begin) -exten => sw-76-DONTCALL,11,Goto(s,11) -exten => sw-76-TORTURE,10,Goto(${torcont},s,begin) -exten => sw-76-TORTURE,11,Goto(s,11) +exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,9,Dial(${dev},${timeout},${opts}) +exten => s,10,NoOp(${DIALSTATUS} was chosen) +exten => s,11,Goto(sw_76_${DIALSTATUS},10) +exten => s,12,NoOp(Finish switch_std-priv-exten_76) +exten => s,13,Return() +exten => _sw_76_.,10,Voicemail(u${ext}) +exten => _sw_76_.,11,Goto(s,12) +exten => sw_76_,10,Goto(sw_76_.,10) +exten => sw_76_NOANSWER,10,Voicemail(u${ext}) +exten => sw_76_NOANSWER,11,Goto(s,12) +exten => sw_76_ANSWER,10,Goto(s,12) +exten => sw_76_BUSY,10,Voicemail(b${ext}) +exten => sw_76_BUSY,11,Goto(s,12) +exten => sw_76_DONTCALL,10,Goto(${dontcont},s,begin) +exten => sw_76_DONTCALL,11,Goto(s,12) +exten => sw_76_TORTURE,10,Goto(${torcont},s,begin) +exten => sw_76_TORTURE,11,Goto(s,12) [fillcidname] exten => s,1,GotoIf($["${CALLERID(num)}" = "" ]?2:3) exten => s,2,Return() -exten => s,3,NoOp(Finish if-fillcidname-77) +exten => s,3,NoOp(Finish if_fillcidname_77) exten => s,4,Set(cidn=${DB(cidname/${CALLERID(num)})}) exten => s,5,GotoIf($["${CALLERID(name)}" != "" ]?6:9) exten => s,6,GotoIf($[("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ]?7:8) exten => s,7,Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)}) -exten => s,8,NoOp(Finish if-if-fillcidname-78-79) -exten => s,9,NoOp(Finish if-fillcidname-78) +exten => s,8,NoOp(Finish if_if_fillcidname_78_79) +exten => s,9,NoOp(Finish if_fillcidname_78) exten => s,10,GotoIf($[( "${cidn}" != "" ) & ( "${CALLERID(name)}" = "" | "${CALLERID(name)}" = "CODY,WY " | "${CALLERID(name)}" = "POWELL,WY " | "${CALLERID(name)}" = "WIRELESS CALLER" | "${CALLERID(name)}" = "SUBSCRIBER,WIRE" | "${CALLERID(name)}" = "CELLULAR ONE" | "${CALLERID(name)}" = "Cellular One Customer" | "${CALLERID(name)}" = "CELLULAR ONE " | "${CALLERID(name)}" = "Privacy Manager" | "${CALLERID(name)}" = "RIVERTON,WY " | "${CALLERID(name)}" = "BASIN,WY " | "${CALLERID(name)}" = "BILLINGS,MT " | "${CALLERID(name)}" = "PROVO,UT " | "${CALLERID(name)}" = "TOLL FREE " ) ]?11:12) exten => s,11,Set(CALLERID(name)=${cidn}) -exten => s,12,NoOp(Finish if-fillcidname-80) +exten => s,12,NoOp(Finish if_fillcidname_80) exten => s,13,Return() @@ -2061,8 +2136,8 @@ exten => s,14,GotoIf($["${DIALSTATUS}" = "CHANUNAVAIL" ]?15:18) exten => s,15,BackGround(try_cell) exten => s,16,Set(CALLERID(num)=$[${cidnu}]) exten => s,17,Dial(Zap/2/${lookup},${waittime},${dialopts}) -exten => s,18,NoOp(Finish if-if-ciddial-81-82) -exten => s,19,NoOp(Finish if-ciddial-81) +exten => s,18,NoOp(Finish if_if_ciddial_81_82) +exten => s,19,NoOp(Finish if_ciddial_81) exten => s,20,Return() @@ -2079,7 +2154,7 @@ exten => s,9,Dial(${ddev}/${dialnum}|${waittime}|${dialopts}) exten => s,10,GotoIf($["${DIALSTATUS}" = "CHANUNAVAIL" ]?11:13) exten => s,11,BackGround(try_cell) exten => s,12,Dial(Zap/2/${lookup},${waittime},${dialopts}) -exten => s,13,NoOp(Finish if-ciddial3-83) +exten => s,13,NoOp(Finish if_ciddial3_83) exten => s,14,Return() @@ -2101,8 +2176,8 @@ exten => s,14,Dial(${ddev}/${dialnum},${waittime}|${dialopts}) exten => s,15,GotoIf($["${DIALSTATUS}" = "CHANUNAVAIL" ]?16:18) exten => s,16,BackGround(try_cell) exten => s,17,Dial(Zap/2/${lookup},${waittime},${dialopts}) -exten => s,18,NoOp(Finish if-if-ciddial2-84-85) -exten => s,19,NoOp(Finish if-ciddial2-84) +exten => s,18,NoOp(Finish if_if_ciddial2_84_85) +exten => s,19,NoOp(Finish if_ciddial2_84) exten => s,20,Return() @@ -2132,121 +2207,122 @@ exten => s,8,Background(tt-weasels) exten => s,9,Hangup() exten => s,10,Goto(12) exten => s,11,Goto(homeline,s,postPriv) -exten => s,12,NoOp(Finish if-privacyManagerFailed-86) +exten => s,12,NoOp(Finish if_privacyManagerFailed_86) [homeline] -exten => s,1,Set(~~EXTEN~~=${EXTEN}) -exten => s,2(begin),Answer() -exten => s,3,Set(repeatcount=0) -exten => s,4,Zapateller(nocallerid) -exten => s,5,PrivacyManager() -exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11) -exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm) -exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) -exten => s,9,Hangup() -exten => s,10,Return() -exten => s,11,NoOp(Finish if-homeline-87) -exten => s,12(postPriv),Gosub(fillcidname,s,1) -exten => s,13,Set(CONFCIDNA=${CALLERID(name)}) -exten => s,14,Set(CONFCIDNU=${CALLERID(num)}) -exten => s,15,AGI(callall) -exten => s,16,AGI(submit-announce.agi) -exten => s,17,GotoIf($["${CALLERID(num)}" : "1" ]?18:19) -exten => s,18,Gosub(callerid-bad,s,1) -exten => s,19,NoOp(Finish if-homeline-88) -exten => s,20,GotoIf($["${CALLERID(num)}" = "7077577685" & "${CALLERID(name)}" : "Privacy Manager" ]?21:22) -exten => s,21,Gosub(callerid-liar,s,1) -exten => s,22,NoOp(Finish if-homeline-89) -exten => s,23,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&) -exten => s,24,Set(lds=${DB(playlds/${CALLERID(num)})}) -exten => s,25,GotoIf($["${lds}" = "1" ]?26:27) -exten => s,26,SetMusicOnHold(mohlds) -exten => s,27,NoOp(Finish if-homeline-90) -exten => s,28,Set(direct=$[${DB(DirectCall/${CALLERID(num)})}]) -exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37) -exten => s,30,verbose(direct is XXX#${direct}XXXX) -exten => s,31,Playback(greetings/direct) -exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet) -exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm) -exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&) -exten => s,35,Goto(sw-92-${direct},10) -exten => s,36,NoOp(Finish switch-if-homeline-91-92) -exten => s,37,NoOp(Finish if-homeline-91) -exten => s,38(loopback),GotoIfTime(*,*,20-25,dec?40) -exten => s,39,Goto(42) -exten => s,40,Playback(greetings/christmas) -exten => s,41,Goto(103) -exten => s,42,GotoIfTime(*,*,31,dec?44) -exten => s,43,Goto(46) -exten => s,44,Playback(greetings/newyear) -exten => s,45,Goto(102) -exten => s,46,GotoIfTime(*,*,1,jan?48) -exten => s,47,Goto(50) -exten => s,48,Playback(greetings/newyear) -exten => s,49,Goto(101) -exten => s,50,GotoIfTime(*,*,14,feb?52) -exten => s,51,Goto(54) -exten => s,52,Playback(greetings/valentines) -exten => s,53,Goto(100) -exten => s,54,GotoIfTime(*,*,17,mar?56) -exten => s,55,Goto(58) -exten => s,56,Playback(greetings/stPat) -exten => s,57,Goto(99) -exten => s,58,GotoIfTime(*,*,31,oct?60) -exten => s,59,Goto(62) -exten => s,60,Playback(greetings/halloween) -exten => s,61,Goto(98) -exten => s,62,GotoIfTime(*,mon,15-21,jan?64) -exten => s,63,Goto(66) -exten => s,64,Playback(greetings/mlkDay) -exten => s,65,Goto(97) -exten => s,66,GotoIfTime(*,thu,22-28,nov?68) -exten => s,67,Goto(70) -exten => s,68,Playback(greetings/thanksgiving) -exten => s,69,Goto(96) -exten => s,70,GotoIfTime(*,mon,25-31,may?72) -exten => s,71,Goto(74) -exten => s,72,Playback(greetings/memorial) -exten => s,73,Goto(95) -exten => s,74,GotoIfTime(*,mon,1-7,sep?76) -exten => s,75,Goto(78) -exten => s,76,Playback(greetings/labor) -exten => s,77,Goto(94) -exten => s,78,GotoIfTime(*,mon,15-21,feb?80) -exten => s,79,Goto(82) -exten => s,80,Playback(greetings/president) -exten => s,81,Goto(93) -exten => s,82,GotoIfTime(*,sun,8-14,may?84) -exten => s,83,Goto(86) -exten => s,84,Playback(greetings/mothers) -exten => s,85,Goto(92) -exten => s,86,GotoIfTime(*,sun,15-21,jun?88) -exten => s,87,Goto(90) -exten => s,88,Playback(greetings/fathers) -exten => s,89,Goto(91) -exten => s,90,Playback(greetings/hello) -exten => s,91,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103-104-105) -exten => s,92,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103-104) -exten => s,93,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103) -exten => s,94,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102) -exten => s,95,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101) -exten => s,96,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100) -exten => s,97,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99) -exten => s,98,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98) -exten => s,99,NoOp(Finish iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97) -exten => s,100,NoOp(Finish iftime-iftime-iftime-iftime-homeline-93-94-95-96) -exten => s,101,NoOp(Finish iftime-iftime-iftime-homeline-93-94-95) -exten => s,102,NoOp(Finish iftime-iftime-homeline-93-94) -exten => s,103,NoOp(Finish iftime-homeline-93) -exten => s,104,Background(murphy-homeline-intro1) -exten => _sw-92-.,10,Set(z=${direct}-2) -exten => _sw-92-.,11,Goto(homeline-kids,${z},1) -exten => sw-92-,10,Goto(sw-92-.,10) -exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) -exten => sw-92-2,11,Goto(s,loopback) -exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket)) -exten => sw-92-1,11,Goto(s,loopback) +exten => s,1,Set(LOCAL(~~EXTEN~~)=${EXTEN}) +exten => s,2,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~}) +exten => s,3(begin),Answer() +exten => s,4,Set(repeatcount=0) +exten => s,5,Zapateller(nocallerid) +exten => s,6,PrivacyManager() +exten => s,7,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?8:12) +exten => s,8,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm) +exten => s,9,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) +exten => s,10,Hangup() +exten => s,11,Return() +exten => s,12,NoOp(Finish if_homeline_87) +exten => s,13(postPriv),Gosub(fillcidname,s,1) +exten => s,14,Set(CONFCIDNA=${CALLERID(name)}) +exten => s,15,Set(CONFCIDNU=${CALLERID(num)}) +exten => s,16,AGI(callall) +exten => s,17,AGI(submit-announce.agi) +exten => s,18,GotoIf($["${CALLERID(num)}" : "1" ]?19:20) +exten => s,19,Gosub(callerid-bad,s,1) +exten => s,20,NoOp(Finish if_homeline_88) +exten => s,21,GotoIf($["${CALLERID(num)}" = "7077577685" & "${CALLERID(name)}" : "Privacy Manager" ]?22:23) +exten => s,22,Gosub(callerid-liar,s,1) +exten => s,23,NoOp(Finish if_homeline_89) +exten => s,24,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&) +exten => s,25,Set(lds=${DB(playlds/${CALLERID(num)})}) +exten => s,26,GotoIf($["${lds}" = "1" ]?27:28) +exten => s,27,SetMusicOnHold(mohlds) +exten => s,28,NoOp(Finish if_homeline_90) +exten => s,29,Set(direct=$[${DB(DirectCall/${CALLERID(num)})}]) +exten => s,30,GotoIf($["${direct}" != "" & ${direct} != 0 ]?31:38) +exten => s,31,verbose(direct is XXX#${direct}XXXX) +exten => s,32,Playback(greetings/direct) +exten => s,33,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet) +exten => s,34,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm) +exten => s,35,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&) +exten => s,36,Goto(sw_92_${direct},10) +exten => s,37,NoOp(Finish switch_if_homeline_91_92) +exten => s,38,NoOp(Finish if_homeline_91) +exten => s,39(loopback),GotoIfTime(*,*,20-25,dec?41) +exten => s,40,Goto(43) +exten => s,41,Playback(greetings/christmas) +exten => s,42,Goto(104) +exten => s,43,GotoIfTime(*,*,31,dec?45) +exten => s,44,Goto(47) +exten => s,45,Playback(greetings/newyear) +exten => s,46,Goto(103) +exten => s,47,GotoIfTime(*,*,1,jan?49) +exten => s,48,Goto(51) +exten => s,49,Playback(greetings/newyear) +exten => s,50,Goto(102) +exten => s,51,GotoIfTime(*,*,14,feb?53) +exten => s,52,Goto(55) +exten => s,53,Playback(greetings/valentines) +exten => s,54,Goto(101) +exten => s,55,GotoIfTime(*,*,17,mar?57) +exten => s,56,Goto(59) +exten => s,57,Playback(greetings/stPat) +exten => s,58,Goto(100) +exten => s,59,GotoIfTime(*,*,31,oct?61) +exten => s,60,Goto(63) +exten => s,61,Playback(greetings/halloween) +exten => s,62,Goto(99) +exten => s,63,GotoIfTime(*,mon,15-21,jan?65) +exten => s,64,Goto(67) +exten => s,65,Playback(greetings/mlkDay) +exten => s,66,Goto(98) +exten => s,67,GotoIfTime(*,thu,22-28,nov?69) +exten => s,68,Goto(71) +exten => s,69,Playback(greetings/thanksgiving) +exten => s,70,Goto(97) +exten => s,71,GotoIfTime(*,mon,25-31,may?73) +exten => s,72,Goto(75) +exten => s,73,Playback(greetings/memorial) +exten => s,74,Goto(96) +exten => s,75,GotoIfTime(*,mon,1-7,sep?77) +exten => s,76,Goto(79) +exten => s,77,Playback(greetings/labor) +exten => s,78,Goto(95) +exten => s,79,GotoIfTime(*,mon,15-21,feb?81) +exten => s,80,Goto(83) +exten => s,81,Playback(greetings/president) +exten => s,82,Goto(94) +exten => s,83,GotoIfTime(*,sun,8-14,may?85) +exten => s,84,Goto(87) +exten => s,85,Playback(greetings/mothers) +exten => s,86,Goto(93) +exten => s,87,GotoIfTime(*,sun,15-21,jun?89) +exten => s,88,Goto(91) +exten => s,89,Playback(greetings/fathers) +exten => s,90,Goto(92) +exten => s,91,Playback(greetings/hello) +exten => s,92,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100_101_102_103_104_105) +exten => s,93,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100_101_102_103_104) +exten => s,94,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100_101_102_103) +exten => s,95,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100_101_102) +exten => s,96,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100_101) +exten => s,97,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100) +exten => s,98,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99) +exten => s,99,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98) +exten => s,100,NoOp(Finish iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97) +exten => s,101,NoOp(Finish iftime_iftime_iftime_iftime_homeline_93_94_95_96) +exten => s,102,NoOp(Finish iftime_iftime_iftime_homeline_93_94_95) +exten => s,103,NoOp(Finish iftime_iftime_homeline_93_94) +exten => s,104,NoOp(Finish iftime_homeline_93) +exten => s,105,Background(murphy-homeline-intro1) +exten => _sw_92_.,10,Set(z=${direct}-2) +exten => _sw_92_.,11,Goto(homeline-kids,${z},1) +exten => sw_92_,10,Goto(sw_92_.,10) +exten => sw_92_2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) +exten => sw_92_2,11,Goto(s,loopback) +exten => sw_92_1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket)) +exten => sw_92_1,11,Goto(s,loopback) exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm) exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&) exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) @@ -2269,7 +2345,7 @@ exten => 793,2,SayDigits(${zz}) exten => t,1,Set(repeatcount=${repeatcount} + 1) exten => t,2,GotoIf($[${repeatcount} < 3 ]?3:4) exten => t,3,Goto(s,loopback) -exten => t,4,NoOp(Finish if-homeline-106) +exten => t,4,NoOp(Finish if_homeline_106) exten => t,5,Hangup() exten => i,1,Background(invalid) exten => i,2,Goto(s,loopback) @@ -2388,7 +2464,7 @@ exten => 793,2,SayDigits(${zz}) exten => t,1,Set(repeatcount=$[${repeatcount} + 1]) exten => t,2,GotoIf($[${repeatcount} < 3 ]?3:4) exten => t,3,Goto(s,loopback) -exten => t,4,NoOp(Finish if-workline-107) +exten => t,4,NoOp(Finish if_workline_107) exten => t,5,Hangup() exten => i,1,Background(invalid) exten => i,2,Goto(s,loopback) @@ -2649,24 +2725,24 @@ exten => 775,1,GotoIf($[${EXTEN}=${EXTEN} ]?2:4) exten => 775,2,BackGround(digits/1) exten => 775,3,Goto(5) exten => 775,4,BackGround(digits/0) -exten => 775,5,NoOp(Finish if-workext-108) +exten => 775,5,NoOp(Finish if_workext_108) exten => 775,6,GotoIf($[${EXTEN}=${LANGUAGE} ]?7:9) exten => 775,7,BackGround(digits/1) exten => 775,8,Goto(10) exten => 775,9,BackGround(digits/0) -exten => 775,10,NoOp(Finish if-workext-109) +exten => 775,10,NoOp(Finish if_workext_109) exten => 775,11,BackGround(digits/2) exten => 776,1,Set(TEST=00359889811777) exten => 776,2,GotoIf($[${TEST}= 00359889811777 ]?3:5) exten => 776,3,BackGround(digits/1) exten => 776,4,Goto(6) exten => 776,5,BackGround(digits/0) -exten => 776,6,NoOp(Finish if-workext-110) +exten => 776,6,NoOp(Finish if_workext_110) exten => 776,7,GotoIf($[${TEST}= 00359889811888 ]?8:10) exten => 776,8,BackGround(digits/1) exten => 776,9,Goto(11) exten => 776,10,BackGround(digits/0) -exten => 776,11,NoOp(Finish if-workext-111) +exten => 776,11,NoOp(Finish if_workext_111) exten => 776,12,Hangup() exten => 790,1,MeetMe(790,p) exten => 792,1,Goto(pageall,s,begin) diff --git a/pbx/ael/ael-test/ref.ael-vtest17 b/pbx/ael/ael-test/ref.ael-vtest17 index 353b2cc5a..44b3bd47d 100644 --- a/pbx/ael/ael-test/ref.ael-vtest17 +++ b/pbx/ael/ael-test/ref.ael-vtest17 @@ -35,7 +35,7 @@ exten => 81,4,GotoIf($[${i}<${iterations}]?5:8) exten => 81,5,NoOp(Hello) exten => 81,6,Set(i=$[${i}+1]) exten => 81,7,Goto(4) -exten => 81,8,NoOp(Finish for-extension-1) +exten => 81,8,NoOp(Finish for_extension_1) exten => 81,9,Set(time2=${EPOCH}) exten => 81,10,Verbose(The time diff is $[${time2} - ${time1} ] seconds) exten => 81,11,Verbose(Which means that the priorities/sec = $[4* ${iterations} / (${time2} - ${time1}) ]) @@ -43,16 +43,16 @@ exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ]) exten => 82,1,Gosub(ndeep,s,1(100000)) exten => 82,2,Verbose(Finished 100000 levels deep call!) exten => 83,1,Set(~~EXTEN~~=${EXTEN}) -exten => 83,2,Goto(sw-2-${~~EXTEN~~},10) -exten => 83,3,NoOp(Finish switch-extension-2) -exten => _sw-2-.,10,Goto(83,3) -exten => sw-2-,10,Goto(sw-2-.,10) -exten => _sw-2-[4-7]X,10,Verbose(and this too!) -exten => _sw-2-[4-7]X,11,Goto(sw-2-.,10) -exten => _sw-2-9X,10,Verbose(handle both 8x and 9x calls) -exten => _sw-2-9X,11,Goto(sw-2-49,10) -exten => _sw-2-8X,10,Verbose(do something to prepare it) -exten => _sw-2-8X,11,Goto(sw-2-99,10) +exten => 83,2,Goto(sw_2_${~~EXTEN~~},10) +exten => 83,3,NoOp(Finish switch_extension_2) +exten => _sw_2_.,10,Goto(83,3) +exten => sw_2_,10,Goto(sw_2_.,10) +exten => _sw_2_[4-7]X,10,Verbose(and this too!) +exten => _sw_2_[4-7]X,11,Goto(sw_2_.,10) +exten => _sw_2_9X,10,Verbose(handle both 8x and 9x calls) +exten => _sw_2_9X,11,Goto(sw_2_49,10) +exten => _sw_2_8X,10,Verbose(do something to prepare it) +exten => _sw_2_8X,11,Goto(sw_2_99,10) [ndeep] @@ -60,7 +60,7 @@ exten => s,1,Set(LOCAL(level)=${ARG1}) exten => s,2,GotoIf($[${level} == 0]?3:5) exten => s,3,Verbose(2|Got to Level 0) exten => s,4,Return() -exten => s,5,NoOp(Finish if-ndeep-3) +exten => s,5,NoOp(Finish if_ndeep_3) exten => s,6,Gosub(ndeep,s,1($[${level}-1])) exten => s,7,Return() diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c index 4d44d44f3..803049ed6 100644 --- a/res/ael/ael.tab.c +++ b/res/ael/ael.tab.c @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,7 +28,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -47,7 +46,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.4.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,115 +54,28 @@ /* Pure parsers. */ #define YYPURE 1 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + /* Using locations. */ #define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ -#define yyparse ael_yyparse -#define yylex ael_yylex -#define yyerror ael_yyerror -#define yylval ael_yylval -#define yychar ael_yychar -#define yydebug ael_yydebug -#define yynerrs ael_yynerrs -#define yylloc ael_yylloc - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - KW_CONTEXT = 258, - LC = 259, - RC = 260, - LP = 261, - RP = 262, - SEMI = 263, - EQ = 264, - COMMA = 265, - COLON = 266, - AMPER = 267, - BAR = 268, - AT = 269, - KW_MACRO = 270, - KW_GLOBALS = 271, - KW_IGNOREPAT = 272, - KW_SWITCH = 273, - KW_IF = 274, - KW_IFTIME = 275, - KW_ELSE = 276, - KW_RANDOM = 277, - KW_ABSTRACT = 278, - KW_EXTEND = 279, - EXTENMARK = 280, - KW_GOTO = 281, - KW_JUMP = 282, - KW_RETURN = 283, - KW_BREAK = 284, - KW_CONTINUE = 285, - KW_REGEXTEN = 286, - KW_HINT = 287, - KW_FOR = 288, - KW_WHILE = 289, - KW_CASE = 290, - KW_PATTERN = 291, - KW_DEFAULT = 292, - KW_CATCH = 293, - KW_SWITCHES = 294, - KW_ESWITCHES = 295, - KW_INCLUDES = 296, - KW_LOCAL = 297, - word = 298 - }; -#endif -/* Tokens. */ -#define KW_CONTEXT 258 -#define LC 259 -#define RC 260 -#define LP 261 -#define RP 262 -#define SEMI 263 -#define EQ 264 -#define COMMA 265 -#define COLON 266 -#define AMPER 267 -#define BAR 268 -#define AT 269 -#define KW_MACRO 270 -#define KW_GLOBALS 271 -#define KW_IGNOREPAT 272 -#define KW_SWITCH 273 -#define KW_IF 274 -#define KW_IFTIME 275 -#define KW_ELSE 276 -#define KW_RANDOM 277 -#define KW_ABSTRACT 278 -#define KW_EXTEND 279 -#define EXTENMARK 280 -#define KW_GOTO 281 -#define KW_JUMP 282 -#define KW_RETURN 283 -#define KW_BREAK 284 -#define KW_CONTINUE 285 -#define KW_REGEXTEN 286 -#define KW_HINT 287 -#define KW_FOR 288 -#define KW_WHILE 289 -#define KW_CASE 290 -#define KW_PATTERN 291 -#define KW_DEFAULT 292 -#define KW_CATCH 293 -#define KW_SWITCHES 294 -#define KW_ESWITCHES 295 -#define KW_INCLUDES 296 -#define KW_LOCAL 297 -#define word 298 - - - +#define yyparse ael_yyparse +#define yylex ael_yylex +#define yyerror ael_yyerror +#define yylval ael_yylval +#define yychar ael_yychar +#define yydebug ael_yydebug +#define yynerrs ael_yynerrs +#define yylloc ael_yylloc /* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ #line 1 "ael.y" /* @@ -222,6 +134,9 @@ static char *ael_token_subst(const char *mess); +/* Line 189 of yacc.c */ +#line 139 "ael.tab.c" + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -240,20 +155,78 @@ static char *ael_token_subst(const char *mess); # define YYTOKEN_TABLE 0 #endif + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + KW_CONTEXT = 258, + LC = 259, + RC = 260, + LP = 261, + RP = 262, + SEMI = 263, + EQ = 264, + COMMA = 265, + COLON = 266, + AMPER = 267, + BAR = 268, + AT = 269, + KW_MACRO = 270, + KW_GLOBALS = 271, + KW_IGNOREPAT = 272, + KW_SWITCH = 273, + KW_IF = 274, + KW_IFTIME = 275, + KW_ELSE = 276, + KW_RANDOM = 277, + KW_ABSTRACT = 278, + KW_EXTEND = 279, + EXTENMARK = 280, + KW_GOTO = 281, + KW_JUMP = 282, + KW_RETURN = 283, + KW_BREAK = 284, + KW_CONTINUE = 285, + KW_REGEXTEN = 286, + KW_HINT = 287, + KW_FOR = 288, + KW_WHILE = 289, + KW_CASE = 290, + KW_PATTERN = 291, + KW_DEFAULT = 292, + KW_CATCH = 293, + KW_SWITCHES = 294, + KW_ESWITCHES = 295, + KW_INCLUDES = 296, + KW_LOCAL = 297, + word = 298 + }; +#endif + + + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 59 "ael.y" { + +/* Line 214 of yacc.c */ +#line 59 "ael.y" + int intval; /* integer value, typically flags */ char *str; /* strings */ struct pval *pval; /* full objects */ -} -/* Line 187 of yacc.c. */ -#line 253 "ael.tab.c" - YYSTYPE; + + + +/* Line 214 of yacc.c */ +#line 226 "ael.tab.c" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED @@ -271,6 +244,8 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ + +/* Line 264 of yacc.c */ #line 65 "ael.y" /* declaring these AFTER the union makes things a lot simpler! */ @@ -293,8 +268,8 @@ static pval *nword(char *string, YYLTYPE *pos); static pval *update_last(pval *, YYLTYPE *); -/* Line 216 of yacc.c. */ -#line 298 "ael.tab.c" +/* Line 264 of yacc.c */ +#line 273 "ael.tab.c" #ifdef short # undef short @@ -369,14 +344,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int i) +YYID (int yyi) #else static int -YYID (i) - int i; +YYID (yyi) + int yyi; #endif { - return i; + return yyi; } #endif @@ -458,9 +433,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - YYLTYPE yyls; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; + YYLTYPE yyls_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ @@ -495,12 +470,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -674,15 +649,15 @@ static const char *const yytname[] = "KW_DEFAULT", "KW_CATCH", "KW_SWITCHES", "KW_ESWITCHES", "KW_INCLUDES", "KW_LOCAL", "word", "$accept", "file", "objects", "object", "context_name", "context", "opt_abstract", "macro", "globals", - "global_statements", "assignment", "@1", "local_assignment", "@2", + "global_statements", "assignment", "$@1", "local_assignment", "$@2", "arglist", "elements", "element", "ignorepat", "extension", "statements", - "timerange", "timespec", "test_expr", "@3", "if_like_head", "word_list", + "timerange", "timespec", "test_expr", "$@3", "if_like_head", "word_list", "hint_word", "word3_list", "goto_word", "switch_statement", "statement", - "@4", "@5", "@6", "@7", "opt_else", "target", "opt_pri", "jumptarget", - "macro_call", "@8", "application_call_head", "@9", "application_call", - "opt_word", "eval_arglist", "case_statements", "case_statement", - "macro_statements", "macro_statement", "switches", "eswitches", - "switchlist", "included_entry", "includeslist", "includes", 0 + "$@4", "$@5", "$@6", "$@7", "opt_else", "target", "opt_pri", + "jumptarget", "macro_call", "$@8", "application_call_head", "$@9", + "application_call", "opt_word", "eval_arglist", "case_statements", + "case_statement", "macro_statements", "macro_statement", "switches", + "eswitches", "switchlist", "included_entry", "includeslist", "includes", 0 }; #endif @@ -1147,17 +1122,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, parseio) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) #else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } @@ -1193,11 +1171,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule, parseio) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); + YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) , &(yylsp[(yyi + 1) - (yynrhs)]) , parseio); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, "\n"); } } @@ -1477,339 +1455,513 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio) switch (yytype) { case 43: /* "word" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1483 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1465 "ael.tab.c" break; case 46: /* "objects" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1491 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1477 "ael.tab.c" break; case 47: /* "object" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1499 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1489 "ael.tab.c" break; case 48: /* "context_name" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1504 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1498 "ael.tab.c" break; case 49: /* "context" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1512 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1510 "ael.tab.c" break; case 51: /* "macro" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1520 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1522 "ael.tab.c" break; case 52: /* "globals" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1528 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1534 "ael.tab.c" break; case 53: /* "global_statements" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1536 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1546 "ael.tab.c" break; case 54: /* "assignment" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1544 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1558 "ael.tab.c" break; case 56: /* "local_assignment" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1552 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1570 "ael.tab.c" break; case 58: /* "arglist" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1560 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1582 "ael.tab.c" break; case 59: /* "elements" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1568 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1594 "ael.tab.c" break; case 60: /* "element" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1576 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1606 "ael.tab.c" break; case 61: /* "ignorepat" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1584 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1618 "ael.tab.c" break; case 62: /* "extension" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1592 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1630 "ael.tab.c" break; case 63: /* "statements" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1600 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1642 "ael.tab.c" break; case 64: /* "timerange" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1605 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1651 "ael.tab.c" break; case 65: /* "timespec" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1613 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1663 "ael.tab.c" break; case 66: /* "test_expr" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1618 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1672 "ael.tab.c" break; case 68: /* "if_like_head" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1626 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1684 "ael.tab.c" break; case 69: /* "word_list" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1631 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1693 "ael.tab.c" break; case 71: /* "word3_list" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1636 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1702 "ael.tab.c" break; case 72: /* "goto_word" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1641 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1711 "ael.tab.c" break; case 73: /* "switch_statement" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1649 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1723 "ael.tab.c" break; case 74: /* "statement" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1657 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1735 "ael.tab.c" break; case 79: /* "opt_else" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1665 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1747 "ael.tab.c" break; case 80: /* "target" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1673 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1759 "ael.tab.c" break; case 81: /* "opt_pri" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1678 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1768 "ael.tab.c" break; case 82: /* "jumptarget" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1686 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1780 "ael.tab.c" break; case 83: /* "macro_call" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1694 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1792 "ael.tab.c" break; case 85: /* "application_call_head" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1702 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1804 "ael.tab.c" break; case 87: /* "application_call" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1710 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1816 "ael.tab.c" break; case 88: /* "opt_word" */ + +/* Line 1000 of yacc.c */ #line 183 "ael.y" { free((yyvaluep->str));}; -#line 1715 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1825 "ael.tab.c" break; case 89: /* "eval_arglist" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1723 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1837 "ael.tab.c" break; case 90: /* "case_statements" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1731 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1849 "ael.tab.c" break; case 91: /* "case_statement" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1739 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1861 "ael.tab.c" break; case 92: /* "macro_statements" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1747 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1873 "ael.tab.c" break; case 93: /* "macro_statement" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1755 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1885 "ael.tab.c" break; case 94: /* "switches" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1763 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1897 "ael.tab.c" break; case 95: /* "eswitches" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1771 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1909 "ael.tab.c" break; case 96: /* "switchlist" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1779 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1921 "ael.tab.c" break; case 97: /* "included_entry" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1787 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1933 "ael.tab.c" break; case 98: /* "includeslist" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1795 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1945 "ael.tab.c" break; case 99: /* "includes" */ + +/* Line 1000 of yacc.c */ #line 170 "ael.y" { destroy_pval((yyvaluep->pval)); prev_word=0; }; -#line 1803 "ael.tab.c" + +/* Line 1000 of yacc.c */ +#line 1957 "ael.tab.c" break; default: break; } } - /* Prevent warnings from -Wmissing-prototypes. */ - #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1828,10 +1980,9 @@ int yyparse (); - -/*----------. -| yyparse. | -`----------*/ +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1855,88 +2006,97 @@ yyparse (parseio) #endif #endif { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; -/* Location data for the look-ahead symbol. */ +/* Location data for the lookahead symbol. */ YYLTYPE yylloc; - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + /* Number of syntax errors so far. */ + int yynerrs; - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + `yyls': related to locations. - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; + YYLTYPE *yyls; + YYLTYPE *yylsp; - YYSIZE_T yystacksize = YYINITDEPTH; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[2]; + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; YYLTYPE yyloc; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yyls = yylsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; yylsp = yyls; + #if YYLTYPE_IS_TRIVIAL /* Initialize the default location before parsing starts. */ yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 0; + yylloc.first_column = yylloc.last_column = 1; #endif goto yysetstate; @@ -1975,6 +2135,7 @@ YYLTYPE yylloc; &yyvs1, yysize * sizeof (*yyvsp), &yyls1, yysize * sizeof (*yylsp), &yystacksize); + yyls = yyls1; yyss = yyss1; yyvs = yyvs1; @@ -1996,9 +2157,9 @@ YYLTYPE yylloc; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - YYSTACK_RELOCATE (yyls); + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -2019,6 +2180,9 @@ YYLTYPE yylloc; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -2027,16 +2191,16 @@ YYLTYPE yylloc; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2068,20 +2232,16 @@ yybackup: goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -2122,56 +2282,78 @@ yyreduce: switch (yyn) { case 2: + +/* Line 1455 of yacc.c */ #line 191 "ael.y" { (yyval.pval) = parseio->pval = (yyvsp[(1) - (1)].pval); ;} break; case 3: + +/* Line 1455 of yacc.c */ #line 194 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 4: + +/* Line 1455 of yacc.c */ #line 195 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 5: + +/* Line 1455 of yacc.c */ #line 196 "ael.y" {(yyval.pval)=(yyvsp[(1) - (2)].pval);;} break; case 6: + +/* Line 1455 of yacc.c */ #line 199 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 7: + +/* Line 1455 of yacc.c */ #line 200 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 8: + +/* Line 1455 of yacc.c */ #line 201 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 9: + +/* Line 1455 of yacc.c */ #line 202 "ael.y" {(yyval.pval)=0;/* allow older docs to be read */;} break; case 10: + +/* Line 1455 of yacc.c */ #line 205 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str); ;} break; case 11: + +/* Line 1455 of yacc.c */ #line 206 "ael.y" { (yyval.str) = strdup("default"); ;} break; case 12: + +/* Line 1455 of yacc.c */ #line 209 "ael.y" { (yyval.pval) = npval2(PV_CONTEXT, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)])); @@ -2182,31 +2364,43 @@ yyreduce: break; case 13: + +/* Line 1455 of yacc.c */ #line 218 "ael.y" { (yyval.intval) = 1; ;} break; case 14: + +/* Line 1455 of yacc.c */ #line 219 "ael.y" { (yyval.intval) = 0; ;} break; case 15: + +/* Line 1455 of yacc.c */ #line 220 "ael.y" { (yyval.intval) = 2; ;} break; case 16: + +/* Line 1455 of yacc.c */ #line 221 "ael.y" { (yyval.intval)=3; ;} break; case 17: + +/* Line 1455 of yacc.c */ #line 222 "ael.y" { (yyval.intval)=3; ;} break; case 18: + +/* Line 1455 of yacc.c */ #line 225 "ael.y" { (yyval.pval) = npval2(PV_MACRO, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)])); @@ -2215,6 +2409,8 @@ yyreduce: break; case 19: + +/* Line 1455 of yacc.c */ #line 231 "ael.y" { (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); @@ -2223,26 +2419,36 @@ yyreduce: break; case 20: + +/* Line 1455 of yacc.c */ #line 237 "ael.y" { (yyval.pval) = NULL; ;} break; case 21: + +/* Line 1455 of yacc.c */ #line 238 "ael.y" {(yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 22: + +/* Line 1455 of yacc.c */ #line 239 "ael.y" {(yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 23: + +/* Line 1455 of yacc.c */ #line 242 "ael.y" { reset_semicount(parseio->scanner); ;} break; case 24: + +/* Line 1455 of yacc.c */ #line 242 "ael.y" { (yyval.pval) = npval2(PV_VARDEC, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); @@ -2251,11 +2457,15 @@ yyreduce: break; case 25: + +/* Line 1455 of yacc.c */ #line 248 "ael.y" { reset_semicount(parseio->scanner); ;} break; case 26: + +/* Line 1455 of yacc.c */ #line 248 "ael.y" { (yyval.pval) = npval2(PV_LOCALVARDEC, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)])); @@ -2264,86 +2474,120 @@ yyreduce: break; case 27: + +/* Line 1455 of yacc.c */ #line 255 "ael.y" { (yyval.pval) = NULL; ;} break; case 28: + +/* Line 1455 of yacc.c */ #line 256 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 29: + +/* Line 1455 of yacc.c */ #line 257 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;} break; case 30: + +/* Line 1455 of yacc.c */ #line 258 "ael.y" {(yyval.pval)=(yyvsp[(1) - (2)].pval);;} break; case 31: + +/* Line 1455 of yacc.c */ #line 261 "ael.y" {(yyval.pval)=0;;} break; case 32: + +/* Line 1455 of yacc.c */ #line 262 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 33: + +/* Line 1455 of yacc.c */ #line 263 "ael.y" { (yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 34: + +/* Line 1455 of yacc.c */ #line 266 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 35: + +/* Line 1455 of yacc.c */ #line 267 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 36: + +/* Line 1455 of yacc.c */ #line 268 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 37: + +/* Line 1455 of yacc.c */ #line 269 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 38: + +/* Line 1455 of yacc.c */ #line 270 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 39: + +/* Line 1455 of yacc.c */ #line 271 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 40: + +/* Line 1455 of yacc.c */ #line 272 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 41: + +/* Line 1455 of yacc.c */ #line 273 "ael.y" {free((yyvsp[(1) - (2)].str)); (yyval.pval)=0;;} break; case 42: + +/* Line 1455 of yacc.c */ #line 274 "ael.y" {(yyval.pval)=0;/* allow older docs to be read */;} break; case 43: + +/* Line 1455 of yacc.c */ #line 277 "ael.y" { (yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); @@ -2351,6 +2595,8 @@ yyreduce: break; case 44: + +/* Line 1455 of yacc.c */ #line 282 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); @@ -2359,6 +2605,8 @@ yyreduce: break; case 45: + +/* Line 1455 of yacc.c */ #line 286 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (5)]), &(yylsp[(3) - (5)])); @@ -2371,6 +2619,8 @@ yyreduce: break; case 46: + +/* Line 1455 of yacc.c */ #line 294 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); @@ -2380,6 +2630,8 @@ yyreduce: break; case 47: + +/* Line 1455 of yacc.c */ #line 299 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (7)]), &(yylsp[(7) - (7)])); @@ -2389,6 +2641,8 @@ yyreduce: break; case 48: + +/* Line 1455 of yacc.c */ #line 304 "ael.y" { (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)])); @@ -2399,21 +2653,29 @@ yyreduce: break; case 49: + +/* Line 1455 of yacc.c */ #line 313 "ael.y" { (yyval.pval) = NULL; ;} break; case 50: + +/* Line 1455 of yacc.c */ #line 314 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 51: + +/* Line 1455 of yacc.c */ #line 315 "ael.y" {(yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 52: + +/* Line 1455 of yacc.c */ #line 321 "ael.y" { if (asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str), (yyvsp[(5) - (5)].str)) < 0) { @@ -2428,11 +2690,15 @@ yyreduce: break; case 53: + +/* Line 1455 of yacc.c */ #line 331 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str); ;} break; case 54: + +/* Line 1455 of yacc.c */ #line 335 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (7)].str), &(yylsp[(1) - (7)])); @@ -2442,16 +2708,22 @@ yyreduce: break; case 55: + +/* Line 1455 of yacc.c */ #line 343 "ael.y" { reset_parencount(parseio->scanner); ;} break; case 56: + +/* Line 1455 of yacc.c */ #line 343 "ael.y" { (yyval.str) = (yyvsp[(3) - (4)].str); ;} break; case 57: + +/* Line 1455 of yacc.c */ #line 347 "ael.y" { (yyval.pval)= npval2(PV_IF, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); @@ -2459,6 +2731,8 @@ yyreduce: break; case 58: + +/* Line 1455 of yacc.c */ #line 350 "ael.y" { (yyval.pval) = npval2(PV_RANDOM, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); @@ -2466,6 +2740,8 @@ yyreduce: break; case 59: + +/* Line 1455 of yacc.c */ #line 353 "ael.y" { (yyval.pval) = npval2(PV_IFTIME, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); @@ -2474,11 +2750,15 @@ yyreduce: break; case 60: + +/* Line 1455 of yacc.c */ #line 364 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; case 61: + +/* Line 1455 of yacc.c */ #line 365 "ael.y" { if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) { @@ -2493,11 +2773,15 @@ yyreduce: break; case 62: + +/* Line 1455 of yacc.c */ #line 377 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str); ;} break; case 63: + +/* Line 1455 of yacc.c */ #line 378 "ael.y" { if (asprintf(&((yyval.str)), "%s %s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) { @@ -2511,6 +2795,8 @@ yyreduce: break; case 64: + +/* Line 1455 of yacc.c */ #line 387 "ael.y" { if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) { @@ -2524,6 +2810,8 @@ yyreduce: break; case 65: + +/* Line 1455 of yacc.c */ #line 396 "ael.y" { /* there are often '&' in hints */ if (asprintf(&((yyval.str)), "%s&%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) { @@ -2537,6 +2825,8 @@ yyreduce: break; case 66: + +/* Line 1455 of yacc.c */ #line 405 "ael.y" { if (asprintf(&((yyval.str)), "%s@%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) { @@ -2550,11 +2840,15 @@ yyreduce: break; case 67: + +/* Line 1455 of yacc.c */ #line 416 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; case 68: + +/* Line 1455 of yacc.c */ #line 417 "ael.y" { if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) { @@ -2569,6 +2863,8 @@ yyreduce: break; case 69: + +/* Line 1455 of yacc.c */ #line 427 "ael.y" { if (asprintf(&((yyval.str)), "%s%s%s", (yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) { @@ -2584,11 +2880,15 @@ yyreduce: break; case 70: + +/* Line 1455 of yacc.c */ #line 440 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str);;} break; case 71: + +/* Line 1455 of yacc.c */ #line 441 "ael.y" { if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) { @@ -2602,6 +2902,8 @@ yyreduce: break; case 72: + +/* Line 1455 of yacc.c */ #line 450 "ael.y" { if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) { @@ -2615,6 +2917,8 @@ yyreduce: break; case 73: + +/* Line 1455 of yacc.c */ #line 461 "ael.y" { (yyval.pval) = npval2(PV_SWITCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); @@ -2623,6 +2927,8 @@ yyreduce: break; case 74: + +/* Line 1455 of yacc.c */ #line 470 "ael.y" { (yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); @@ -2630,16 +2936,22 @@ yyreduce: break; case 75: + +/* Line 1455 of yacc.c */ #line 473 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; case 76: + +/* Line 1455 of yacc.c */ #line 474 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; case 77: + +/* Line 1455 of yacc.c */ #line 475 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); @@ -2647,6 +2959,8 @@ yyreduce: break; case 78: + +/* Line 1455 of yacc.c */ #line 478 "ael.y" { (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); @@ -2654,6 +2968,8 @@ yyreduce: break; case 79: + +/* Line 1455 of yacc.c */ #line 481 "ael.y" { (yyval.pval) = npval2(PV_LABEL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); @@ -2661,21 +2977,29 @@ yyreduce: break; case 80: + +/* Line 1455 of yacc.c */ #line 484 "ael.y" {reset_semicount(parseio->scanner);;} break; case 81: + +/* Line 1455 of yacc.c */ #line 485 "ael.y" {reset_semicount(parseio->scanner);;} break; case 82: + +/* Line 1455 of yacc.c */ #line 486 "ael.y" {reset_parencount(parseio->scanner);;} break; case 83: + +/* Line 1455 of yacc.c */ #line 486 "ael.y" { /* XXX word_list maybe ? */ (yyval.pval) = npval2(PV_FOR, &(yylsp[(1) - (12)]), &(yylsp[(12) - (12)])); @@ -2686,6 +3010,8 @@ yyreduce: break; case 84: + +/* Line 1455 of yacc.c */ #line 492 "ael.y" { (yyval.pval) = npval2(PV_WHILE, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); @@ -2694,21 +3020,29 @@ yyreduce: break; case 85: + +/* Line 1455 of yacc.c */ #line 496 "ael.y" { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;} break; case 86: + +/* Line 1455 of yacc.c */ #line 497 "ael.y" { (yyval.pval) = update_last((yyvsp[(2) - (3)].pval), &(yylsp[(2) - (3)])); ;} break; case 87: + +/* Line 1455 of yacc.c */ #line 498 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;} break; case 88: + +/* Line 1455 of yacc.c */ #line 499 "ael.y" { (yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); @@ -2716,11 +3050,15 @@ yyreduce: break; case 89: + +/* Line 1455 of yacc.c */ #line 502 "ael.y" {reset_semicount(parseio->scanner);;} break; case 90: + +/* Line 1455 of yacc.c */ #line 502 "ael.y" { char *bufx; @@ -2758,21 +3096,29 @@ yyreduce: break; case 91: + +/* Line 1455 of yacc.c */ #line 535 "ael.y" { (yyval.pval) = npval2(PV_BREAK, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; case 92: + +/* Line 1455 of yacc.c */ #line 536 "ael.y" { (yyval.pval) = npval2(PV_RETURN, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; case 93: + +/* Line 1455 of yacc.c */ #line 537 "ael.y" { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;} break; case 94: + +/* Line 1455 of yacc.c */ #line 538 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(2) - (3)])); @@ -2781,26 +3127,36 @@ yyreduce: break; case 95: + +/* Line 1455 of yacc.c */ #line 542 "ael.y" { (yyval.pval)=0; ;} break; case 96: + +/* Line 1455 of yacc.c */ #line 545 "ael.y" { (yyval.pval) = (yyvsp[(2) - (2)].pval); ;} break; case 97: + +/* Line 1455 of yacc.c */ #line 546 "ael.y" { (yyval.pval) = NULL ; ;} break; case 98: + +/* Line 1455 of yacc.c */ #line 549 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 99: + +/* Line 1455 of yacc.c */ #line 550 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); @@ -2808,6 +3164,8 @@ yyreduce: break; case 100: + +/* Line 1455 of yacc.c */ #line 553 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); @@ -2815,6 +3173,8 @@ yyreduce: break; case 101: + +/* Line 1455 of yacc.c */ #line 556 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)])); @@ -2823,6 +3183,8 @@ yyreduce: break; case 102: + +/* Line 1455 of yacc.c */ #line 560 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)])); @@ -2831,6 +3193,8 @@ yyreduce: break; case 103: + +/* Line 1455 of yacc.c */ #line 564 "ael.y" { (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)])); @@ -2839,6 +3203,8 @@ yyreduce: break; case 104: + +/* Line 1455 of yacc.c */ #line 568 "ael.y" { (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)])); @@ -2847,16 +3213,22 @@ yyreduce: break; case 105: + +/* Line 1455 of yacc.c */ #line 574 "ael.y" { (yyval.str) = strdup("1"); ;} break; case 106: + +/* Line 1455 of yacc.c */ #line 575 "ael.y" { (yyval.str) = (yyvsp[(2) - (2)].str); ;} break; case 107: + +/* Line 1455 of yacc.c */ #line 579 "ael.y" { /* ext[, pri] default 1 */ (yyval.pval) = nword((yyvsp[(1) - (2)].str), &(yylsp[(1) - (2)])); @@ -2864,6 +3236,8 @@ yyreduce: break; case 108: + +/* Line 1455 of yacc.c */ #line 582 "ael.y" { /* context, ext, pri */ (yyval.pval) = nword((yyvsp[(4) - (4)].str), &(yylsp[(4) - (4)])); @@ -2872,11 +3246,15 @@ yyreduce: break; case 109: + +/* Line 1455 of yacc.c */ #line 588 "ael.y" {reset_argcount(parseio->scanner);;} break; case 110: + +/* Line 1455 of yacc.c */ #line 588 "ael.y" { /* XXX original code had @2 but i think we need @5 */ @@ -2886,6 +3264,8 @@ yyreduce: break; case 111: + +/* Line 1455 of yacc.c */ #line 593 "ael.y" { (yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); @@ -2893,11 +3273,15 @@ yyreduce: break; case 112: + +/* Line 1455 of yacc.c */ #line 601 "ael.y" {reset_argcount(parseio->scanner);;} break; case 113: + +/* Line 1455 of yacc.c */ #line 601 "ael.y" { if (strcasecmp((yyvsp[(1) - (3)].str),"goto") == 0) { @@ -2911,6 +3295,8 @@ yyreduce: break; case 114: + +/* Line 1455 of yacc.c */ #line 612 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(3) - (3)])); @@ -2922,26 +3308,36 @@ yyreduce: break; case 115: + +/* Line 1455 of yacc.c */ #line 619 "ael.y" { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;} break; case 116: + +/* Line 1455 of yacc.c */ #line 622 "ael.y" { (yyval.str) = (yyvsp[(1) - (1)].str) ;} break; case 117: + +/* Line 1455 of yacc.c */ #line 623 "ael.y" { (yyval.str) = strdup(""); ;} break; case 118: + +/* Line 1455 of yacc.c */ #line 626 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 119: + +/* Line 1455 of yacc.c */ #line 627 "ael.y" { (yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/); @@ -2949,21 +3345,29 @@ yyreduce: break; case 120: + +/* Line 1455 of yacc.c */ #line 630 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;} break; case 121: + +/* Line 1455 of yacc.c */ #line 633 "ael.y" { (yyval.pval) = NULL; ;} break; case 122: + +/* Line 1455 of yacc.c */ #line 634 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 123: + +/* Line 1455 of yacc.c */ #line 637 "ael.y" { (yyval.pval) = npval2(PV_CASE, &(yylsp[(1) - (4)]), &(yylsp[(3) - (4)])); /* XXX 3 or 4 ? */ @@ -2972,6 +3376,8 @@ yyreduce: break; case 124: + +/* Line 1455 of yacc.c */ #line 641 "ael.y" { (yyval.pval) = npval2(PV_DEFAULT, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)])); @@ -2980,6 +3386,8 @@ yyreduce: break; case 125: + +/* Line 1455 of yacc.c */ #line 645 "ael.y" { (yyval.pval) = npval2(PV_PATTERN, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); /* XXX@3 or @4 ? */ @@ -2988,26 +3396,36 @@ yyreduce: break; case 126: + +/* Line 1455 of yacc.c */ #line 651 "ael.y" { (yyval.pval) = NULL; ;} break; case 127: + +/* Line 1455 of yacc.c */ #line 652 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;} break; case 128: + +/* Line 1455 of yacc.c */ #line 655 "ael.y" {(yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 129: + +/* Line 1455 of yacc.c */ #line 656 "ael.y" { (yyval.pval)=(yyvsp[(1) - (1)].pval);;} break; case 130: + +/* Line 1455 of yacc.c */ #line 657 "ael.y" { (yyval.pval) = npval2(PV_CATCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)])); @@ -3016,6 +3434,8 @@ yyreduce: break; case 131: + +/* Line 1455 of yacc.c */ #line 663 "ael.y" { (yyval.pval) = npval2(PV_SWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)])); @@ -3023,6 +3443,8 @@ yyreduce: break; case 132: + +/* Line 1455 of yacc.c */ #line 668 "ael.y" { (yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)])); @@ -3030,16 +3452,22 @@ yyreduce: break; case 133: + +/* Line 1455 of yacc.c */ #line 673 "ael.y" { (yyval.pval) = NULL; ;} break; case 134: + +/* Line 1455 of yacc.c */ #line 674 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval),nword((yyvsp[(2) - (3)].str), &(yylsp[(2) - (3)]))); ;} break; case 135: + +/* Line 1455 of yacc.c */ #line 675 "ael.y" { char *x; @@ -3055,16 +3483,22 @@ yyreduce: break; case 136: + +/* Line 1455 of yacc.c */ #line 686 "ael.y" {(yyval.pval)=(yyvsp[(2) - (2)].pval);;} break; case 137: + +/* Line 1455 of yacc.c */ #line 689 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;} break; case 138: + +/* Line 1455 of yacc.c */ #line 690 "ael.y" { (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)])); @@ -3073,21 +3507,29 @@ yyreduce: break; case 139: + +/* Line 1455 of yacc.c */ #line 697 "ael.y" { (yyval.pval) = (yyvsp[(1) - (2)].pval); ;} break; case 140: + +/* Line 1455 of yacc.c */ #line 698 "ael.y" { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), (yyvsp[(2) - (3)].pval)); ;} break; case 141: + +/* Line 1455 of yacc.c */ #line 699 "ael.y" {(yyval.pval)=(yyvsp[(1) - (2)].pval);;} break; case 142: + +/* Line 1455 of yacc.c */ #line 702 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); @@ -3095,14 +3537,17 @@ yyreduce: break; case 143: + +/* Line 1455 of yacc.c */ #line 705 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));;} break; -/* Line 1267 of yacc.c. */ -#line 3106 "ael.tab.c" + +/* Line 1455 of yacc.c */ +#line 3551 "ael.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3178,7 +3623,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -3195,7 +3640,7 @@ yyerrlab: } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -3253,14 +3698,11 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - *++yyvsp = yylval; yyerror_range[1] = yylloc; /* Using YYLLOC is tempting, but would change the location of - the look-ahead. YYLOC is available though. */ + the lookahead. YYLOC is available though. */ YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); *++yylsp = yyloc; @@ -3285,7 +3727,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined(yyoverflow) || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -3296,7 +3738,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) + if (yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc, parseio); /* Do not reclaim the symbols of the rule which action triggered @@ -3322,6 +3764,8 @@ yyreturn: } + +/* Line 1675 of yacc.c */ #line 710 "ael.y" diff --git a/res/ael/ael.tab.h b/res/ael/ael.tab.h index 672d957bc..0f517c66f 100644 --- a/res/ael/ael.tab.h +++ b/res/ael/ael.tab.h @@ -1,24 +1,23 @@ -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,10 +28,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -82,66 +82,28 @@ word = 298 }; #endif -/* Tokens. */ -#define KW_CONTEXT 258 -#define LC 259 -#define RC 260 -#define LP 261 -#define RP 262 -#define SEMI 263 -#define EQ 264 -#define COMMA 265 -#define COLON 266 -#define AMPER 267 -#define BAR 268 -#define AT 269 -#define KW_MACRO 270 -#define KW_GLOBALS 271 -#define KW_IGNOREPAT 272 -#define KW_SWITCH 273 -#define KW_IF 274 -#define KW_IFTIME 275 -#define KW_ELSE 276 -#define KW_RANDOM 277 -#define KW_ABSTRACT 278 -#define KW_EXTEND 279 -#define EXTENMARK 280 -#define KW_GOTO 281 -#define KW_JUMP 282 -#define KW_RETURN 283 -#define KW_BREAK 284 -#define KW_CONTINUE 285 -#define KW_REGEXTEN 286 -#define KW_HINT 287 -#define KW_FOR 288 -#define KW_WHILE 289 -#define KW_CASE 290 -#define KW_PATTERN 291 -#define KW_DEFAULT 292 -#define KW_CATCH 293 -#define KW_SWITCHES 294 -#define KW_ESWITCHES 295 -#define KW_INCLUDES 296 -#define KW_LOCAL 297 -#define word 298 - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 59 "ael.y" { + +/* Line 1676 of yacc.c */ +#line 59 "ael.y" + int intval; /* integer value, typically flags */ char *str; /* strings */ struct pval *pval; /* full objects */ -} -/* Line 1489 of yacc.c. */ -#line 141 "ael.tab.h" - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +#line 103 "ael.tab.h" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif @@ -160,3 +122,4 @@ typedef struct YYLTYPE #endif + diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c index 02d8f82e4..bd61064c4 100644 --- a/res/ael/ael_lex.c +++ b/res/ael/ael_lex.c @@ -1,3 +1,5 @@ +#include "asterisk.h" + #line 2 "ael_lex.c" #line 4 "ael_lex.c" @@ -16,7 +18,6 @@ /* First, we deal with platform-specific or compiler-specific issues. */ -#include "asterisk.h" /* begin standard C headers. */ #include <stdio.h> #include <string.h> @@ -160,7 +161,15 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -952,7 +961,7 @@ static void pbcwhere(const char *text, int *line, int *col ) #define STORE_POS #define STORE_LOC #endif -#line 955 "ael_lex.c" +#line 963 "ael_lex.c" #define INITIAL 0 #define paren 1 @@ -1096,7 +1105,12 @@ static int input (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1203,7 +1217,7 @@ YY_DECL #line 217 "ael.flex" -#line 1206 "ael_lex.c" +#line 1219 "ael_lex.c" yylval = yylval_param; @@ -2037,7 +2051,7 @@ YY_RULE_SETUP #line 656 "ael.flex" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2040 "ael_lex.c" +#line 2053 "ael_lex.c" case YY_END_OF_BUFFER: { @@ -2808,8 +2822,8 @@ YY_BUFFER_STATE ael_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) /** Setup the input buffer state to scan the given bytes. The next call to ael_yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ @@ -3221,7 +3235,8 @@ static void pbcpush(char x) void ael_yyfree(void *ptr, yyscan_t yyscanner) { - free( (char*) ptr ); + if (ptr) + free( (char*) ptr ); } static int pbcpop(char x) @@ -3360,7 +3375,8 @@ struct pval *ael2_parse(char *filename, int *errors) *errors = 1; return 0; } - free(my_file); + if (my_file) + free(my_file); my_file = strdup(filename); stat(filename, &stats); buffer = (char*)malloc(stats.st_size+2); diff --git a/res/ael/pval.c b/res/ael/pval.c index 48afe6e11..7a4311bff 100644 --- a/res/ael/pval.c +++ b/res/ael/pval.c @@ -3513,7 +3513,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, control_statement_count++; loop_break_save = exten->loop_break; /* save them, then restore before leaving */ loop_continue_save = exten->loop_continue; - snprintf(new_label, BUF_SIZE, "for-%s-%d", label, control_statement_count); + snprintf(new_label, BUF_SIZE, "for_%s_%d", label, control_statement_count); for_init = new_prio(); for_inc = new_prio(); for_test = new_prio(); @@ -3633,7 +3633,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, for_test->app = 0; for_test->appargs = strdup(buf1); for_loop->goto_true = for_test; - snprintf(buf1, BUF_SIZE, "Finish for-%s-%d", label, control_statement_count); + snprintf(buf1, BUF_SIZE, "Finish for_%s_%d", label, control_statement_count); for_end->app = strdup("NoOp"); for_end->appargs = strdup(buf1); /* link & load! */ @@ -3662,7 +3662,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, control_statement_count++; loop_break_save = exten->loop_break; /* save them, then restore before leaving */ loop_continue_save = exten->loop_continue; - snprintf(new_label, BUF_SIZE, "while-%s-%d", label, control_statement_count); + snprintf(new_label, BUF_SIZE, "while_%s_%d", label, control_statement_count); while_test = new_prio(); while_loop = new_prio(); while_end = new_prio(); @@ -3674,7 +3674,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, while_test->app = 0; while_test->appargs = strdup(buf1); while_loop->goto_true = while_test; - snprintf(buf1, BUF_SIZE, "Finish while-%s-%d", label, control_statement_count); + snprintf(buf1, BUF_SIZE, "Finish while_%s_%d", label, control_statement_count); while_end->app = strdup("NoOp"); while_end->appargs = strdup(buf1); @@ -3702,15 +3702,15 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, local_control_statement_count = control_statement_count; loop_break_save = exten->loop_break; /* save them, then restore before leaving */ loop_continue_save = exten->loop_continue; - snprintf(new_label, BUF_SIZE, "sw-%s-%d", label, control_statement_count); + snprintf(new_label, BUF_SIZE, "sw_%s_%d", label, control_statement_count); switch_test = new_prio(); switch_end = new_prio(); switch_test->type = AEL_APPCALL; switch_end->type = AEL_APPCALL; - snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", control_statement_count, p->u1.str); + snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", control_statement_count, p->u1.str); switch_test->app = strdup("Goto"); switch_test->appargs = strdup(buf1); - snprintf(buf1, BUF_SIZE, "Finish switch-%s-%d", label, control_statement_count); + snprintf(buf1, BUF_SIZE, "Finish switch_%s_%d", label, control_statement_count); switch_end->app = strdup("NoOp"); switch_end->appargs = strdup(buf1); switch_end->origin = p; @@ -3743,9 +3743,9 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, switch_case->loop_continue = exten->loop_continue; linkexten(exten,switch_case); - snprintf(buf1, BUF_SIZE, "sw-%d-%s", local_control_statement_count, p2->u1.str); + snprintf(buf1, BUF_SIZE, "sw_%d_%s", local_control_statement_count, p2->u1.str); switch_case->name = strdup(buf1); - snprintf(new_label, BUF_SIZE, "sw-%s-%s-%d", label, p2->u1.str, local_control_statement_count); + snprintf(new_label, BUF_SIZE, "sw_%s_%s_%d", label, p2->u1.str, local_control_statement_count); if (gen_prios(switch_case, new_label, p2->u2.statements, exten, this_context)) { /* this will link in all the case body statements here */ return -1; @@ -3763,7 +3763,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, fall_thru = new_prio(); fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); - snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, p2->next->u1.str); + snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, p2->next->u1.str); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (p2->next && p2->next->type == PV_PATTERN) { @@ -3771,14 +3771,14 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); gen_match_to_pattern(p2->next->u1.str, buf2); - snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, buf2); + snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, buf2); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (p2->next && p2->next->type == PV_DEFAULT) { fall_thru = new_prio(); fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); - snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count); + snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (!p2->next) { @@ -3815,12 +3815,12 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, /* the break/continue locations are inherited from parent */ switch_case->loop_break = exten->loop_break; switch_case->loop_continue = exten->loop_continue; - + linkexten(exten,switch_case); - snprintf(buf1, BUF_SIZE, "_sw-%d-%s", local_control_statement_count, p2->u1.str); + snprintf(buf1, BUF_SIZE, "_sw_%d_%s", local_control_statement_count, p2->u1.str); switch_case->name = strdup(buf1); - snprintf(new_label, BUF_SIZE, "sw-%s-%s-%d", label, p2->u1.str, local_control_statement_count); - + snprintf(new_label, BUF_SIZE, "sw_%s_%s_%d", label, p2->u1.str, local_control_statement_count); + if (gen_prios(switch_case, new_label, p2->u2.statements, exten, this_context)) { /* this will link in all the while body statements here */ return -1; } @@ -3836,7 +3836,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, fall_thru = new_prio(); fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); - snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, p2->next->u1.str); + snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, p2->next->u1.str); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (p2->next && p2->next->type == PV_PATTERN) { @@ -3844,14 +3844,14 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); gen_match_to_pattern(p2->next->u1.str, buf2); - snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, buf2); + snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, buf2); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (p2->next && p2->next->type == PV_DEFAULT) { fall_thru = new_prio(); fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); - snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count); + snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (!p2->next) { @@ -3903,11 +3903,11 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, switch_null->context = this_context; switch_null->is_switch = 1; switch_empty = new_prio(); - snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count); + snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count); switch_empty->app = strdup("Goto"); switch_empty->appargs = strdup(buf1); linkprio(switch_null, switch_empty, mother_exten); - snprintf(buf1, BUF_SIZE, "sw-%d-", local_control_statement_count); + snprintf(buf1, BUF_SIZE, "sw_%d_", local_control_statement_count); switch_null->name = strdup(buf1); switch_null->loop_break = exten->loop_break; switch_null->loop_continue = exten->loop_continue; @@ -3917,10 +3917,10 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, switch_case->loop_break = exten->loop_break; switch_case->loop_continue = exten->loop_continue; linkexten(exten,switch_case); - snprintf(buf1, BUF_SIZE, "_sw-%d-.", local_control_statement_count); + snprintf(buf1, BUF_SIZE, "_sw_%d_.", local_control_statement_count); switch_case->name = strdup(buf1); - snprintf(new_label, BUF_SIZE, "sw-%s-default-%d", label, local_control_statement_count); + snprintf(new_label, BUF_SIZE, "sw_%s_default_%d", label, local_control_statement_count); if (gen_prios(switch_case, new_label, p2->u2.statements, exten, this_context)) { /* this will link in all the default: body statements here */ return -1; @@ -3938,7 +3938,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, fall_thru = new_prio(); fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); - snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, p2->next->u1.str); + snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, p2->next->u1.str); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (p2->next && p2->next->type == PV_PATTERN) { @@ -3946,14 +3946,14 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); gen_match_to_pattern(p2->next->u1.str, buf2); - snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, buf2); + snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, buf2); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (p2->next && p2->next->type == PV_DEFAULT) { fall_thru = new_prio(); fall_thru->type = AEL_APPCALL; fall_thru->app = strdup("Goto"); - snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count); + snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count); fall_thru->appargs = strdup(buf1); linkprio(switch_case, fall_thru, mother_exten); } else if (!p2->next) { @@ -4052,7 +4052,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, case PV_IFTIME: control_statement_count++; - snprintf(new_label, BUF_SIZE, "iftime-%s-%d", label, control_statement_count); + snprintf(new_label, BUF_SIZE, "iftime_%s_%d", label, control_statement_count); if_test = new_prio(); if_test->type = AEL_IFTIME_CONTROL; @@ -4067,7 +4067,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, if_end = new_prio(); if_end->type = AEL_APPCALL; - snprintf(buf1, BUF_SIZE, "Finish iftime-%s-%d", label, control_statement_count); + snprintf(buf1, BUF_SIZE, "Finish iftime_%s_%d", label, control_statement_count); if_end->app = strdup("NoOp"); if_end->appargs = strdup(buf1); @@ -4115,7 +4115,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, case PV_RANDOM: case PV_IF: control_statement_count++; - snprintf(new_label, BUF_SIZE, "if-%s-%d", label, control_statement_count); + snprintf(new_label, BUF_SIZE, "if_%s_%d", label, control_statement_count); if_test = new_prio(); if_end = new_prio(); @@ -4127,7 +4127,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, snprintf(buf1, BUF_SIZE, "$[%s]", p->u1.str); if_test->app = 0; if_test->appargs = strdup(buf1); - snprintf(buf1, BUF_SIZE, "Finish if-%s-%d", label, control_statement_count); + snprintf(buf1, BUF_SIZE, "Finish if_%s_%d", label, control_statement_count); if_end->app = strdup("NoOp"); if_end->appargs = strdup(buf1); if_test->origin = p; @@ -4185,7 +4185,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, switch_case->context = this_context; linkexten(exten,switch_case); switch_case->name = strdup(p->u1.str); - snprintf(new_label, BUF_SIZE, "catch-%s-%d",p->u1.str, control_statement_count); + snprintf(new_label, BUF_SIZE, "catch_%s_%d",p->u1.str, control_statement_count); if (gen_prios(switch_case, new_label, p->u2.statements, mother_exten,this_context)) { /* this will link in all the catch body statements here */ return -1; diff --git a/res/res_agi.c b/res/res_agi.c index 3ecf89be4..2fbb837b4 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1846,7 +1846,7 @@ static int handle_getvariablefull(struct ast_channel *chan, AGI *agi, int argc, if ((argc != 4) && (argc != 5)) return RESULT_SHOWUSAGE; - if (argc == 5) { + if (argc == 5 && strcasecmp(chan->name, argv[4])) { chan2 = ast_get_channel_by_name_locked(argv[4]); } else { chan2 = chan; diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index ea2ad749a..6c91ccc98 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -293,8 +293,6 @@ static struct ast_variable *realtime_ldap_entry_to_var(struct ldap_table_config if (is_realmed_password_attribute) { if (!strncasecmp(valptr, "{md5}", 5)) { valptr += 5; - } else { - valptr = NULL; } ast_debug(2, "md5: %s\n", valptr); } @@ -414,8 +412,6 @@ static struct ast_variable **realtime_ldap_result_to_vars(struct ldap_table_conf if (is_realmed_password_attribute) { if (strncasecmp(valptr, "{md5}", 5) == 0) { valptr += 5; - } else { - valptr = NULL; } ast_debug(2, "md5: %s\n", valptr); } diff --git a/res/res_jabber.c b/res/res_jabber.c index 7912f88ba..e4bdacc78 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -2317,16 +2317,19 @@ static int aji_get_roster(struct aji_client *client) static int aji_client_connect(void *data, ikspak *pak) { struct aji_client *client = ASTOBJ_REF((struct aji_client *) data); - int res = 0; + int res = IKS_FILTER_PASS; if (client) { if (client->state == AJI_DISCONNECTED) { iks_filter_add_rule(client->f, aji_filter_roster, client, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_SUBTYPE, IKS_TYPE_RESULT, IKS_RULE_ID, "roster", IKS_RULE_DONE); client->state = AJI_CONNECTING; client->jid = (iks_find_cdata(pak->query, "jid")) ? iks_id_new(client->stack, iks_find_cdata(pak->query, "jid")) : client->jid; - iks_filter_remove_hook(client->f, aji_client_connect); - if(!client->component) /*client*/ + if (!client->component) { /*client*/ aji_get_roster(client); + } + iks_filter_remove_hook(client->f, aji_client_connect); + /* Once we remove the hook for this routine, we must return EAT or we will crash or corrupt memory */ + res = IKS_FILTER_EAT; } } else ast_log(LOG_ERROR, "Out of memory.\n"); @@ -2897,7 +2900,7 @@ static int aji_create_buddy(char *label, struct aji_client *client) static int aji_load_config(int reload) { char *cat = NULL; - int debug = 1; + int debug = 0; struct ast_config *cfg = NULL; struct ast_variable *var = NULL; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; @@ -3058,12 +3061,12 @@ static int unload_module(void) ast_custom_function_unregister(&jabberstatus_function); ASTOBJ_CONTAINER_TRAVERSE(&clients, 1, { - ASTOBJ_RDLOCK(iterator); + ASTOBJ_WRLOCK(iterator); ast_debug(3, "JABBER: Releasing and disconnecting client: %s\n", iterator->name); iterator->state = AJI_DISCONNECTING; - ast_aji_disconnect(iterator); - pthread_join(iterator->thread, NULL); ASTOBJ_UNLOCK(iterator); + pthread_join(iterator->thread, NULL); + ast_aji_disconnect(iterator); }); ASTOBJ_CONTAINER_DESTROYALL(&clients, aji_client_destroy); diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index fcae10f0e..7499abde7 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -989,7 +989,7 @@ static int moh_scan_files(struct mohclass *class) { int i; if (class->dir[0] != '/') { - ast_copy_string(dir_path, ast_config_AST_VAR_DIR, sizeof(dir_path)); + ast_copy_string(dir_path, ast_config_AST_DATA_DIR, sizeof(dir_path)); strncat(dir_path, "/", sizeof(dir_path) - 1); strncat(dir_path, class->dir, sizeof(dir_path) - 1); } else { diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c index a62453e4d..f79c86376 100644 --- a/res/res_timing_timerfd.c +++ b/res/res_timing_timerfd.c @@ -140,6 +140,7 @@ static int timerfd_timer_set_rate(int handle, unsigned int rate) ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return -1; } + ao2_lock(our_timer); our_timer->saved_timer.it_value.tv_sec = 0; our_timer->saved_timer.it_value.tv_nsec = rate ? (long) (1000000000 / rate) : 0L; @@ -150,6 +151,7 @@ static int timerfd_timer_set_rate(int handle, unsigned int rate) res = timerfd_settime(handle, 0, &our_timer->saved_timer, NULL); } + ao2_unlock(our_timer); ao2_ref(our_timer, -1); return res; @@ -191,17 +193,20 @@ static int timerfd_timer_enable_continuous(int handle) ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return -1; } + ao2_lock(our_timer); if (our_timer->is_continuous) { /*It's already in continous mode, no need to do * anything further */ + ao2_unlock(our_timer); ao2_ref(our_timer, -1); return 0; } res = timerfd_settime(handle, 0, &continuous_timer, &our_timer->saved_timer); our_timer->is_continuous = 1; + ao2_unlock(our_timer); ao2_ref(our_timer, -1); return res; } @@ -217,11 +222,13 @@ static int timerfd_timer_disable_continuous(int handle) ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return -1; } + ao2_lock(our_timer); if(!our_timer->is_continuous) { /* No reason to do anything if we're not * in continuous mode */ + ao2_unlock(our_timer); ao2_ref(our_timer, -1); return 0; } @@ -229,6 +236,7 @@ static int timerfd_timer_disable_continuous(int handle) res = timerfd_settime(handle, 0, &our_timer->saved_timer, NULL); our_timer->is_continuous = 0; memset(&our_timer->saved_timer, 0, sizeof(our_timer->saved_timer)); + ao2_unlock(our_timer); ao2_ref(our_timer, -1); return res; } @@ -244,6 +252,7 @@ static enum ast_timer_event timerfd_timer_get_event(int handle) ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle); return -1; } + ao2_lock(our_timer); if (our_timer->is_continuous) { res = AST_TIMING_EVENT_CONTINUOUS; @@ -251,6 +260,7 @@ static enum ast_timer_event timerfd_timer_get_event(int handle) res = AST_TIMING_EVENT_EXPIRED; } + ao2_unlock(our_timer); ao2_ref(our_timer, -1); return res; } diff --git a/sounds/Makefile b/sounds/Makefile index dbe014f35..151679a18 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -19,11 +19,12 @@ CMD_PREFIX?=@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh -CORE_SOUNDS_VERSION:=1.4.19 +CORE_SOUNDS_VERSION:=1.4.20 EXTRA_SOUNDS_VERSION:=1.4.11 MOH_VERSION:=2.03 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS)) +MCS:=$(subst -EN_AU-,-en_AU-,$(MCS)) MCS:=$(subst -FR-,-fr-,$(MCS)) MCS:=$(subst -ES-,-es-,$(MCS)) MCS:=$(subst -WAV,-wav,$(MCS)) @@ -143,7 +144,7 @@ have_download: echo "*** ***"; \ echo "*** Please install one of these, or remove any ***"; \ echo "*** extra sound package selections in ***"; \ - echo "*** menuselecct before installing Asterisk. ***"; \ + echo "*** menuselect before installing Asterisk. ***"; \ echo "*** ***"; \ echo "**************************************************"; \ exit 1; \ @@ -151,6 +152,8 @@ have_download: $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_VERSION))) +$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_AU,$(CORE_SOUNDS_VERSION))) + $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,es,$(CORE_SOUNDS_VERSION))) $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION))) @@ -172,10 +175,10 @@ $(eval $(call sound_download_rule,moh)) dist-clean: rm -f *.tar.gz -$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR): +$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR): mkdir -p $@ -install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS) +install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS) uninstall: rm -rf $(SOUNDS_DIR) diff --git a/sounds/sounds.xml b/sounds/sounds.xml index 192edab39..c4b5a419a 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -54,6 +54,24 @@ </member> <member name="CORE-SOUNDS-FR-SIREN14" displayname="French, G.722.1C (Siren14) format"> </member> + <member name="CORE-SOUNDS-EN_AU-WAV" displayname="English (Australian Accent), WAV format"> + </member> + <member name="CORE-SOUNDS-EN_AU-ULAW" displayname="English (Australian Accent), mu-Law format"> + </member> + <member name="CORE-SOUNDS-EN_AU-ALAW" displayname="English (Australian Accent), a-Law format"> + </member> + <member name="CORE-SOUNDS-EN_AU-GSM" displayname="English (Australian Accent), GSM format"> + </member> + <member name="CORE-SOUNDS-EN_AU-G729" displayname="English (Australian Accent), G.729 format"> + </member> + <member name="CORE-SOUNDS-EN_AU-G722" displayname="English (Australian Accent), G.722 format"> + </member> + <member name="CORE-SOUNDS-EN_AU-SLN16" displayname="English (Australian Accent), Signed-linear 16kHz format"> + </member> + <member name="CORE-SOUNDS-EN_AU-SIREN7" displayname="English (Australian Accent), G.722.1 (Siren7) format"> + </member> + <member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format"> + </member> </category> <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes"> <member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" > diff --git a/tests/test_expr.c b/tests/test_expr.c new file mode 100644 index 000000000..b4adc4aac --- /dev/null +++ b/tests/test_expr.c @@ -0,0 +1,191 @@ +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 2010, Digium, Inc. + * + * Tilghman Lesher <tlesher AT digium DOT com> + * + * See http://www.asterisk.org for more information about + * the Asterisk project. Please do not directly contact + * any of the maintainers of this project for assistance; + * the project provides a web site, mailing lists and IRC + * channels for your use. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + */ + +/*! + * \file + * \brief Expression Tests + * + * \author\verbatim Tilghman Lesher <tlesher AT digium DOT com> \endverbatim + * + * Verify that the expression parser works as intended. + * \ingroup tests + */ + +/*** MODULEINFO + <depend>TEST_FRAMEWORK</depend> + ***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include "asterisk/utils.h" +#include "asterisk/module.h" +#include "asterisk/test.h" +#include "asterisk/ast_expr.h" + +AST_TEST_DEFINE(expr_test) +{ + int res = AST_TEST_PASS, i, len; + struct { + char *input; + const char *output; + } tests[] = { + { "2 + 2", "4" }, + { " 2 + 2 ", "4" }, + { "", "" }, + { "2 - 4", "-2" }, + { "4 - 2", "2" }, + { "-4 - -2", "-2" }, + { "4 + 2 * 8", "20" }, + { "(4 + 2) * 8", "48" }, + { "4 + (2 * 8)", "20" }, + { "4 + (2 * 8) ? 3 :: 6", "3" }, + { "4 + 8 / 2", "8" }, + { "FLOOR(4 + 8 / 3)", "6" }, /* Floating point op on 1.6 and higher, need FLOOR() to keep result sane */ + { "(4+8) / 3", "4" }, + { "4 + 8 % 3", "6" }, + { "4 + 9 % 3", "4" }, + { "(4+9) %3", "1" }, + { "(4+8) %3", "0" }, + { "(4+9) %3", "1" }, + { "(4+8) %3", "0" }, + { "(4+9) % 3", "1" }, + { "(4+8) % 3", "0" }, + { "(4+9) % 3", "1" }, + { "(4+8) % 3", "0" }, + { "(4+9)% 3", "1" }, + { "(4+8)% 3", "0" }, + { "(4+9)% 3", "1" }, + { "(4+8)% 3", "0" }, + { "4 & 4", "4" }, + { "0 & 4", "0" }, + { "0 & 0", "0" }, + { "2 | 0", "2" }, + { "2 | 4", "2" }, + { "0 | 0", "0" }, + { "!0 | 0", "1" }, + { "!4 | 0", "0" }, + { "4 | !0", "4" }, + { "!4 | !0", "1" }, + { "0", "0" }, + { "!0", "1" }, + { "00", "00" }, + { "!00", "1" }, + { "1", "1" }, + { "!1", "0" }, + { "01", "01" }, + { "!01", "0" }, + { "3 < 4", "1" }, + { "4 < 3", "0" }, + { "3 > 4", "0" }, + { "4 > 3", "1" }, + { "3 = 3", "1" }, + { "3 = 4", "0" }, + { "3 != 3", "0" }, + { "3 != 4", "1" }, + { "3 >= 4", "0" }, + { "3 >= 3", "1" }, + { "4 >= 3", "1" }, + { "3 <= 4", "1" }, + { "4 <= 3", "0" }, + { "4 <= 4", "1" }, + { "3 > 4 & 4 < 3", "0" }, + { "4 > 3 & 3 < 4", "1" }, + { "x = x", "1" }, + { "y = x", "0" }, + { "x != y", "1" }, + { "x != x", "0" }, + { "\"Something interesting\" =~ interesting", "11" }, + { "\"Something interesting\" =~ Something", "9" }, + { "\"Something interesting\" : Something", "9" }, + { "\"Something interesting\" : interesting", "0" }, + { "\"Something interesting\" =~ \"interesting\"", "11" }, + { "\"Something interesting\" =~ \"Something\"", "9" }, + { "\"Something interesting\" : \"Something\"", "9" }, + { "\"Something interesting\" : \"interesting\"", "0" }, + { "\"Something interesting\" =~ (interesting)", "11" }, + { "\"Something interesting\" =~ (Something)", "9" }, + { "\"Something interesting\" : (Something)", "9" }, + { "\"Something interesting\" : (interesting)", "0" }, + { "\"Something interesting\" =~ \"\\(interesting\\)\"", "0" }, + { "\"Something interesting\" =~ \"\\(Something\\)\"", "0" }, + { "\"Something interesting\" : \"\\(Something\\)\"", "0" }, + { "\"Something interesting\" : \"\\(interesting\\)\"", "0" }, + { "\"011043567857575\" : \"011\\(..\\)\"", "0" }, + { "\"9011043567857575\" : \"011\\(..\\)\"", "0" }, + { "\"011043567857575\" =~ \"011\\(..\\)\"", "0" }, + { "\"9011043567857575\" =~ \"011\\(..\\)\"", "0" }, + { "\"Something interesting\" =~ (interesting)", "11" }, + { "\"Something interesting\" =~ (Something)", "9" }, + { "\"Something interesting\" : (Something)", "9" }, + { "\"Something interesting\" : (interesting)", "0" }, + { "\"Something interesting\" =~ \"(interesting)\"", "interesting" }, + { "\"Something interesting\" =~ \"(Something)\"", "Something" }, + { "\"Something interesting\" : \"(Something)\"", "Something" }, + { "\"Something interesting\" : \"(interesting)\"", "" }, + { "\"011043567857575\" : \"011(..)\"", "04" }, + { "\"9011043567857575\" : \"011(..)\"", "" }, + { "\"011043567857575\" =~ \"011(..)\"", "04" }, + { "\"9011043567857575\" =~ \"011(..)\"", "04" }, + { "3", "3" }, + { "something", "something" }, + { "043", "043" }, + { "${GLOBAL(ULKOPREFIX)}9${x}", "${GLOBAL(ULKOPREFIX)}9${x}" }, + { "512059${x}", "512059${x}" }, + }; + char buf[32]; + + switch (cmd) { + case TEST_INIT: + info->name = "expr_test"; + info->category = "/main/ast_expr/"; + info->summary = "unit test for the internal expression engine"; + info->description = + "Verifies behavior for the internal expression engine\n"; + return AST_TEST_NOT_RUN; + case TEST_EXECUTE: + break; + } + + for (i = 0; i < ARRAY_LEN(tests); i++) { + memset(buf, 0, sizeof(buf)); + len = ast_expr(tests[i].input, buf, sizeof(buf), NULL); + buf[len] = '\0'; + if (strcmp(buf, tests[i].output)) { + ast_test_status_update(test, "Case %d: expression '%s' evaluated as '%s', but should have evaluated as '%s'\n", i + 1, tests[i].input, buf, tests[i].output); + res = AST_TEST_FAIL; + } + } + + return res; +} + +static int unload_module(void) +{ + AST_TEST_UNREGISTER(expr_test); + return 0; +} + +static int load_module(void) +{ + AST_TEST_REGISTER(expr_test); + return AST_MODULE_LOAD_SUCCESS; +} + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Expression evaluation tests"); |