diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 48 | ||||
| -rw-r--r-- | m4/summary.m4 | 5 | ||||
| -rw-r--r-- | m4/video_out.m4 | 19 |
3 files changed, 18 insertions, 54 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index f5f8aac76..a6c53f5fc 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -4,13 +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)])], - [test x"$enableval" != x"no" && enable_a52dec="yes"]) - AC_ARG_WITH([external-a52dec], - [AS_HELP_STRING([--with-external-a52dec], [Use external a52dec library (not recommended)])], - [test x"$withval" != x"no" && with_external_a52dec="yes"], [with_external_a52dec="no"]) + [AS_HELP_STRING([--enable-a52dec], [Enable support for a52dec decoding library (default: enabled, external: use external copy)])]) if test x"$enable_a52dec" != x"no"; then - if test x"$with_external_a52dec" != x"no"; then + if test x"$enable_a52dec" == x"external"; 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 @@ -60,13 +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)])], - [test x"$enableval" != x"no" && enable_faad="yes"]) - AC_ARG_WITH([external-faad], - [AS_HELP_STRING([--with-external-faad], [Use external FAAD decoeder])], - [test x"$withval" != x"no" && with_external_faad="yes"], [with_external_faad="no"]) + [AS_HELP_STRING([--enable-faad], [Enable support for FAAD decoder (default: enabled, external: use external copy)])]) if test x"$enable_faad" != x"no"; then - if test x"$with_external_faad" != x"no"; then + if test x"$enable_faad" == x"external"; 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]) @@ -98,6 +90,10 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc]) AC_DEFINE([HAVE_FFMPEG], 1, [Define this if you have ffmpeg library]) + dnl Check presence of ffmpeg/avutil.h to see if it's old or new + dnl style for headers. The new style would be preferred actually... + AC_CHECK_HEADER([ffmpeg/avutil.h]) + dnl gdk-pixbuf (optional; enabled by default) AC_ARG_ENABLE([gdkpixbuf], [AS_HELP_STRING([--enable-gdkpixbuf], [Enable GdkPixbuf support (default: enabled)])], @@ -126,13 +122,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ 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)])], - [test x"$enableval" != x"no" && enable_dts="yes"]) - AC_ARG_WITH([external-libdts], - [AS_HELP_STRING([--with-external-libdts], [Use external libdts/libdca library (not recommended)])], - [test x"$withval" != x"no" && with_external_libdts="yes"], [with_external_libdts="no"]) + [AS_HELP_STRING([--enable-dts], [Enable support for DTS decoding library (default: enabled, external: use external copy)])]) if test x"$enable_dts" != x"no"; then - if test x"$with_external_libdts" != x"no"; then + if test x"$enable_dts" == x"external"; 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 ***]) @@ -140,7 +132,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ else AC_MSG_RESULT([Using included libdts support]) fi - if test x"$have_external_libdts" != x"yes"; then + if test x"$have_external_dts" != x"yes"; then LIBDTS_CFLAGS='-I$(top_srcdir)/contrib/libdca/include' LIBDTS_DEPS='$(top_builddir)/contrib/libdca/libdca.la' LIBDTS_LIBS='$(top_builddir)/contrib/libdca/libdca.la' @@ -148,7 +140,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ fi fi AM_CONDITIONAL([ENABLE_DTS], [test x"$enable_dts" != x"no"]) - AM_CONDITIONAL([WITH_EXTERNAL_LIBDTS], [test x"$have_external_libdts" = x"yes"]) + AM_CONDITIONAL([WITH_EXTERNAL_LIBDTS], [test x"$have_external_dts" = x"yes"]) dnl libFLAC (optional; disabled by default) @@ -221,13 +213,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ 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)])], - [test x"$enableval" != x"no" && enable_mad="yes"]) - AC_ARG_WITH([external-libmad], - [AS_HELP_STRING([--with-external-libmad], [use external libmad library (not recommended)])], - [test x"$withval" != x"no" && with_external_libmad="yes"], [with_external_libmad="no"]) + [AS_HELP_STRING([--enable-mad], [Enable support for MAD decoding library (default: enabled, external: use external copy)])]) if test x"$enable_mad" != x"no"; then - if test x"$with_external_libmad" != x"no"; then + if test x"$enable_mad" == x"external"; then PKG_CHECK_MODULES([LIBMAD], [mad], [AC_CHECK_HEADERS([mad.h], [have_external_libmad=yes], [have_external_libmad=no])], [have_external_libmad=no]) @@ -299,13 +287,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ 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)])], - [test x"$enableval" != x"no" && enable_musepack="yes"]) - AC_ARG_WITH([external-libmpcdec], - [AS_HELP_STRING([--with-external-libmpcdec], [Use external libmpc library])], - [test x"$withval" != x"no" && with_external_libmpcdec="yes"], [with_external_libmpcdec="no"]) + [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled, external: use external copy)])]) if test x"$enable_musepack" != x"no"; then - if test x"$with_external_libmpcdec" != x"no"; then + if test x"$enable_musepack" == x"external"; 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]) diff --git a/m4/summary.m4 b/m4/summary.m4 index a96e11e5a..4a8f6db07 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -120,7 +120,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ fi fi if test x"$enable_libdts" != x"no"; then - if test x"$have_external_libdts" = x"yes"; then + if test x"$have_external_dts" = x"yes"; then echo " - DTS (external library)" else echo " - DTS (internal library)" @@ -179,9 +179,6 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ echo " * video driver plugins:" if test x"$no_x" != x"yes"; then echo " - XShm (X11 shared memory)" - if test x"$have_syncfb" = x"yes"; then - echo " - SyncFB (for Matrox G200/G400 cards)" - fi if test x"$have_xv" = x"yes"; then if test x"$have_xv_static" = x"yes"; then echo " - Xv (XVideo *static*)" diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 043d563e8..df782ff06 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -2,7 +2,7 @@ dnl ----------------- dnl Video out plugins dnl ----------------- AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ - dnl Setup defaults for the target operating system. For example, syncfb is + dnl Setup defaults for the target operating system. For example, linuxfb is dnl only ever available on Linux, so don't bother checking for it unless dnl explicitly requested to do so on other operating systems. dnl Notes: @@ -11,7 +11,6 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ dnl - dxr3 is Linux only dnl - Mac OS X video is Mac OS X only dnl - OpenGL requires Xwindows - dnl - SyncFB is Linux only, but disabled by default dnl - Vidix is FreeBSD and Linux only dnl - XvMC and xxmc depend on Xv @@ -24,7 +23,6 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ default_enable_linuxfb=disable default_enable_macosx_video=disable default_enable_opengl=enable - default_enable_syncfb=disable default_enable_vidix=disable default_enable_xinerama=enable default_enable_xvmc=enable @@ -293,21 +291,6 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ AM_CONDITIONAL([ENABLE_SUNFB], [test x"$have_sunfb" = x"yes"]) - dnl syncfb (Linux only) - AC_ARG_ENABLE([syncfb], - [AS_HELP_STRING([--enable-syncfb], [enable support for syncfb (Linux only)])], - [test x"$enableval" != x"no" && enable_syncfb="yes"], - [test $default_enable_syncfb = disable && enable_syncfb="no"]) - dnl There's no good test for this. If the user says so, then do it - if test x"$enable_syncfb" != x"no" && test x"$no_x" != x"yes"; then - have_syncfb=yes - fi - if test x"$enable_syncfb" = x"yes" && test x"$have_syncfb" != x"yes"; then - AC_MSG_ERROR([Linux syncfb support requested, but required X support is disabled]) - fi - AM_CONDITIONAL([ENABLE_SYNCFB], [test x"$have_syncfb" = x"yes"]) - - dnl xcb AC_ARG_WITH([xcb], [AS_HELP_STRING([--with-xcb], [Enable support for XCB video out plugins])], |