changeset 32407:39e51e95d12b

in auto mode, enable internal libdvdcss only if it is actually available in some scenarios it might make sense to redistribute a copy of the mplayer sources that does not contain the internal libdvdcss copy. In order to not require the configure parameter --disable-libdvdcss-internal, this change checks that the libdvdcss directory actually exists when no particular behavior has been requested.
author siretart
date Fri, 15 Oct 2010 10:45:19 +0000
parents 31424408df79
children d434075eebc8
files configure
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Oct 14 09:27:38 2010 +0000
+++ b/configure	Fri Oct 15 10:45:19 2010 +0000
@@ -5892,7 +5892,7 @@
 echocheck "internal libdvdcss"
 if test "$_libdvdcss_internal" = auto ; then
   _libdvdcss_internal=no
-  test "$_dvdread_internal" = yes && _libdvdcss_internal=yes
+  test "$_dvdread_internal" = yes && test -d libdvdcss && _libdvdcss_internal=yes
   hpux && test "$_hpux_scsi_h" = no && _libdvdcss_internal=no
 fi
 if test "$_libdvdcss_internal" = yes ; then