changeset 22980:c0dd8f3f3c45

Report if internal, external of dvdnav version of dvdread is used. patch by Yaroslav, yar_tour mail ru
author diego
date Sun, 15 Apr 2007 12:06:48 +0000
parents 28bb83a01246
children b94b8f835d97
files configure
diffstat 1 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Apr 15 11:56:52 2007 +0000
+++ b/configure	Sun Apr 15 12:06:48 2007 +0000
@@ -5266,13 +5266,19 @@
 if test "$_dvdread_internal" = yes; then
   _def_dvdread_internal="#define USE_DVDREAD_INTERNAL 1"
   _def_dvdread='#define USE_DVDREAD 1'
-  _inputmodules="dvdread $_inputmodules"
+  _inputmodules="dvdread(internal) $_inputmodules"
   _largefiles=yes
 elif test "$_dvdread" = yes; then
   _def_dvdread='#define USE_DVDREAD 1'
-  _inputmodules="dvdread $_inputmodules"
   _largefiles=yes
-  test "$_dvdnav" != yes && _ld_extra="$_ld_extra -ldvdread"
+  if test "$_dvdnav" != yes; then
+    _ld_extra="$_ld_extra -ldvdread"
+    _inputmodules="dvdread(external) $_inputmodules"
+    _res_comment="external"
+  else
+    _inputmodules="dvdread(from dvdnav) $_inputmodules"
+    _res_comment="from dvdnav"
+  fi
 else
   _def_dvdread_internal="#undef USE_DVDREAD_INTERNAL"
   _def_dvdread='#undef USE_DVDREAD'
@@ -5296,10 +5302,10 @@
     _def_dvd_darwin='#define DARWIN_DVD_IOCTL'
     _ld_extra="$_ld_extra -framework IOKit"
   fi
-  _inputmodules="libdvdcss $_inputmodules"
+  _inputmodules="libdvdcss(internal) $_inputmodules"
   _largefiles=yes
 else
-  _noinputmodules="libdvdcss $_noinputmodules"
+  _noinputmodules="libdvdcss(internal) $_noinputmodules"
 fi
 echores "$_libdvdcss_internal"