Commit 9862639c authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Fix linking with libv4l2

parent c22366aa
...@@ -2009,7 +2009,7 @@ AC_ARG_ENABLE(libv4l2, ...@@ -2009,7 +2009,7 @@ AC_ARG_ENABLE(libv4l2,
if test "${enable_libv4l2}" != "no" -a "${enable_v4l2}" != "no" if test "${enable_libv4l2}" != "no" -a "${enable_v4l2}" != "no"
then then
PKG_CHECK_MODULES( LIBV4L2, libv4l2, [ PKG_CHECK_MODULES( LIBV4L2, libv4l2, [
VLC_ADD_LDFLAGS([v4l2],[${LIBV4L2_LIBS}]) VLC_ADD_LIBS([v4l2],[${LIBV4L2_LIBS}])
VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}]) VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}])
AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)], AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)],
AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found]) AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found])
......
...@@ -123,8 +123,8 @@ libaccess_shm_plugin_la_DEPENDENCIES = ...@@ -123,8 +123,8 @@ libaccess_shm_plugin_la_DEPENDENCIES =
libvlc_LTLIBRARIES += $(LTLIBaccess_shm) libvlc_LTLIBRARIES += $(LTLIBaccess_shm)
libv4l2_plugin_la_SOURCES = v4l2.c libv4l2_plugin_la_SOURCES = v4l2.c
libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_v4L2)
libv4l2_plugin_la_LIBADD = $(AM_LIBADD) libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LDFLAGS_v4l2)
libv4l2_plugin_la_DEPENDENCIES = libv4l2_plugin_la_DEPENDENCIES =
if HAVE_V4L2 if HAVE_V4L2
libvlc_LTLIBRARIES += libv4l2_plugin.la libvlc_LTLIBRARIES += libv4l2_plugin.la
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment