summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-20 22:26:10 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-20 22:26:10 +0100
commit9a34a9096f156d46176cf30270e38a32410cd116 (patch)
treeaed957ca166e7ed2b7b4bfc7f8c7bc410f743a27
parent2d09c29291453e275481d248d98c9cb8b4250cda (diff)
downloadxine-lib-9a34a9096f156d46176cf30270e38a32410cd116.tar.gz
xine-lib-9a34a9096f156d46176cf30270e38a32410cd116.tar.bz2
Prefer external decoder libraries for a52, faad, dts, mad & musepack.
You can use --enable-foo=internal if you like, but it's not recommended.
-rw-r--r--m4/decoders.m420
1 files changed, 10 insertions, 10 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4
index db464435d..95f7aab7e 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -4,9 +4,9 @@ dnl ---------------------------
AC_DEFUN([XINE_DECODER_PLUGINS], [
dnl a52dec (optional; enabled by default; external version allowed)
AC_ARG_ENABLE([a52dec],
- [AS_HELP_STRING([--enable-a52dec], [Enable support for a52dec decoding library (default: enabled, external: use external copy)])])
+ [AS_HELP_STRING([--enable-a52dec], [Enable support for a52dec decoding library (default: enabled, internal: use internal copy)])])
if test x"$enable_a52dec" != x"no"; then
- if test x"$enable_a52dec" == x"external"; then
+ if test x"$enable_a52dec" != x"internal"; then
AC_CHECK_LIB([a52], [a52_init],
[AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h], [have_external_a52dec=yes], [have_external_a52dec=no],
[#ifdef HAVE_SYS_TYPES_H
@@ -56,9 +56,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
dnl FAAD (optional; enabled by default)
AC_ARG_ENABLE([faad],
- [AS_HELP_STRING([--enable-faad], [Enable support for FAAD decoder (default: enabled, external: use external copy)])])
+ [AS_HELP_STRING([--enable-faad], [Enable support for FAAD decoder (default: enabled, internal: use internal copy)])])
if test x"$enable_faad" != x"no"; then
- if test x"$enable_faad" == x"external"; then
+ if test x"$enable_faad" != x"internal"; then
AC_CHECK_LIB([faad], [NeAACDecInit],
[AC_CHECK_HEADERS([neaacdec.h], [have_external_faad=yes], [have_external_faad=no],
[#include <neaacdec.h>])], [have_external_faad=no], [-lm])
@@ -155,9 +155,9 @@ use internal ffmpeg.
dnl libdts (optional; enabled by default; external version allowed)
AC_ARG_ENABLE([dts],
- [AS_HELP_STRING([--enable-dts], [Enable support for DTS decoding library (default: enabled, external: use external copy)])])
+ [AS_HELP_STRING([--enable-dts], [Enable support for DTS decoding library (default: enabled, internal: use internal copy)])])
if test x"$enable_dts" != x"no"; then
- if test x"$enable_dts" == x"external"; then
+ if test x"$enable_dts" != x"internal"; then
PKG_CHECK_MODULES([LIBDTS], [libdts], [have_external_dts=yes], [have_external_dts=no])
if test x"$have_external_dts" != x"yes"; then
AC_MSG_RESULT([*** no usable version of libdts found, using internal copy ***])
@@ -246,9 +246,9 @@ use internal ffmpeg.
dnl libmad (optional; enabled by default; external version allowed)
AC_ARG_ENABLE([mad],
- [AS_HELP_STRING([--enable-mad], [Enable support for MAD decoding library (default: enabled, external: use external copy)])])
+ [AS_HELP_STRING([--enable-mad], [Enable support for MAD decoding library (default: enabled, internal: use external copy)])])
if test x"$enable_mad" != x"no"; then
- if test x"$enable_mad" == x"external"; then
+ if test x"$enable_mad" != x"internal"; then
PKG_CHECK_MODULES([LIBMAD], [mad],
[AC_CHECK_HEADERS([mad.h], [have_external_libmad=yes], [have_external_libmad=no])],
[have_external_libmad=no])
@@ -320,9 +320,9 @@ use internal ffmpeg.
dnl libmpcdec (optional; enabled by default; external version allowed)
AC_ARG_ENABLE([musepack],
- [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled, external: use external copy)])])
+ [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled, internal: use external copy)])])
if test x"$enable_musepack" != x"no"; then
- if test x"$enable_musepack" == x"external"; then
+ if test x"$enable_musepack" != x"internal"; then
AC_CHECK_LIB([mpcdec], [mpc_decoder_decode],
[AC_CHECK_HEADERS([mpcdec/mpcdec.h], [have_external_libmpcdec=yes], [have_external_libmpcdec=no])],
[have_external_libmpcdec=no])