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

1 files changed, 68 insertions, 7 deletions

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index b0b1d6e7b..d950c0a11 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -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. */
@@ -1059,9 +1123,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