Contribs: fix libcaca-beta17 linkage on Win32

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 22155b4c15bcb5f9983dfea027a0687836835753..7650adef6b537cb4c738d501a17479ad5c763d9e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1849,12 +1849,9 @@ PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5
 dnl
 dnl dvdread module: check for libdvdread
 dnl
+dnl prepend -ldvdcss on OS that need it
+AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
 PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto])
-if test "${enable_dvdread}" != "no"
-then
-  dnl prepend -ldvdcss on OS that need it
-  AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
-fi
 
 dnl
 dnl libdvdnav plugin
@@ -3636,6 +3633,7 @@ dnl
 dnl UPnP Plugin (Intel SDK)
 dnl
 PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
+VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}])
 
 dnl
 dnl  Interface plugins