[xine-cvs] CVS: xine-lib/src/dxr3 Makefile.am,1.40,1.41 dxr3_decode_spu.c,1.33,1.34 nav_read.c,1.3,1.4

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/dxr3
In directory sc8-pr-cvs1:/tmp/cvs-serv10465/src/dxr3

Modified Files:
	Makefile.am dxr3_decode_spu.c nav_read.c 
Log Message:
* include nav_read.c for builds with included libdvdnav
* link correctly for standalone libdvdnav


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.am	8 Mar 2003 14:11:52 -0000	1.40
+++ Makefile.am	30 Apr 2003 16:51:55 -0000	1.41
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS) -I../input/libdvdread
+AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
@@ -26,8 +26,14 @@
 xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB)
 xineplug_decode_dxr3_video_la_LDFLAGS = -avoid-version -module
 
+if HAVE_DVDNAV
+xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c
+xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
+else
+AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
 xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c
 xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB)
+endif
 xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_dxr3_la_SOURCES = \

Index: dxr3_decode_spu.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/dxr3_decode_spu.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dxr3_decode_spu.c	8 Mar 2003 14:11:52 -0000	1.33
+++ dxr3_decode_spu.c	30 Apr 2003 16:51:57 -0000	1.34
@@ -40,8 +40,13 @@
 #include "xineutils.h"
 #include "buffer.h"
 #include "xine-engine/bswap.h"
-#include "nav_types.h"
-#include "nav_read.h"
+#ifdef HAVE_DVDNAV
+#  include <dvdnav/nav_types.h>
+#  include <dvdnav/nav_read.h>
+#else
+#  include "nav_types.h"
+#  include "nav_read.h"
+#endif
 #include "video_out_dxr3.h"
 #include "dxr3.h"
 

Index: nav_read.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/nav_read.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nav_read.c	8 Mar 2003 14:11:52 -0000	1.3
+++ nav_read.c	30 Apr 2003 16:51:58 -0000	1.4
@@ -1 +1 @@
-#include "../input/libdvdread/nav_read.c"
+#include "../input/libdvdnav/nav_read.c"