Commit fd3f4d2e authored by Rafaël Carré's avatar Rafaël Carré

move dvdcss checks after dvdread and dvdnav

Else dvdread libs end up being "-ldvdcss .. -ldvdread"
parent fd841791
......@@ -1813,15 +1813,6 @@ dnl dvdread module: check for libdvdread
dnl
PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto])
dnl libdvdcss
darwin_libdvdcss_extralibs="-Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
libdvdcss_extralibs=""
test "${SYS}" = darwin && libdvdcss_extralibs="${darwin_libdvdcss_extralibs}"
AC_CHECK_LIB(dvdcss, dvdcss_interface_2, [
VLC_ADD_LIBS([dvdread], -ldvdcss "${libdvdcss_extralibs}")
VLC_ADD_LIBS([dvdnav], -ldvdcss "${libdvdcss_extralibs}")
],, "${libdvdcss_extralibs}")
dnl
dnl libdvdnav plugin
dnl
......@@ -1843,6 +1834,15 @@ then
[AC_MSG_WARN([${DVDNAV_PKG_ERRORS}.])])
fi
dnl libdvdcss
darwin_libdvdcss_extralibs="-Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
libdvdcss_extralibs=""
test "${SYS}" = darwin && libdvdcss_extralibs="${darwin_libdvdcss_extralibs}"
AC_CHECK_LIB(dvdcss, dvdcss_interface_2, [
VLC_ADD_LIBS([dvdread], -ldvdcss "${libdvdcss_extralibs}")
VLC_ADD_LIBS([dvdnav], -ldvdcss "${libdvdcss_extralibs}")
],, "${libdvdcss_extralibs}")
dnl
dnl Windows DirectShow access module
dnl
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment