[MPlayer-cvslog] r32493 - trunk/configure

[siretart]

Author: siretart
Date: Fri Oct 15 12:45:19 2010
New Revision: 32493

Log:
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.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Oct 14 11:27:38 2010	(r32492)
+++ trunk/configure	Fri Oct 15 12:45:19 2010	(r32493)
@@ -5892,7 +5892,7 @@ echores "$_dvdread"
 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