]> git.sesse.net Git - vlc/commitdiff
move dvdcss checks after dvdread and dvdnav
authorRafaël Carré <funman@videolan.org>
Fri, 25 Nov 2011 00:35:35 +0000 (19:35 -0500)
committerRafaël Carré <funman@videolan.org>
Fri, 25 Nov 2011 00:35:35 +0000 (19:35 -0500)
Else dvdread libs end up being "-ldvdcss .. -ldvdread"

configure.ac

index 477f106c3637e2d2f9ccfb53821c4c8852b6dfd8..aa014498269cf80e7854e7219544172ce0624c21 100644 (file)
@@ -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