From 2af57b46d30cea316a9f245cc2ecf826e756dbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 19 Jan 2007 02:35:36 +0000
Subject: Add --disable-musepack and --with-external-libmpcdec parameters to
 configure, now users can decide if they want musepack support and whether to
 use an external copy of libmpcdec.

CVS patchset: 8532
CVS date: 2007/01/19 02:35:36
---
 src/libmusepack/Makefile.am    | 17 +++++++++++++++--
 src/libmusepack/xine_decoder.c |  8 ++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/libmusepack/Makefile.am b/src/libmusepack/Makefile.am
index 477dc31f9..021ec0985 100644
--- a/src/libmusepack/Makefile.am
+++ b/src/libmusepack/Makefile.am
@@ -6,11 +6,24 @@ EXTRA_DIST = diff_against_svn.patch
 
 libdir = $(XINE_PLUGINDIR)
 
+if MUSEPACK
 lib_LTLIBRARIES = xineplug_decode_mpc.la
+endif
 
-xineplug_decode_mpc_la_SOURCES = huffsv46.c huffsv7.c idtag.c mpc_decoder.c \
-	mpc_reader.c requant.c streaminfo.c synth_filter.c xine_decoder.c
+if EXTERNAL_MPCDEC
+internal_sources = 
+else
+internal_sources = huffsv46.c huffsv7.c idtag.c mpc_decoder.c \
+	mpc_reader.c requant.c streaminfo.c synth_filter.c
+endif
+
+if EXTERNAL_MPCDEC
+xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) -lmpcdec
+else
 xineplug_decode_mpc_la_LIBADD = $(XINE_LIB)
+endif
+
+xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_decoder.c
 xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG)
 xineplug_decode_mpc_la_LDFLAGS = -avoid-version -module
 
diff --git a/src/libmusepack/xine_decoder.c b/src/libmusepack/xine_decoder.c
index 03d43fb63..26c2eddf5 100644
--- a/src/libmusepack/xine_decoder.c
+++ b/src/libmusepack/xine_decoder.c
@@ -23,7 +23,7 @@
  *   32bit float output
  *   Seeking??
  *
- * $Id: xine_decoder.c,v 1.9 2006/07/10 22:08:29 dgp85 Exp $
+ * $Id: xine_decoder.c,v 1.10 2007/01/19 02:35:36 dgp85 Exp $
  */
 
 #include <stdio.h>
@@ -43,7 +43,11 @@
 #include "buffer.h"
 #include "xineutils.h"
 
-#include "musepack/musepack.h"
+#ifdef HAVE_MPCDEC_MPCDEC_H
+# include <mpcdec/mpcdec.h>
+#else
+# include "musepack/musepack.h"
+#endif
 
 #define MPC_DECODER_MEMSIZE  65536
 #define MPC_DECODER_MEMSIZE2 (MPC_DECODER_MEMSIZE/2)
-- 
cgit v1.2.3