Skip to content

V
vlc-2-2
Commit 913a9a9a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Restore --disable-libv4l2 for packagers

parent 6b935f4f
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
configure.ac
View file @ 913a9a9a
...@@ -1950,6 +1950,8 @@ fi ...@@ -1950,6 +1950,8 @@ fi
dnl dnl
dnl Video4Linux 2 dnl Video4Linux 2
dnl dnl
AC_ARG_ENABLE(libv4l2, [AS_HELP_STRING([--disable-libv4l2],
[disable userspace V4L2 library (default auto)])])
AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr], AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
[support PVR V4L2 cards (default disabled)])]) [support PVR V4L2 cards (default disabled)])])
have_v4l2="no" have_v4l2="no"
...@@ -1957,10 +1959,12 @@ AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ ...@@ -1957,10 +1959,12 @@ AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
have_v4l2="yes" have_v4l2="yes"
]) ])
AS_IF([test "$have_v4l2" = "yes"], [ AS_IF([test "$have_v4l2" = "yes"], [
AS_IF([test "${enable_libv4l2}" != "no"], [
PKG_CHECK_MODULES(LIBV4L2, libv4l2, [ PKG_CHECK_MODULES(LIBV4L2, libv4l2, [
AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available]) AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available])
], [ ], [
AC_MSG_WARN([libv4l2 development headers were not found]) AC_MSG_WARN([${LIBV4L2_PKG_ERRORS}])
])
]) ])
AS_IF([test "${enable_pvr}" = "yes"], [ AS_IF([test "${enable_pvr}" = "yes"], [
VLC_ADD_PLUGIN([pvr]) VLC_ADD_PLUGIN([pvr])
......
Markdown is supported
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