Commit 848415bb authored by Daniel Mierswa's avatar Daniel Mierswa Committed by Rémi Denis-Courmont

No longer use LIBS_dvdcss, add dvdcss stuff where needed.

LIBS_dvdcss is vague since it's not it's own module but rather just
accidently set on bsdi systems. Just do the check in the modules that
need the hack now.
Signed-off-by: default avatarDaniel Mierswa <impulze@impulze.org>
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent b3d1041d
...@@ -175,7 +175,7 @@ case "${host_os}" in ...@@ -175,7 +175,7 @@ case "${host_os}" in
bsdi*) bsdi*)
SYS=bsdi SYS=bsdi
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx],[-ldvd]) VLC_ADD_LIBS([dvd vcd cdda vcdx],[-ldvd])
;; ;;
*bsd*) *bsd*)
SYS="${host_os}" SYS="${host_os}"
...@@ -1870,10 +1870,8 @@ then ...@@ -1870,10 +1870,8 @@ then
AC_ARG_WITH(dvdread-tree, AC_ARG_WITH(dvdread-tree,
[ --with-dvdread-tree=PATH libdvdread tree for static linking]) [ --with-dvdread-tree=PATH libdvdread tree for static linking])
dnl Temporary hack (yeah, sure ;) dnl prepend -ldvdcss on OS that need it
if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
VLC_ADD_LIBS([dvdread],[-ldvdcss])
fi
if test -z "${with_dvdread}" if test -z "${with_dvdread}"
then then
...@@ -1881,11 +1879,11 @@ then ...@@ -1881,11 +1879,11 @@ then
then then
AC_CHECK_HEADERS(dvdread/dvd_reader.h, AC_CHECK_HEADERS(dvdread/dvd_reader.h,
[ VLC_ADD_PLUGIN([dvdread]) [ VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}]) VLC_ADD_LIBS([dvdread],[-ldvdread])
],[ ],[
AC_CHECK_HEADERS(libdvdread/dvd_reader.h, AC_CHECK_HEADERS(libdvdread/dvd_reader.h,
[ VLC_ADD_PLUGIN([dvdread]) [ VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}]) VLC_ADD_LIBS([dvdread],[-ldvdread])
],[ ],[
if test -n "${enable_dvdread}" if test -n "${enable_dvdread}"
then then
...@@ -1907,7 +1905,7 @@ then ...@@ -1907,7 +1905,7 @@ then
dnl Use a custom libdvdread dnl Use a custom libdvdread
AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
VLC_ADD_PLUGIN([dvdread]) VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LIBS_dvdcss}]) VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread])
VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}])
else else
dnl The given libdvdread wasn't built dnl The given libdvdread wasn't built
...@@ -1922,7 +1920,7 @@ then ...@@ -1922,7 +1920,7 @@ then
dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([dvdread]) VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LIBS_dvdcss}]) VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread])
VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include])
else else
dnl No libdvdread could be found, sorry dnl No libdvdread could be found, sorry
...@@ -1930,6 +1928,9 @@ then ...@@ -1930,6 +1928,9 @@ then
AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h]) AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h])
fi fi
fi fi
dnl append -ldvd on OS that need it
AS_CASE(["${SYS}"], [bsdi], [VLC_ADD_LIBS([dvdread], [-ldvd])])
fi fi
dnl dnl
...@@ -1939,10 +1940,8 @@ AC_ARG_ENABLE(dvdnav, ...@@ -1939,10 +1940,8 @@ AC_ARG_ENABLE(dvdnav,
[ --enable-dvdnav dvdnav input module (default enabled)]) [ --enable-dvdnav dvdnav input module (default enabled)])
if test "${enable_dvdnav}" != "no" if test "${enable_dvdnav}" != "no"
then then
dnl Same hack than dvdread dnl prepend -ldvdcss on OS that need it
if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])])
VLC_ADD_LIBS([dvdnav],[-ldvdcss])
fi
DVDNAV_PATH="${PATH}" DVDNAV_PATH="${PATH}"
AC_ARG_WITH(dvdnav-config-path, AC_ARG_WITH(dvdnav-config-path,
......
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