[Mplayer-cvslog] CVS: main configure,1.538,1.539

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv28082

Modified Files:
	configure 
Log Message:
prefer libmpdvdkit2 over v1


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539
--- configure	15 Aug 2002 22:52:50 -0000	1.538
+++ configure	16 Aug 2002 23:04:29 -0000	1.539
@@ -3011,13 +3011,19 @@
 if test "$_dvdkit" = auto ; then
  _dvdkit=no
  if linux || freebsd || netbsd || darwin || cygwin; then
+  test -f "./libmpdvdkit2/Makefile" && _dvdkit=yes
   test -f "./libmpdvdkit/Makefile" && _dvdkit=yes
  fi
 fi
 if test "$_dvdkit" = yes ; then
   if test "$_dvd" = yes || test "$_cdrom" = yes || test "$_cdio" = yes || test "$_dvdio" = yes || test "$_bdsi_dvd" = yes || cygwin; then
+   if test -f "./libmpdvdkit2/Makefile" ; then
+    _inputmodules="mpdvdkit2 $_inputmodules"
+    _dvdread=libmpdvdkit2
+   else
     _inputmodules="mpdvdkit $_inputmodules"
-    _dvdread=included
+    _dvdread=libmpdvdkit
+   fi
   else
     _noinputmodules="mpdvdkit $_noinputmodules"
   fi
@@ -3087,13 +3093,21 @@
 	_noinputmodules="dvdread $_noinputmodules"
 	echores "no"
 	;;
-  included)
+  libmpdvdkit)
 	_largefiles=yes
 	_def_dvdread='#define USE_DVDREAD 1'
 	_ld_css='-Llibmpdvdkit -lmpdvdkit'
 	_noinputmodules="dvdread $_noinputmodules"
 	_def_mpdvdkit="#define USE_MPDVDKIT 1"
 	echores "disabled by libmpdvdkit"
+	;;
+  libmpdvdkit2)
+	_largefiles=yes
+	_def_dvdread='#define USE_DVDREAD 1'
+	_ld_css='-Llibmpdvdkit2 -lmpdvdkit'
+	_noinputmodules="dvdread $_noinputmodules"
+	_def_mpdvdkit="#define USE_MPDVDKIT 2"
+	echores "disabled by libmpdvdkit2"
 	;;
 esac