From: Rafaël Carré <funman@videolan.org>
Date: Fri, 25 Nov 2011 00:35:35 +0000 (-0500)
Subject: move dvdcss checks after dvdread and dvdnav
X-Git-Tag: 1.3.0-git~79
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fd3f4d2e7072dcf400ac8c7ca6fcf8df41ebd2dd;p=vlc

move dvdcss checks after dvdread and dvdnav

Else dvdread libs end up being "-ldvdcss .. -ldvdread"
---

diff --git a/configure.ac b/configure.ac
index 477f106c36..aa01449826 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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