libmpdvdkit2 directory was not compiled - mplayer compile failed - fixed.

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

2 files changed, 21 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index d777bc5224..c613dc8e46 100644
--- a/Makefile
+++ b/Makefile
@@ -117,6 +117,13 @@ else
 COMMON_DEPS += libmpdvdkit/libmpdvdkit.a
 endif
 endif
+ifeq ($(DVDKIT2),yes)
+ifeq ($(DVDKIT_SHARED),yes)
+COMMON_DEPS += libmpdvdkit2/libmpdvdkit.so
+else
+COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
+endif
+endif
 
 libmpdvdkit/libmpdvdkit.a:
 	$(MAKE) -C libmpdvdkit
@@ -124,6 +131,12 @@ libmpdvdkit/libmpdvdkit.a:
 libmpdvdkit/libmpdvdkit.so:
 	$(MAKE) -C libmpdvdkit libmpdvdkit.so
 
+libmpdvdkit2/libmpdvdkit.a:
+	$(MAKE) -C libmpdvdkit2
+		
+libmpdvdkit2/libmpdvdkit.so:
+	$(MAKE) -C libmpdvdkit2 libmpdvdkit.so
+			
 loader/libloader.a:
 	$(MAKE) -C loader
 
diff --git a/configure b/configure
index 83146c4732..473c618d1b 100755
--- a/configure
+++ b/configure
@@ -3020,6 +3020,8 @@ if test "$_dvdkit" = yes ; then
    if test -f "./libmpdvdkit2/Makefile" ; then
     _inputmodules="mpdvdkit2 $_inputmodules"
     _dvdread=libmpdvdkit2
+    _dvdkit2=yes
+    _dvdkit=no
    else
     _inputmodules="mpdvdkit $_inputmodules"
     _dvdread=libmpdvdkit
@@ -3039,7 +3041,11 @@ if test "$_dvdkit" = yes ; then
 else
   _noinputmodules="mpdvdkit $_noinputmodules"
 fi
-echores "$_dvdkit"
+if test "$_dvdkit" = yes || test "$_dvdkit2" = yes; then
+  echores "yes"
+else
+  echores "no"
+fi  
 
 echocheck "DVD support (libcss - old style)"
 if test "$_css" = auto ; then
@@ -4242,6 +4248,7 @@ LIRC_LIB = $_ld_lirc
 CSS_USE = $_css
 CSS_LIB = $_ld_css
 DVDKIT = $_dvdkit
+DVDKIT2 = $_dvdkit2
 DVDKIT_SHARED = no
 SDL_INC = $_inc_sdl
 W32_DEP = $_dep_win32