From 0c6e905c62130d9dfd06c8f220d2ddc4bdbe8ccb Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Thu, 8 Aug 2013 08:26:34 -0700 Subject: [PATCH] Remove automagic dependency on v4l. --- configure.in | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 8c3d2557e..3bff946d8 100644 --- a/configure.in +++ b/configure.in @@ -129,9 +129,15 @@ SANE_CHECK_LOCKING SANE_CHECK_GPHOTO2 -PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) -AC_SUBST(LIBV4L_LIBS) -AC_SUBST(LIBV4L_CFLAGS) +AC_ARG_WITH(v4l, + AC_HELP_STRING([--with-v4l], + [include the v4l backend @<:@default=yes@:>@]), + [# If --with-v4l=no or --without-v4l, disable backend + # as "$with_v4l" will be set to "no"]) + +if test "$with_v4l" != "no" ; then + PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) +fi AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable Avahi support for saned and the net backend]), @@ -634,6 +640,9 @@ fi SANE_CHECK_BACKENDS +AC_SUBST(LIBV4L_LIBS) +AC_SUBST(LIBV4L_CFLAGS) + if test "${sane_cv_use_libjpeg}" = "yes"; then SANEI_SANEI_JPEG_LO="../sanei/sanei_jpeg.lo" fi