Return of the 'Old-style-DVD-support', with dynamic loading (using libdl) so

no more conflict with libdvdread: you can compile in both of libdvdread and
libcss support! You can even select libcss.so to load from command line or
configuration file, with '-csslib /usr/local/lib/libcss.so' or something
similar. Default for this option is /usr/local/lib/libcss.so. Note: libcss
version (ver>0.1) with newer API is not supported in this version! This is
the first version so stay tuned :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3976 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 26 insertions, 21 deletions

diff --git a/configure b/configure
index 92a8cf5658..12e24f0dad 100755
--- a/configure
+++ b/configure
@@ -2069,7 +2069,31 @@ else
 fi
 
 
-echocheck "DVD support"
+
+
+echocheck "DVD support (libcss - old style)"
+if test "$_css" = auto ; then
+  cat > $TMPC <<EOF
+#include <types.h>
+#include <css.h>
+int main(void) { (void) CSSisEncrypted(0); return 0; }
+EOF
+  _css=no
+  cc_check -lcss $_ld_dl && _css=yes
+fi
+if test "$_css" = yes ; then
+  _def_css='#define HAVE_LIBCSS 1'
+  test "$_csslibdir" && _ld_css="-L${_csslibdir} $_ld_css"
+  _inputmodules="dvdcss $_inputmodules"
+  _largefiles=yes
+  echores "yes"
+else
+  _def_css='#undef HAVE_LIBCSS'
+  echores "no"
+fi
+
+
+echocheck "DVD support (libdvdread - new style)"
 if test "$_dvdread" = auto ; then
   cat > $TMPC << EOF
 #include <dvdread/dvd_reader.h>
@@ -2085,36 +2109,17 @@ EOF
      _dvdread=yes
   fi
 fi
-if test "$_css" = auto ; then
-  cat > $TMPC <<EOF
-#include <css.h>
-int main(void) { (void) CSSisEncrypted(0); return 0; }
-EOF
-  _css=no
-  cc_check -lcss && _css=yes
-fi
-# dvdread preferred to DeCSS
 if test "$_dvdread" = yes ; then
   _largefiles=yes
   _def_dvdread='#define USE_DVDREAD 1'
-  _def_css='#undef HAVE_LIBCSS'
   _ld_css='-ldvdread'
   _inputmodules="dvdread $_inputmodules"
-  echores "libdvdread"
-elif test "$_css" = yes ; then
-  _def_dvdread='#undef USE_DVDREAD'
-  _def_css='#define HAVE_LIBCSS 1'
-  _ld_css='-lcss'
-  test "$_csslibdir" && _ld_css="-L${_csslibdir} $_ld_css"
-  _inputmodules="dvdcss $_inputmodules"
-  echores "libcss"
+  echores "yes"
 else
   _def_dvdread='#undef USE_DVDREAD'
-  _def_css='#undef HAVE_LIBCSS'
   echores "no"
 fi
 
-
 echocheck "zlib"
 cat > $TMPC << EOF
 #include <zlib.h>