Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Make format_vorbis_ogg compile on OpenBSD

Browse Source 
(closes issue #13639)
Reported by: mvanbaak
Patches:
      2008100700_oggsupportOBSD.diff.txt uploaded by mvanbaak (license 7)
      2008100700_oggsupportOBSD-configurescript.diff.txt uploaded by mvanbaak (license 7)
Tested by: mvanbaak


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Michiel van Baak 17 years ago
parent c69a3b96b2
commit 1693e79100
2 changed files with 272 additions and 2 deletions
Show Stats Download Patch File Download Diff File

267
configure vendored
Unescape View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 146925 .
# From configure.ac Revision: 147306 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@ -47306,6 +47306,270 @@ _ACEOF
fi
if test "${OSARCH}" = "OpenBSD";
then
if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then
pbxlibdir=""
# if --with-VORBIS=DIR has been specified, use it.
if test "x${VORBIS_DIR}" != "x"; then
if test -d ${VORBIS_DIR}/lib; then
pbxlibdir="-L${VORBIS_DIR}/lib"
else
pbxlibdir="-L${VORBIS_DIR}"
fi
fi
pbxfuncname="vorbis_info_init"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_VORBIS_FOUND=yes
else
as_ac_Lib=`echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lvorbis" >&5
echo $ECHO_N "checking for ${pbxfuncname} in -lvorbis... $ECHO_C" >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lvorbis ${pbxlibdir} -lm -lvorbisenc -logg $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char ${pbxfuncname} ();
int
main ()
{
return ${pbxfuncname} ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
ac_res=`eval echo '${'$as_ac_Lib'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
AST_VORBIS_FOUND=yes
else
AST_VORBIS_FOUND=no
fi
fi
# now check for the header.
if test "${AST_VORBIS_FOUND}" = "yes"; then
VORBIS_LIB="${pbxlibdir} -lvorbis -lm -lvorbisenc -logg"
# if --with-VORBIS=DIR has been specified, use it.
if test "x${VORBIS_DIR}" != "x"; then
VORBIS_INCLUDE="-I${VORBIS_DIR}/include"
fi
VORBIS_INCLUDE="${VORBIS_INCLUDE} "
if test "xvorbis/codec.h" = "x" ; then # no header, assume found
VORBIS_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"
if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5
echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; }
if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_codec_h" >&5
echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking vorbis/codec.h usability" >&5
echo $ECHO_N "checking vorbis/codec.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <vorbis/codec.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
{ echo "$as_me:$LINENO: checking vorbis/codec.h presence" >&5
echo $ECHO_N "checking vorbis/codec.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <vorbis/codec.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: vorbis/codec.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: vorbis/codec.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5
echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; }
if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_vorbis_codec_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_codec_h" >&5
echo "${ECHO_T}$ac_cv_header_vorbis_codec_h" >&6; }
fi
if test $ac_cv_header_vorbis_codec_h = yes; then
VORBIS_HEADER_FOUND=1
else
VORBIS_HEADER_FOUND=0
fi
CPPFLAGS="${saved_cppflags}"
fi
if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then
VORBIS_LIB=""
VORBIS_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
VORBIS_LIB=""
fi
PBX_VORBIS=1
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_VORBIS 1
_ACEOF
cat >>confdefs.h <<_ACEOF
#define HAVE_VORBIS_VERSION
_ACEOF
fi
fi
fi
else
if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then
pbxlibdir=""
@ -47567,6 +47831,7 @@ _ACEOF
fi
fi
fi
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'

7
configure.ac
Unescape View File

@ -1476,7 +1476,12 @@ AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h],
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])
AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc])
if test "${OSARCH}" = "OpenBSD";
then
AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -logg])
else
AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc])
fi
AC_LANG_PUSH(C++)

Write Preview
Loading…
Cancel
Save