demux/mp4: bug fix in trun atom parsing

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index a520c68456df13a96ea8443440b93f022a965a54..aa5cc39a8ae43dc1c096b46f06715a8b8cf5929a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1808,23 +1808,19 @@ if test "$SYS" = "linux" -a "${enable_linsys}" != "no"; then
   )
 fi
 
-dnl
-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])
-    VLC_ADD_LIBS([dvdnav], [-ldvdcss])
-    if test "${SYS}" = darwin; then
-        VLC_ADD_LIBS([dvdread], "${darwin_libdvdcss_extralibs}")
-        VLC_ADD_LIBS([dvdnav], "${darwin_libdvdcss_extralibs}")
-    fi
-    ],, "${darwin_libdvdcss_extralibs}")
+    VLC_ADD_LIBS([dvdread], -ldvdcss "${libdvdcss_extralibs}")
+    VLC_ADD_LIBS([dvdnav], -ldvdcss "${libdvdcss_extralibs}")
+    ],, "${libdvdcss_extralibs}")
+
+dnl
+dnl dvdread module: check for libdvdread
+dnl
+PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto])
 
 dnl
 dnl libdvdnav plugin