diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-29 18:36:36 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-29 18:36:36 +0000 |
| commit | 81e86315a6966e172f4988f8925f830e01072c53 (patch) | |
| tree | b15f4c911fa8f6eeeeced9dd92d91b31ad87fbd2 | |
| parent | 392689a404398eb48005f519b187341fd1f91dec (diff) | |
| download | xine-lib-81e86315a6966e172f4988f8925f830e01072c53.tar.gz xine-lib-81e86315a6966e172f4988f8925f830e01072c53.tar.bz2 | |
Link the v4l2 plugin with libv4l2 (if required); use pkgconfig to locate it.
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/input/Makefile.am | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6ca597502..01d0a5eb6 100644 --- a/configure.ac +++ b/configure.ac @@ -694,11 +694,14 @@ dnl ---------------------------------------------- AC_ARG_ENABLE([libv4l], AS_HELP_STRING([--disable-libv4l], [do not build with libv4l support])) -if test "x$enable_libv4l" != "xno"; then - AC_CHECK_HEADERS([libv4l2.h], [have_libv4l=yes], [have_libv4l=no]) - if test "x$enable_libv4l" = "xyes" && test "x$have_libv4l" = "xno"; then - AC_MSG_ERROR([libv4l requested but not found.]) - fi +if test "x$have_v4l" = xyes; then + have_libv4l=no + PKG_CHECK_MODULES([V4L2], [libv4l2], + [have_libv4l=yes + AC_DEFINE([HAVE_LIBV4L2_H], [1], [Define this if you have libv4l installed])]) + if test "x$enable_libv4l" = "xyes" && test "x$have_libv4l" = "xno"; then + AC_MSG_ERROR([libv4l requested but not found.]) + fi fi diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 3c700ea46..1c34f9aaa 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -141,8 +141,8 @@ xineplug_inp_v4l_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module xineplug_inp_v4l2_la_SOURCES = input_v4l2.c -xineplug_inp_v4l2_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) -xineplug_inp_v4l2_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) +xineplug_inp_v4l2_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(LTLIBINTL) $(V4L2_LIBS) +xineplug_inp_v4l2_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(V4L2_CFLAGS) xineplug_inp_v4l2_la_LDFLAGS = -avoid-version -module xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c |