diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-16 15:05:19 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-16 15:05:19 +0000 |
| commit | f62eed3209aab6fc642e66b18cc71d526517aadb (patch) | |
| tree | 4b56b352759d4de7196a6ce564cf2ff88dfd08b2 /m4 | |
| parent | d8a50c1e20367be95911533c62637c23b809b916 (diff) | |
| parent | c3580b925a6c33105ee483d3c616a16f8ce0bba9 (diff) | |
| download | xine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.gz xine-lib-f62eed3209aab6fc642e66b18cc71d526517aadb.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am
rename : src/libmpeg2new/libmpeg2/Makefile.am => src/video_dec/libmpeg2new/libmpeg2/Makefile.am
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index fd7580a07..9150adda0 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -93,7 +93,11 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ 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_HEADERS([ffmpeg/avutil.h]) - + AC_CHECK_HEADERS([libavutil/avutil.h]) + if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then + AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!]) + fi + dnl gdk-pixbuf (optional; enabled by default) AC_ARG_ENABLE([gdkpixbuf], [AS_HELP_STRING([--enable-gdkpixbuf], [Enable GdkPixbuf support (default: enabled)])], @@ -286,6 +290,12 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ AM_CONDITIONAL([ENABLE_MODPLUG], [test x"$have_modplug" = x"yes"]) + dnl libmpeg2new (optional; disabled by default) + AC_ARG_ENABLE([libmpeg2new], + AS_HELP_STRING([--enable-libmpeg2new], [build the newer MPEG2 decoder (buggy)])) + AM_CONDITIONAL([ENABLE_MPEG2NEW], [test "x$enable_libmpeg2new" = "xyes"]) + + 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, internal: use external copy)])]) |