Remove automagic dependency on v4l.

merge-requests/1/head
Christopher Brannon 2013-08-08 08:26:34 -07:00 zatwierdzone przez m. allan noah
rodzic dbbcb61f09
commit 0c6e905c62
1 zmienionych plików z 12 dodań i 3 usunięć

Wyświetl plik

@ -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