Merged revisions 335912 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335912 | rmudgett | 2011-09-14 13:31:15 -0500 (Wed, 14 Sep 2011) | 20 lines
  
  Merged revisions 335911 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335911 | rmudgett | 2011-09-14 13:21:35 -0500 (Wed, 14 Sep 2011) | 13 lines
    
    Remove unnecessary libpri dependency checks in the configure script.
    
    Using the --with-pri option with the configure script generated an error
    about not having PRI_L2_PERSISTENCE if you did not have the absolute
    latest libpri SVN checkout installed.
    
    The AST_EXT_LIB_SETUP_DEPENDENT macro in the configure.ac script seems to
    be for libraries that are dependent upon other libraries and not
    necessarily for optional/added features within a library.
    
    (closes issue ASTERISK-18535)
    Reported by: Michael Keuter
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335913 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 4 insertions, 71 deletions

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 827bdeba9..fba4320de 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -557,70 +557,6 @@
 /* Define to 1 if you have the ISDN PRI library. */
 #undef HAVE_PRI
 
-/* Define to 1 if you have the ISDN PRI advice of charge supplementary service
-   events library. */
-#undef HAVE_PRI_AOC_EVENTS
-
-/* Define to 1 if you have the ISDN PRI call hold library. */
-#undef HAVE_PRI_CALL_HOLD
-
-/* Define to 1 if you have the ISDN PRI call rerouting and call deflection
-   library. */
-#undef HAVE_PRI_CALL_REROUTING
-
-/* Define to 1 if you have the ISDN PRI call waiting supplementary service
-   library. */
-#undef HAVE_PRI_CALL_WAITING
-
-/* Define to 1 if you have the ISDN PRI call completion supplementary service
-   library. */
-#undef HAVE_PRI_CCSS
-
-/* Define to 1 if you have the ISDN PRI Date/time ie send policy library. */
-#undef HAVE_PRI_DATETIME_SEND
-
-/* Define to 1 if you have the ISDN PRI user display text IE contents during
-   call library. */
-#undef HAVE_PRI_DISPLAY_TEXT
-
-/* Define to 1 if you have the ISDN PRI hangup fix library. */
-#undef HAVE_PRI_HANGUP_FIX
-
-/* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */
-#undef HAVE_PRI_INBANDDISCONNECT
-
-/* Define to 1 if you have the ISDN Layer 2 persistence option library. */
-#undef HAVE_PRI_L2_PERSISTENCE
-
-/* Define to 1 if you have the ISDN PRI Malicious Call ID library. */
-#undef HAVE_PRI_MCID
-
-/* Define to 1 if you have the ISDN PRI Message Waiting Indication library. */
-#undef HAVE_PRI_MWI
-
-/* Define to 1 if you have the ISDN PRI Message Waiting Indication (Fixed)
-   library. */
-#undef HAVE_PRI_MWI_V2
-
-/* Define to 1 if you have the ISDN progress with cause library. */
-#undef HAVE_PRI_PROG_W_CAUSE
-
-/* Define to 1 if you have the ISDN reverse charge library. */
-#undef HAVE_PRI_REVERSE_CHARGE
-
-/* Define to 1 if you have the ISDN service messages library. */
-#undef HAVE_PRI_SERVICE_MESSAGES
-
-/* Define to 1 if you have the ISDN PRI keypad facility in SETUP library. */
-#undef HAVE_PRI_SETUP_KEYPAD
-
-/* Define to 1 if you have the ISDN PRI subaddressing library. */
-#undef HAVE_PRI_SUBADDR
-
-/* Define to 1 if you have the ISDN PRI call transfer supplementary service
-   library. */
-#undef HAVE_PRI_TRANSFER
-
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD
 
@@ -833,16 +769,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. */
@@ -1120,9 +1056,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