Skip to content

V
vlc-2-2
Commit e6ea3dd1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

dvdread headers can be in libdvdread now...

parent d8f0bf5a
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
configure.ac
View file @ e6ea3dd1
...@@ -2042,6 +2042,10 @@ then ...@@ -2042,6 +2042,10 @@ then
if test -z "${with_dvdread_tree}" if test -z "${with_dvdread_tree}"
then then
AC_CHECK_HEADERS(dvdread/dvd_reader.h, AC_CHECK_HEADERS(dvdread/dvd_reader.h,
[ VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
],[
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 ${LIBS_dvdcss}])
],[ ],[
...@@ -2050,6 +2054,7 @@ then ...@@ -2050,6 +2054,7 @@ then
AC_MSG_ERROR([cannot find libdvdread headers]) AC_MSG_ERROR([cannot find libdvdread headers])
fi fi
]) ])
])
else else
AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree})
real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`"
......
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