diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-10 22:49:27 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-10 22:49:27 +0000 |
| commit | 471aee5bb21bb5d568ac1ddaea0b35c18cda5c07 (patch) | |
| tree | 77d42d4a0c337d4001d100b49b785f2604deeb0e /m4 | |
| parent | c6324255117128d3a7a9f614c756022d3ef7461d (diff) | |
| parent | 508e9088eec8f00b5dea9571383480803d4ad45e (diff) | |
| download | xine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.gz xine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/liba52/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 3 | ||||
| -rw-r--r-- | m4/input.m4 | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 2fe4d766f..09d8dd900 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -8,7 +8,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ if test x"$enable_a52dec" != x"no"; 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], + [AC_CHECK_HEADERS([a52dec/a52.h], [have_external_a52dec=yes], [have_external_a52dec=no], [#ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -132,6 +132,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ dnl the flags for plain GraphicsMagick WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS" WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS" + AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define this if you have GraphicsMagick installed]) fi if test x"$with_imagemagick" = x"yes" && test x"$have_imagemagick" = x"no"; then AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found]) diff --git a/m4/input.m4 b/m4/input.m4 index b50b830a7..7c9fc73b1 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -128,6 +128,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ ACX_PACKAGE_CHECK([DVDNAV], [0.1.9], [dvdnav-config], [AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])], [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) + AC_CHECK_LIB([dvdread], [navRead_DSI], [DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread"], []) else AC_MSG_RESULT([Using included DVDNAV support]) fi |