diff options
author | Richard Mudgett <rmudgett@digium.com> | 2011-10-06 23:06:43 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2011-10-06 23:06:43 +0000 |
commit | 6e5f97df77d5af8a3ab5bc5ea346d11860f4da0e (patch) | |
tree | 7a61a69e45d50708606772584b06223f8881166d /configure.ac | |
parent | d59bb319fc4769fa64771562f3a34bbbfc9d75bc (diff) |
Merged revisions 339720 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r339720 | rmudgett | 2011-10-06 17:58:40 -0500 (Thu, 06 Oct 2011) | 27 lines
Merged revisions 339719 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r339719 | rmudgett | 2011-10-06 17:47:50 -0500 (Thu, 06 Oct 2011) | 20 lines
Fix regression in configure script for libpri capability checks.
JIRA AST-598 added the PRI_L2_PERSISTENCE option to fix BRI PTMP TE layer
2 persistence issues with some telcos. ASTERISK-18535 attempted to fix
the unexpected requirement that libpri *must* have that feature to work
with Asterisk. The AST_EXT_LIB_SETUP_DEPENDENT lines made the PRI
optional features required. Unfortunately, I thought
AST_EXT_LIB_SETUP_DEPENDENT didn't do anything useful for libpri and
deleted those lines for libpri. The result was the HAVE_PRI_xxx defines
that control the ability to use optional libpri features were also
deleted.
* Created AST_EXT_LIB_SETUP_OPTIONAL configuration macro to allow optional
features in a library that the source code could take advantage of if the
code supports the feature.
(closes issue ASTERISK-18687)
Reported by: Norbert
Tested by: rmudgett
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 48160b8f9..f84b92db0 100644 --- a/configure.ac +++ b/configure.ac @@ -414,6 +414,29 @@ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres]) AST_EXT_LIB_SETUP([POPT], [popt], [popt]) AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio]) AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_L2_PERSISTENCE], [ISDN Layer 2 persistence option], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_DATETIME_SEND], [ISDN PRI Date/time ie send policy], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_MWI_V2], [ISDN PRI Message Waiting Indication (Fixed)], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_DISPLAY_TEXT], [ISDN PRI user display text IE contents during call], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_MWI], [ISDN PRI Message Waiting Indication], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_MCID], [ISDN PRI Malicious Call ID], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_CALL_WAITING], [ISDN PRI call waiting supplementary service], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_AOC_EVENTS], [ISDN PRI advice of charge supplementary service events], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_TRANSFER], [ISDN PRI call transfer supplementary service], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_CCSS], [ISDN PRI call completion supplementary service], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_HANGUP_FIX], [ISDN PRI hangup fix], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_SUBADDR], [ISDN PRI subaddressing], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_CALL_HOLD], [ISDN PRI call hold], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_CALL_REROUTING], [ISDN PRI call rerouting and call deflection], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_SETUP_KEYPAD], [ISDN PRI keypad facility in SETUP], [PRI], [pri]) +# ------------------------------------v +# TODO: The code can be changed to always include these features now. +# These features will always be present if pri_connected_line_update is available. +AST_EXT_LIB_SETUP_OPTIONAL([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_PROG_W_CAUSE], [ISDN progress with cause], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri]) +AST_EXT_LIB_SETUP_OPTIONAL([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri]) +# ------------------------------------^ AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample]) |