diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c729b94ab..23ff5265a 100644 --- a/configure.ac +++ b/configure.ac @@ -503,6 +503,7 @@ AST_EXT_LIB_SETUP([NEWT], [newt], [newt]) AST_EXT_LIB_SETUP([OGG], [OGG], [ogg]) AST_EXT_LIB_SETUP([OPENR2], [MFR2], [openr2]) AST_EXT_LIB_SETUP([OPUS], [Opus], [opus]) +AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile]) AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk]) AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss]) AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres]) @@ -690,12 +691,14 @@ AC_ARG_ENABLE([xmldoc], [AS_HELP_STRING([--disable-xmldoc], [Explicitly disable XML documentation])], [case "${enableval}" in - y|ye|yes) disable_xmldoc=no ;; - n|no) disable_xmldoc=yes ;; + y|ye|yes) DISABLE_XMLDOC=no ;; + n|no) DISABLE_XMLDOC=yes ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-xmldoc) ;; - esac], [disable_xmldoc=no]) + esac], [DISABLE_XMLDOC=no]) -if test "${disable_xmldoc}" != "yes"; then +AC_SUBST([DISABLE_XMLDOC]) +if test "${DISABLE_XMLDOC}" != "yes"; then + AC_DEFINE([AST_XML_DOCS], 1, [Define to enable XML documentation.]) AST_EXT_LIB_CHECK([LIBXSLT], [xslt], [xsltLoadStylesheetPI], [libxslt/xsltInternals.h], [${LIBXML2_LIB}], [${LIBXML2_INCLUDE}]) AST_EXT_LIB_CHECK([LIBXSLT_CLEANUP], [xslt], [xsltCleanupGlobals], [libxslt/xsltInternals.h], [${LIBXML2_LIB}], [${LIBXML2_INCLUDE}]) @@ -2348,6 +2351,13 @@ AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_set_isup_timer], [libss7.h]) AST_EXT_LIB_CHECK([OPENR2], [openr2], [openr2_chan_new], [openr2.h]) AST_EXT_LIB_CHECK([OPUS], [opus], [opus_encoder_create], [opus/opus.h]) +# opusfile.h includes <opus_multistream.h> so we need to make sure that +# either $OPUS_INCLUDE or /usr/include/opus is added to the search path. +__opus_include=${OPUS_INCLUDE} +if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then + __opus_include=-I/usr/include/opus +fi +AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) if test "${USE_PWLIB}" != "no"; then if test -n "${PWLIB_DIR}"; then |