kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

BuildSystem: Check for header file of OGG.

Browse Source 
Asterisk uses various symbols of the shared library libogg within the module
format_ogg_vorbis. However, the source code of that module did not include the
header file of libogg explicitly but implicitly. Because that header was not
included before Asterisk 14, the script ./configure was told not to check for
it.

Anyway, even Asterisk 13 LTS uses symbols of libogg. Therefore, that header
should be included explicitly. Therefore, ./configure should check for that
header.

Change-Id: I98c50d56311b68880d1084fcc62c35ab2f8692db
This commit is contained in:
Alexander Traud
2018-03-17 16:49:11 +01:00
parent d5bfba60d2
commit e61b50b67a
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
configure vendored
View File

@@ -24016,9 +24016,9 @@ if test "x${PBX_OGG}" != "x1" -a "${USE_OGG}" != "no"; then
ast_ext_lib_check_save_CFLAGS="${CFLAGS}" ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} " CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_sync_init in -logg" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_init in -logg" >&5
$as_echo_n "checking for ogg_sync_init in -logg... " >&6; } $as_echo_n "checking for ogg_stream_init in -logg... " >&6; }
if ${ac_cv_lib_ogg_ogg_sync_init+:} false; then : if ${ac_cv_lib_ogg_ogg_stream_init+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@@ -24032,27 +24032,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char ogg_sync_init (); char ogg_stream_init ();
int int
main () main ()
{ {
return ogg_sync_init (); return ogg_stream_init ();
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ogg_ogg_sync_init=yes ac_cv_lib_ogg_ogg_stream_init=yes
else else
ac_cv_lib_ogg_ogg_sync_init=no ac_cv_lib_ogg_ogg_stream_init=no
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_sync_init" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_init" >&5
$as_echo "$ac_cv_lib_ogg_ogg_sync_init" >&6; } $as_echo "$ac_cv_lib_ogg_ogg_stream_init" >&6; }
if test "x$ac_cv_lib_ogg_ogg_sync_init" = xyes; then : if test "x$ac_cv_lib_ogg_ogg_stream_init" = xyes; then :
AST_OGG_FOUND=yes AST_OGG_FOUND=yes
else else
AST_OGG_FOUND=no AST_OGG_FOUND=no
@@ -24070,8 +24070,18 @@ fi
fi fi
OGG_INCLUDE="${OGG_INCLUDE} " OGG_INCLUDE="${OGG_INCLUDE} "
# no header, assume found # check for the header
OGG_HEADER_FOUND="1" ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "ogg/ogg.h" "ac_cv_header_ogg_ogg_h" "$ac_includes_default"
if test "x$ac_cv_header_ogg_ogg_h" = xyes; then :
OGG_HEADER_FOUND=1
else
OGG_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
if test "x${OGG_HEADER_FOUND}" = "x0" ; then if test "x${OGG_HEADER_FOUND}" = "x0" ; then
OGG_LIB="" OGG_LIB=""

2
configure.ac
View File

@@ -2181,7 +2181,7 @@ AST_C_DECLARE_CHECK([UNBOUND_CONST_PARAMS], [UNBOUND_VERSION_MAJOR], [unbound.h]
AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], []) AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [])
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_stream_init], [ogg/ogg.h])
# Non-glibc platforms require libexecinfo for backtrace support # Non-glibc platforms require libexecinfo for backtrace support
AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h]) AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h])

1
formats/format_ogg_vorbis.c
View File

@@ -33,6 +33,7 @@
#include "asterisk.h" #include "asterisk.h"
#include <ogg/ogg.h>
#include <vorbis/codec.h> #include <vorbis/codec.h>
#include <vorbis/vorbisenc.h> #include <vorbis/vorbisenc.h>
#include <vorbis/vorbisfile.h> #include <vorbis/vorbisfile.h>