summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-31 19:31:45 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-31 19:31:45 +0200
commit6c2a2fea3c11e440336e8b39fdbc82c008c1d54e (patch)
tree436c04cd6d7b8318111b1beaa6fa5e990af7201a /m4
parentf8057e9c31400721e7d02ea07728fbb8bd86ec2b (diff)
downloadxine-lib-6c2a2fea3c11e440336e8b39fdbc82c008c1d54e.tar.gz
xine-lib-6c2a2fea3c11e440336e8b39fdbc82c008c1d54e.tar.bz2
Replace libmad with a pristine copy of 0.15.1b, and move it into contrib/.
Diffstat (limited to 'm4')
-rw-r--r--m4/decoders.m48
1 files changed, 8 insertions, 0 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4
index 094f406ea..535af20bf 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -260,6 +260,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"])