diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-11 10:09:16 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-11 10:09:16 +0200 |
| commit | aaa87d78d6e8fe7b1ddaa910f2657952f117529f (patch) | |
| tree | df7f07d70fa3f6b25998918bbc476b2b68b73101 /configure.ac | |
| parent | 3325b9aa2a719ae200b18b8f44f0b2452c27d49d (diff) | |
| download | xine-lib-aaa87d78d6e8fe7b1ddaa910f2657952f117529f.tar.gz xine-lib-aaa87d78d6e8fe7b1ddaa910f2657952f117529f.tar.bz2 | |
Update libmpcdec (formerly libmusepack) to version 1.2.5, this also reduces the patching needed.
Contestually, move libmpcdec code in contrib/libmpcdec, so that it's not mixed together with xine code.
The use of MUSEPACK_LIBS/MUSEPACK_CFLAGS intermediate is to make simpler move to pkg-config checks if libmpcdec developers decide to install one.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 138e587a4..04e811bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -1263,11 +1263,15 @@ elif test "x$with_external_libmpcdec" = "xyes"; then if test "x$have_mpcdec" != "xyes"; then AC_MSG_ERROR([Unable to find mpcdec]) fi - AC_DEFINE([HAVE_LIBMPC], [1], [Define if external libmpc is used]) + MPCDEC_LIBS="-lmpcdec" + MPCDEC_CFLAGS="" else AC_MSG_RESULT([Use included libmusepack]) fi +AC_SUBST(MPCDEC_LIBS) +AC_SUBST(MPCDEC_CFLAGS) + AM_CONDITIONAL([MUSEPACK], [test "x$enable_musepack" != "xno"]) AM_CONDITIONAL([EXTERNAL_MPCDEC], [test "x$have_mpcdec" = "xyes"]) @@ -2546,6 +2550,7 @@ doc/hackersguide/Makefile doc/faq/Makefile doc/Doxyfile contrib/Makefile +contrib/libmpcdec/Makefile include/Makefile include/xine.h lib/Makefile @@ -2584,7 +2589,6 @@ src/libffmpeg/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile -src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile |