Support an "internal" dvdnav version to make it easier to compile with,

test and debug dvdnav SVN.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile

@@ -234,6 +234,17 @@ SRCS_COMMON-$(CDDB)                  += stream/stream_cddb.c
 SRCS_COMMON-$(DVBIN)                 += stream/dvb_tune.c \
                                         stream/stream_dvb.c
 SRCS_COMMON-$(DVDNAV)                += stream/stream_dvdnav.c
+SRCS_COMMON-$(DVDNAV_INTERNAL)       += libdvdnav/dvdnav.c \
+                                        libdvdnav/highlight.c \
+                                        libdvdnav/navigation.c \
+                                        libdvdnav/read_cache.c \
+                                        libdvdnav/remap.c \
+                                        libdvdnav/searching.c \
+                                        libdvdnav/settings.c \
+                                        libdvdnav/vm/decoder.c \
+                                        libdvdnav/vm/vm.c \
+                                        libdvdnav/vm/vmcmd.c \
+
 SRCS_COMMON-$(DVDREAD)               += stream/stream_dvd.c \
                                         stream/stream_dvd_common.c
 SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread4/bitreader.c \
@@ -733,6 +744,8 @@ DIRS =  . \
         libavformat \
         libavutil \
         libdvdcss \
+        libdvdnav \
+        libdvdnav/vm \
         libdvdread4 \
         libfaad2 \
         libmenu \
@@ -839,6 +852,7 @@ mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplay
 $(DEPS): help_mp.h
 
 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
+libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
 libdvdread4/%.o libdvdread4/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
 

configure

@@ -7775,10 +7775,12 @@ fi
 #because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer
 # to use its own copy of the library)
 echocheck "DVD support (libdvdnav)"
+dvdnav_internal=no
 if test "$_dvdnav" = auto ; then
   if test "$_dvdread_internal" = yes ; then
-    _dvdnav=no
-    _res_comment="Disabled in favor of the internal copy of dvdread. Append --disable-dvdread-internal."
+    _dvdnav=yes
+    dvdnav_internal=yes
+    _res_comment="internal"
   else
     $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
   fi
@@ -7797,8 +7799,12 @@ fi
 if test "$_dvdnav" = yes ; then
   _largefiles=yes
   _def_dvdnav='#define CONFIG_DVDNAV 1'
+  if test "$dvdnav_internal" = yes ; then
+    _inc_extra="$_inc_extra -Ilibdvdnav"
+  else
   _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
   _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`"
+  fi
   _inputmodules="dvdnav $_inputmodules"
 else
   _def_dvdnav='#undef CONFIG_DVDNAV'
@@ -7975,6 +7981,7 @@ DIRECTFB = $_directfb
 DIRECTX = $_directx
 DVBIN = $_dvbin
 DVDNAV = $_dvdnav
+DVDNAV_INTERNAL = $dvdnav_internal
 DVDREAD = $_dvdread
 DVDREAD_INTERNAL = $_dvdread_internal
 DXR2 = $_dxr2