From fd3f4d2e7072dcf400ac8c7ca6fcf8df41ebd2dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Thu, 24 Nov 2011 19:35:35 -0500 Subject: [PATCH] move dvdcss checks after dvdread and dvdnav Else dvdread libs end up being "-ldvdcss .. -ldvdread" --- configure.ac | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 -- 2.39.2