git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/libdvdread.patch

   1 Index: configure.ac
   2 ===================================================================
   3 --- configure.ac        (revision 1162)
   4 +++ configure.ac        (working copy)
   5 @@ -18,7 +18,7 @@
   6  m4_define([dvdread_pre],   [])
   7
   8  AC_INIT([libdvdread], [dvdread_major.dvdread_minor.dvdread_sub[]dvdread_pre])
   9 -AC_CONFIG_SRCDIR([src/dvd_reader.h])
  10 +AC_CONFIG_SRCDIR([src/dvdread/dvd_reader.h])
  11  AM_INIT_AUTOMAKE([1.6])
  12
  13  dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
  14 @@ -137,27 +137,59 @@
  15  dnl ---------------------------------------------
  16  dnl dynamic linker
  17  dnl ---------------------------------------------
  18 -case $host in
  19 -  *mingw32*)
  20 -    CFLAGS="-idirafter \$(top_srcdir)/msvc/include $CFLAGS"
  21 -    LDFLAGS="-no-undefined $LDFLAGS"
  22 -    ;;
  23 -  *cygwin*)
  24 -    LDFLAGS="-no-undefined $LDFLAGS"
  25 -    ;;
  26 -  *os2*)
  27 -    LDFLAGS="-no-undefined -Zbin-files $LDFLAGS"
  28 -    ;;
  29 -  *)
  30 -    AC_CHECK_LIB(c, dlopen,
  31 -                 DYNAMIC_LD_LIBS="",
  32 -                 AC_CHECK_LIB(dl, dlopen,
  33 -                              DYNAMIC_LD_LIBS="-ldl",
  34 -                              AC_MSG_ERROR(dynamic linker needed)))
  35 -    AC_SUBST(DYNAMIC_LD_LIBS)
  36 -    ;;
  37 -esac
  38 +AC_ARG_WITH( [libdvdcss],
  39 +    [  --with-libdvdcss[=PATH]    force linking against libdvdcss],
  40 +    [if test x"$withval" != xno; then
  41 +       link_dvdcss=yes
  42 +     fi
  43 +     if test x"$withval" != xyes; then
  44 +       dvdcss_path=$withval
  45 +     fi])
  46
  47 +if test x"$link_dvdcss" != xyes; then
  48 +dnl dlopen libdvdcss
  49 +  AC_CHECK_FUNC( dlopen,
  50 +    [DL_LIBS="" ],
  51 +    AC_CHECK_LIB( dl, dlopen,
  52 +      [DL_LIBS=-ld ],
  53 +      AC_MSG_ERROR(You need libdl (dlopen))
  54 +    )
  55 +  )
  56 +else
  57 +dnl link with libdvdcss
  58 +  if test -z "$dvdcss_path"; then
  59 +    AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
  60 +      [ CSS_LIBS=-ldvdcss ],
  61 +      AC_MSG_ERROR(You need libdvdcss.so.2 or later)
  62 +    )
  63 +    AC_CHECK_HEADERS(dvdcss/dvdcss.h,
  64 +      [ ],
  65 +      AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
  66 +    )
  67 +  else
  68 +    saved_CFLAGS=$CFLAGS
  69 +    CFLAGS="$CFLAGS -L$dvdcss_path/lib"
  70 +    AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
  71 +      [ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss"
  72 +        CSS_CFLAGS=-I$dvdcss_path/include ],
  73 +      AC_MSG_ERROR(You need libdvdcss.so.2 or later)
  74 +    )
  75 +    CFLAGS=$saved_CFLAGS
  76 +    dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local
  77 +    saved_CPPFLAGS=$CPPFLAGS
  78 +    CPPFLAGS="-w $CPPFLAGS -I$dvdcss_path/include"
  79 +    AC_CHECK_HEADERS(dvdcss/dvdcss.h,
  80 +      [ ],
  81 +      AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
  82 +    )
  83 +    CPPFLAGS=$saved_CPPFLAGS
  84 +  fi
  85 +fi
  86 +
  87 +AC_SUBST(DL_LIBS)
  88 +AC_SUBST(CSS_LIBS)
  89 +AC_SUBST(CSS_CFLAGS)
  90 +
  91  dnl ---------------------------------------------
  92  dnl cflags
  93  dnl ---------------------------------------------