Fix linking with libv4l2

diff --git a/configure.ac b/configure.ac
index 063ca378b7a2d738def6609ddb7bf2ccf0718b51..693c386604b077f0f76f5a721e103f244657a617 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2009,7 +2009,7 @@ AC_ARG_ENABLE(libv4l2,
 if test "${enable_libv4l2}" != "no" -a "${enable_v4l2}" != "no"
 then
     PKG_CHECK_MODULES( LIBV4L2, libv4l2, [
-      VLC_ADD_LDFLAGS([v4l2],[${LIBV4L2_LIBS}])
+      VLC_ADD_LIBS([v4l2],[${LIBV4L2_LIBS}])
       VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}])
       AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)],
       AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found])

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index bcedcfd1c3f854fca2bf9fa28a8ce3605f25442a..4e006e4cef50be7b4b1b5aa25e9ad7a41f4449b7 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -123,8 +123,8 @@ libaccess_shm_plugin_la_DEPENDENCIES =
 libvlc_LTLIBRARIES += $(LTLIBaccess_shm)
 
 libv4l2_plugin_la_SOURCES = v4l2.c
-libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS)
-libv4l2_plugin_la_LIBADD = $(AM_LIBADD)
+libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_v4L2)
+libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LDFLAGS_v4l2)
 libv4l2_plugin_la_DEPENDENCIES =
 if HAVE_V4L2
 libvlc_LTLIBRARIES += libv4l2_plugin.la