From 6f37bed88a192949ae4ebb96f59868265a1baf68 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Wed, 30 Apr 2003 16:51:55 +0000
Subject: * include nav_read.c for builds with included libdvdnav * link
 correctly for standalone libdvdnav

CVS patchset: 4725
CVS date: 2003/04/30 16:51:55
---
 src/dxr3/Makefile.am       |  8 +++++++-
 src/dxr3/dxr3_decode_spu.c | 11 ++++++++---
 src/dxr3/nav_read.c        |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index acf5839b5..33b71dc23 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -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_SOURCES = dxr3_decode_video.c dxr3_scr.c
 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 = \
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 0cb0df68c..e0d367e91 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.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: dxr3_decode_spu.c,v 1.33 2003/03/08 14:11:52 mroi Exp $
+ * $Id: dxr3_decode_spu.c,v 1.34 2003/04/30 16:51:57 mroi Exp $
  */
  
 /* dxr3 spu decoder plugin.
@@ -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"
 
diff --git a/src/dxr3/nav_read.c b/src/dxr3/nav_read.c
index 2c3b355f5..5244bfdd6 100644
--- a/src/dxr3/nav_read.c
+++ b/src/dxr3/nav_read.c
@@ -1 +1 @@
-#include "../input/libdvdread/nav_read.c"
+#include "../input/libdvdnav/nav_read.c"
-- 
cgit v1.2.3