[asterisk-commits] rmudgett: trunk r339721 - in /trunk: ./ autoconf/ include/asterisk/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Oct 6 18:06:47 CDT 2011
Author: rmudgett
Date: Thu Oct 6 18:06:43 2011
New Revision: 339721
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339721
Log:
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
........
................
Modified:
trunk/ (props changed)
trunk/autoconf/ast_ext_lib.m4
trunk/configure
trunk/configure.ac
trunk/include/asterisk/autoconfig.h.in
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.
Modified: trunk/autoconf/ast_ext_lib.m4
URL: http://svnview.digium.com/svn/asterisk/trunk/autoconf/ast_ext_lib.m4?view=diff&rev=339721&r1=339720&r2=339721
==============================================================================
--- trunk/autoconf/ast_ext_lib.m4 (original)
+++ trunk/autoconf/ast_ext_lib.m4 Thu Oct 6 18:06:43 2011
@@ -58,7 +58,8 @@
AC_SUBST($2)
])
-# AST_EXT_LIB_SETUP_DEPENDENT([package symbol name], [package friendly name], [master package symbol name], [master package option name])
+# Setup required dependent package
+# AST_EXT_LIB_SETUP_DEPENDENT([dependent package symbol name], [dependent package friendly name], [master package symbol name], [master package name])
AC_DEFUN([AST_EXT_LIB_SETUP_DEPENDENT],
[
@@ -75,6 +76,23 @@
])
PBX_$1=0
AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.])
+AC_SUBST([$1_LIB])
+AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
+AC_SUBST([PBX_$1])
+])
+
+# Setup optional dependent package
+# AST_EXT_LIB_SETUP_OPTIONAL([optional package symbol name], [optional package friendly name], [master package symbol name], [master package name])
+
+AC_DEFUN([AST_EXT_LIB_SETUP_OPTIONAL],
+[
+$1_DESCRIP="$2"
+m4_ifval([$4], [$1_OPTION=$4])
+m4_ifval([$3], [$1_DIR=${$3_DIR}
+])
+PBX_$1=0
+AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if $3 has the $2 feature.])
AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE])
AC_SUBST([$1_DIR])
Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=339721&r1=339720&r2=339721
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Oct 6 18:06:43 2011
@@ -414,6 +414,29 @@
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])
Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=339721&r1=339720&r2=339721
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Thu Oct 6 18:06:43 2011
@@ -560,6 +560,70 @@
/* Define to 1 if you have the ISDN PRI library. */
#undef HAVE_PRI
+/* Define to 1 if PRI has the ISDN PRI advice of charge supplementary service
+ events feature. */
+#undef HAVE_PRI_AOC_EVENTS
+
+/* Define to 1 if PRI has the ISDN PRI call hold feature. */
+#undef HAVE_PRI_CALL_HOLD
+
+/* Define to 1 if PRI has the ISDN PRI call rerouting and call deflection
+ feature. */
+#undef HAVE_PRI_CALL_REROUTING
+
+/* Define to 1 if PRI has the ISDN PRI call waiting supplementary service
+ feature. */
+#undef HAVE_PRI_CALL_WAITING
+
+/* Define to 1 if PRI has the ISDN PRI call completion supplementary service
+ feature. */
+#undef HAVE_PRI_CCSS
+
+/* Define to 1 if PRI has the ISDN PRI Date/time ie send policy feature. */
+#undef HAVE_PRI_DATETIME_SEND
+
+/* Define to 1 if PRI has the ISDN PRI user display text IE contents during
+ call feature. */
+#undef HAVE_PRI_DISPLAY_TEXT
+
+/* Define to 1 if PRI has the ISDN PRI hangup fix feature. */
+#undef HAVE_PRI_HANGUP_FIX
+
+/* Define to 1 if PRI has the ISDN PRI set_inbanddisconnect feature. */
+#undef HAVE_PRI_INBANDDISCONNECT
+
+/* Define to 1 if PRI has the ISDN Layer 2 persistence option feature. */
+#undef HAVE_PRI_L2_PERSISTENCE
+
+/* Define to 1 if PRI has the ISDN PRI Malicious Call ID feature. */
+#undef HAVE_PRI_MCID
+
+/* Define to 1 if PRI has the ISDN PRI Message Waiting Indication feature. */
+#undef HAVE_PRI_MWI
+
+/* Define to 1 if PRI has the ISDN PRI Message Waiting Indication (Fixed)
+ feature. */
+#undef HAVE_PRI_MWI_V2
+
+/* Define to 1 if PRI has the ISDN progress with cause feature. */
+#undef HAVE_PRI_PROG_W_CAUSE
+
+/* Define to 1 if PRI has the ISDN reverse charge feature. */
+#undef HAVE_PRI_REVERSE_CHARGE
+
+/* Define to 1 if PRI has the ISDN service messages feature. */
+#undef HAVE_PRI_SERVICE_MESSAGES
+
+/* Define to 1 if PRI has the ISDN PRI keypad facility in SETUP feature. */
+#undef HAVE_PRI_SETUP_KEYPAD
+
+/* Define to 1 if PRI has the ISDN PRI subaddressing feature. */
+#undef HAVE_PRI_SUBADDR
+
+/* Define to 1 if PRI has the ISDN PRI call transfer supplementary service
+ feature. */
+#undef HAVE_PRI_TRANSFER
+
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
@@ -772,16 +836,16 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_CR_UID
-/* Define to 1 if `uid' is a member of `struct ucred'. */
+/* Define to 1 if `uid' is member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_UID
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1058,9 +1122,6 @@
/* 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
More information about the asterisk-commits
mailing list