diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 20 | ||||
| -rw-r--r-- | m4/input.m4 | 20 |
2 files changed, 34 insertions, 6 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 094f406ea..7327ba5db 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -29,6 +29,18 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ else AC_MSG_RESULT([Using included a52dec support]) fi + if test x"$have_external_a52dec" = x"yes"; then + A52DEC_CFLAGS='' + A52DEC_LIBS='-la52' + A52DEC_DEPS='' + else + A52DEC_CFLAGS='-I$(top_srcdir)/contrib/a52dec' + A52DEC_LIBS='$(top_builddir)/contrib/a52dec/liba52.la' + A52DEC_DEPS='$(top_builddir)/contrib/a52dec/liba52.la' + fi + AC_SUBST(A52DEC_CFLAGS) + AC_SUBST(A52DEC_DEPS) + AC_SUBST(A52DEC_LIBS) fi AM_CONDITIONAL([ENABLE_A52DEC], [test x"$enable_a52dec" != x"no"]) AM_CONDITIONAL([WITH_EXTERNAL_A52DEC], [test x"$have_external_a52dec" = x"yes"]) @@ -260,6 +272,14 @@ use internal ffmpeg. ;; esac fi + if test x"$have_external_libmad" != x"yes"; then + LIBMAD_CFLAGS='-I$(top_srcdir)/contrib/libmad' + LIBMAD_LIBS='$(top_builddir)/contrib/libmad/libmad.la' + LIBMAD_DEPS='$(top_builddir)/contrib/libmad/libmad.la' + fi + AC_SUBST(LIBMAD_CFLAGS) + AC_SUBST(LIBMAD_DEPS) + AC_SUBST(LIBMAD_LIBS) fi AM_CONDITIONAL([ENABLE_MAD], [test x"$enable_mad" != x"no"]) AM_CONDITIONAL([WITH_EXTERNAL_MAD], [test x"$have_external_libmad" = x"yes"]) diff --git a/m4/input.m4 b/m4/input.m4 index 76ad12ad9..a0de77dc0 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -218,12 +218,16 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ fi fi - LIBCDIO_CFLAGS='-I$(top_srcdir)/src/input/vcd/libcdio' - LIBCDIO_LIBS='$(top_builddir)/src/input/vcd/libcdio/libcdio.la' - LIBISO9660_LIBS='$(top_builddir)/src/input/vcd/libcdio/libiso9660.la' - LIBVCD_CFLAGS='-I$(top_srcdir)/src/input/vcd/libvcd' - LIBVCD_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcd.la' - LIBVCDINFO_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcdinfo.la' + LIBCDIO_CFLAGS='-I$(top_srcdir)/contrib/libcdio' + LIBCDIO_LIBS='$(top_builddir)/contrib/libcdio/libcdio.la' + LIBCDIO_DEPS='$(top_builddir)/contrib/libcdio/libcdio.la' + LIBISO9660_LIBS='$(top_builddir)/contrib/libcdio/libiso9660.la' + LIBISO9660_DEPS='$(top_builddir)/contrib/libcdio/libiso9660.la' + LIBVCD_CFLAGS='-I$(top_srcdir)/contrib/libvcd' + LIBVCD_LIBS='$(top_builddir)/contrib/libvcd/libvcd.la' + LIBVCD_DEPS='$(top_builddir)/contrib/libvcd/libvcd.la' + LIBVCDINFO_LIBS='$(top_builddir)/contrib/libvcd/libvcdinfo.la' + LIBVCDINFO_DEPS='$(top_builddir)/contrib/libvcd/libvcdinfo.la' case "$host_os" in bsdi*) @@ -270,10 +274,14 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ AC_DEFINE([EXTERNAL_LIBCDIO_CONFIG_H], 1, [Get of rid system libcdio build configuration]) AC_SUBST(LIBCDIO_CFLAGS) AC_SUBST(LIBCDIO_LIBS) + AC_SUBST(LIBCDIO_DEPS) AC_SUBST(LIBISO9660_LIBS) + AC_SUBST(LIBISO9660_DEPS) AC_SUBST(LIBVCD_CFLAGS) AC_SUBST(LIBVCD_LIBS) + AC_SUBST(LIBVCD_DEPS) AC_SUBST(LIBVCDINFO_LIBS) + AC_SUBST(LIBVCDINFO_DEPS) AM_CONDITIONAL([WITH_EXTERNAL_VCDLIBS], [test x"$with_internal_vcdlibs" = x"no"]) AM_CONDITIONAL([ENABLE_VCD], [test x"$enable_vcd" != x"no"]) AM_CONDITIONAL([ENABLE_VCDO], [test x"$enable_vcdo" != x"no"]) |