diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-02-16 19:51:15 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-02-16 19:51:15 +0000 |
| commit | 7093cf278ca023a3b43959f15202c7eabd3f9856 (patch) | |
| tree | c6a7eecd35168f23d3cbb521594a2c628e1f9e9e /include/asterisk/autoconfig.h.in | |
| parent | 7879cccafd1749e2670039f9ddf3a786f59f5429 (diff) | |
Fix compile problem when old version of libvorbisfile v1.1.2 is used.
The principle difference between libvorbisfile v1.1.2 and newer (at least
v1.2.0) is the addition of the predefined callbacks OV_CALLBACKS_xxx in
vorbis/vorbisfile.h used for ov_open_callbacks().
* Updated the configure script to detect if libvorbisfile.h declares
OV_CALLBACKS_NOCLOSE.
* Copied the declaration of OV_CALLBACKS_NOCLOSE from v1.2.0 to allow
v1.1.2 to compile.
(closes issue ASTERISK-19370)
Reported by: Jonn Taylor
........
Merged revisions 355608 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 355620 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@355621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/autoconfig.h.in')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 0ba8ebaf7..816159082 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -836,19 +836,19 @@ /* 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 `uid' is a member of `struct sockpeercred'. */ +/* Define to 1 if `uid' is member of `struct sockpeercred'. */ #undef HAVE_STRUCT_SOCKPEERCRED_UID -/* 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. */ @@ -1023,6 +1023,9 @@ /* Define to 1 if you have the Vorbis library. */ #undef HAVE_VORBIS +/* Define if your system has OV_CALLBACKS_NOCLOSE declared. */ +#undef HAVE_VORBIS_OPEN_CALLBACKS + /* Define if your system has the VoiceTronix API libraries. */ #undef HAVE_VPB @@ -1126,9 +1129,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 |