[vlc-commits] Fix linking with libv4l2

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Aug 19 01:40:27 2011 -0400| [9862639cd4bad288fb053b9c4814aa21d9086977] | committer: Rafaël Carré

Fix linking with libv4l2

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9862639cd4bad288fb053b9c4814aa21d9086977
---

 configure.ac              |    2 +-
 modules/access/Modules.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 063ca37..693c386 100644
--- 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 bcedcfd..4e006e4 100644
--- 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