4 files changed, 31 insertions, 7 deletions
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index d786ab250..1cb30459b 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -2,7 +2,11 @@ include $(top_srcdir)/misc/Makefile.common
 
 libdir = $(XINE_PLUGINDIR)
 
-lib_LTLIBRARIES = xineplug_decode_a52.la
+if A52
+a52_module = xineplug_decode_a52.la
+endif
+
+lib_LTLIBRARIES = $(a52_module)
 
 if EXTERNAL_A52DEC
 internal_sources =
diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am
index 52e3ff683..34980c82c 100644
--- a/src/libdts/Makefile.am
+++ b/src/libdts/Makefile.am
@@ -2,11 +2,27 @@ include $(top_srcdir)/misc/Makefile.common
 
 libdir = $(XINE_PLUGINDIR)
 
-lib_LTLIBRARIES = xineplug_decode_dts.la
+if DTS
+dts_module = xineplug_decode_dts.la
+endif
 
-xineplug_decode_dts_la_SOURCES = bitstream.c downmix.c parse.c xine_decoder.c
-xineplug_decode_dts_la_LIBADD = $(XINE_LIB)
+lib_LTLIBRARIES = $(dts_module)
+
+if EXTERNAL_LIBDTS
+internal_sources =
+else
+internal_sources = bitstream.c downmix.c parse.c 
+endif
+
+xineplug_decode_dts_la_SOURCES = xine_decoder.c $(internal_sources)
 xineplug_decode_dts_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS)
 
+if EXTERNAL_LIBDTS
+xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS)
+xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS)
+else
+xineplug_decode_dts_la_LIBADD = $(XINE_LIB)
+endif
+
 noinst_HEADERS = bitstream.h dts.h dts_internal.h tables.h tables_adpcm.h \
 	tables_fir.h tables_huffman.h tables_quantization.h tables_vq.h
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c
index f341c6ccb..d40a39e6c 100644
--- a/src/libffmpeg/audio_decoder.c
+++ b/src/libffmpeg/audio_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_decoder.c,v 1.16 2005/05/29 19:28:00 jstembridge Exp $
+ * $Id: audio_decoder.c,v 1.17 2005/09/12 01:06:58 miguelfreitas Exp $
  *
  * xine audio decoder plugin using ffmpeg
  *
@@ -441,7 +441,7 @@ static uint32_t supported_audio_types[] = {
   BUF_AUDIO_FLAC,
   BUF_AUDIO_ALAC,
   BUF_AUDIO_SHORTEN,
-  /* BUF_AUDIO_MPEG, */
+  BUF_AUDIO_MPEG,
   0
 };
 
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
index cf34f36f5..b8568f936 100644
--- a/src/libmad/Makefile.am
+++ b/src/libmad/Makefile.am
@@ -6,7 +6,11 @@ EXTRA_DIST = imdct_l_arm.S
 
 libdir = $(XINE_PLUGINDIR)
 
-lib_LTLIBRARIES = xineplug_decode_mad.la
+if MAD
+mad_module = xineplug_decode_mad.la
+endif
+
+lib_LTLIBRARIES = $(mad_module)
 
 if EXTERNAL_LIBMAD
 internal_sources =