summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorsiretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-10-15 10:45:19 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:18:37 +0200
commit1f97094c8d5015722f132f46d463c11be9d378a3 (patch)
treeb976b6043e8b78f27e045eb107f1b36c890cfbbf /configure
parentaa1ac341fc1993330bdc0d6365d3ecd2b6ed98aa (diff)
downloadmpv-1f97094c8d5015722f132f46d463c11be9d378a3.tar.bz2
mpv-1f97094c8d5015722f132f46d463c11be9d378a3.tar.xz
configure: check if libdvdcss has been removed from tree
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32493 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 25dd1286eb..ae75cbbcab 100755
--- a/configure
+++ b/configure
@@ -5581,7 +5581,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