[xine-cvs] CVS: xine-lib/src/liba52 Makefile.am,1.15,1.16 xine_decoder.c,1.75,1.76

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/liba52
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19001/src/liba52

Modified Files:
	Makefile.am xine_decoder.c 
Log Message:
added --with-external-a52dec and --with-external-libmad switches
thanks Diego 'Flameeyes' Petten


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/liba52/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am	20 Oct 2003 00:33:28 -0000	1.15
+++ Makefile.am	29 May 2005 00:47:48 -0000	1.16
@@ -4,16 +4,28 @@
 
 lib_LTLIBRARIES = xineplug_decode_a52.la
 
-xineplug_decode_a52_la_SOURCES = \
+if EXTERNAL_A52DEC
+internal_sources =
+else
+internal_sources = \
 	bitstream.c \
 	bit_allocate.c \
-	crc.c \
 	downmix.c \
 	imdct.c \
-	parse.c \
-	xine_decoder.c
+	parse.c
+endif
+
+xineplug_decode_a52_la_SOURCES = \
+	crc.c \
+	xine_decoder.c \
+	$(internal_sources)
 
+if EXTERNAL_A52DEC
+xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -lm
+else
 xineplug_decode_a52_la_LIBADD = $(XINE_LIB)
+endif
+
 xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 noinst_HEADERS = \

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/liba52/xine_decoder.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xine_decoder.c	28 May 2005 11:24:35 -0000	1.75
+++ xine_decoder.c	29 May 2005 00:47:48 -0000	1.76
@@ -29,6 +29,8 @@
 /* avoid compiler warnings */
 #define _BSD_SOURCE 1
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -46,8 +48,19 @@
 
 #include "xine_internal.h"
 #include "audio_out.h"
-#include "a52.h"
-#include "a52_internal.h"
+
+#ifdef HAVE_A52DEC_A52_H
+# include <a52dec/a52.h>
+#else
+# include "a52.h"
+#endif
+
+#ifdef HAVE_A52DEC_A52_INTERNAL_H
+# include <a52dec/a52_internal.h>
+#else
+# include "a52_internal.h"
+#endif
+
 #include "buffer.h"
 #include "xineutils.h"