Sync autofoo

Makefile.in

@@ -295,8 +295,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -355,6 +353,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

backend/Makefile.in

@@ -1752,7 +1752,8 @@ ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-	-I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\""
+	-I$(top_srcdir)/include $(USB_CFLAGS) \
+	-DLIBDIR="\"$(libdir)/sane\""
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS)
 AR = @AR@
@@ -1815,8 +1816,6 @@ LIBS = @LIBS@
 
 # LIBTOOL install is a little to noisy for my liking.
 LIBTOOL = @LIBTOOL@ --silent
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -1875,6 +1874,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

configure

@@ -659,8 +659,7 @@ configdir
 locksanedir
 SCSI_LIBS
 USB_LIBS
-LIBUSB_1_0_LIBS
+USB_CFLAGS
-LIBUSB_1_0_CFLAGS
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
 SOCKET_LIBS
@@ -864,8 +863,7 @@ with_v4l
 enable_avahi
 with_snmp
 with_systemd
-enable_libusb_1_0
+with_usb
-enable_libusb
 enable_scsibuffersize
 enable_scsi_directio
 enable_ipv6
@@ -894,8 +892,8 @@ AVAHI_CFLAGS
 AVAHI_LIBS
 SYSTEMD_CFLAGS
 SYSTEMD_LIBS
-LIBUSB_1_0_CFLAGS
+USB_CFLAGS
-LIBUSB_1_0_LIBS
+USB_LIBS
 BACKENDS
 PRELOADABLE_BACKENDS'
 
@@ -1539,8 +1537,6 @@ Optional Features:
   --enable-locking        activate device locking (default=yes, but only used
                           by some backends)
   --enable-avahi          enable Avahi support for saned and the net backend
-  --enable-libusb_1_0     enable libusb-1.0 support if available
-  --disable-libusb        disable support for USB in SANE
   --enable-scsibuffersize=N
                           specify the default size in bytes of the buffer for
                           SCSI commands [default=131072]
@@ -1576,6 +1572,7 @@ Optional Packages:
   --with-v4l              include the v4l backend [default=yes]
   --with-snmp             enable SNMP support [default=yes]
   --with-systemd          enable systemd support [default=yes]
+  --with-usb              enable USB support [default=check]
   --with-lockdir=DIR      set SANE lockdir [localstatedir/lock/sane]
 
 Some influential environment variables:
@@ -1602,10 +1599,8 @@ Some influential environment variables:
               C compiler flags for SYSTEMD, overriding pkg-config
   SYSTEMD_LIBS
               linker flags for SYSTEMD, overriding pkg-config
-  LIBUSB_1_0_CFLAGS
+  USB_CFLAGS  C compiler flags for USB, overriding pkg-config
-              C compiler flags for LIBUSB_1_0, overriding pkg-config
+  USB_LIBS    linker flags for USB, overriding pkg-config
-  LIBUSB_1_0_LIBS
-              linker flags for LIBUSB_1_0, overriding pkg-config
   BACKENDS    list of backends to compile
   PRELOADABLE_BACKENDS
               list of backends to preload into single DLL
@@ -19534,43 +19529,27 @@ $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
 fi
 
 
-# Check whether --enable-libusb_1_0 was given.
+
-if test "${enable_libusb_1_0+set}" = set; then :
+# Check whether --with-usb was given.
-  enableval=$enable_libusb_1_0; enable_libusb_1_0=$enableval
+if test "${with_usb+set}" = set; then :
+  withval=$with_usb;
 else
-  enable_libusb_1_0=no
+  with_usb=check
 fi
 
-
+if test xno != "x$with_usb"; then :
-# Check whether --enable-libusb was given.
+  have_usb=no
-if test "${enable_libusb+set}" = set; then :
+   case x$host_os in #(
-  enableval=$enable_libusb;
+      beos*) :
-else
+    ac_fn_c_check_header_mongrel "$LINENO" "be/drivers/USB_scanner.h" "ac_cv_header_be_drivers_USB_scanner_h" "$ac_includes_default"
-  enable_libusb=auto
-fi
-
-HAVE_USB=no
-if test "$enable_libusb" != "no"; then
-  case ${host_os} in
-  beos*)
-  for ac_header in be/drivers/USB_scanner.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "be/drivers/USB_scanner.h" "ac_cv_header_be_drivers_USB_scanner_h" "$ac_includes_default"
 if test "x$ac_cv_header_be_drivers_USB_scanner_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
+  have_usb=yes
-#define HAVE_BE_DRIVERS_USB_SCANNER_H 1
-_ACEOF
- HAVE_USB=yes
-else
-  as_fn_error $? "USB_scanner.h is required on BeOS" "$LINENO" 5
 fi
 
-done
+ ;; #(
-
+  os2*) :
-  ;;
+    ac_fn_c_check_header_compile "$LINENO" "usbcalls.h" "ac_cv_header_usbcalls_h" "#include <usb.h>
-  os2*)
+         #include <os2.h>
-  ac_fn_c_check_header_compile "$LINENO" "usbcalls.h" "ac_cv_header_usbcalls_h" "#include <usb.h>
-#include <os2.h>
 
 "
 if test "x$ac_cv_header_usbcalls_h" = xyes; then :
@@ -19611,32 +19590,35 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usbcall_UsbQueryNumberDevices" >&5
 $as_echo "$ac_cv_lib_usbcall_UsbQueryNumberDevices" >&6; }
 if test "x$ac_cv_lib_usbcall_UsbQueryNumberDevices" = xyes; then :
-  USB_LIBS="$USB_LIBS -lusbcall"
+  USB_LIBS="-lusbcall"
-				HAVE_USB=yes
+           have_usb=yes
-fi
+
+$as_echo "#define HAVE_USBCALLS 1" >>confdefs.h
+
 
 fi
 
 
-  ;;
+fi
-  *)
+
-    have_libusb_1_0=no
+
-  if test "$enable_libusb_1_0" = "yes"; then
+       ;; #(
+  *) :
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUSB_1_0" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5
-$as_echo_n "checking for LIBUSB_1_0... " >&6; }
+$as_echo_n "checking for USB... " >&6; }
 
-if test -n "$LIBUSB_1_0_CFLAGS"; then
+if test -n "$USB_CFLAGS"; then
-    pkg_cv_LIBUSB_1_0_CFLAGS="$LIBUSB_1_0_CFLAGS"
+    pkg_cv_USB_CFLAGS="$USB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libusb-1.0 >= 1.0.0 \""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libusb-1.0 >= 1.0.0 ") 2>&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBUSB_1_0_CFLAGS=`$PKG_CONFIG --cflags " libusb-1.0 >= 1.0.0 " 2>/dev/null`
+  pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19644,16 +19626,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBUSB_1_0_LIBS"; then
+if test -n "$USB_LIBS"; then
-    pkg_cv_LIBUSB_1_0_LIBS="$LIBUSB_1_0_LIBS"
+    pkg_cv_USB_LIBS="$USB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libusb-1.0 >= 1.0.0 \""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libusb-1.0 >= 1.0.0 ") 2>&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBUSB_1_0_LIBS=`$PKG_CONFIG --libs " libusb-1.0 >= 1.0.0 " 2>/dev/null`
+  pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb-1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19674,34 +19656,73 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libusb-1.0 >= 1.0.0 " 2>&1`
+	        USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb-1.0" 2>&1`
         else
-	        LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libusb-1.0 >= 1.0.0 " 2>&1`
+	        USB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb-1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$LIBUSB_1_0_PKG_ERRORS" >&5
+	echo "$USB_PKG_ERRORS" >&5
 
-	have_libusb_1_0=no
+
-elif test $pkg_failed = untried; then
+pkg_failed=no
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5
-$as_echo "no" >&6; }
+$as_echo_n "checking for USB... " >&6; }
-	have_libusb_1_0=no
+
+if test -n "$USB_CFLAGS"; then
+    pkg_cv_USB_CFLAGS="$USB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-	LIBUSB_1_0_CFLAGS=$pkg_cv_LIBUSB_1_0_CFLAGS
+  pkg_failed=yes
-	LIBUSB_1_0_LIBS=$pkg_cv_LIBUSB_1_0_LIBS
+fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ else
-$as_echo "yes" >&6; }
+    pkg_failed=untried
-	have_libusb_1_0=yes
+fi
+if test -n "$USB_LIBS"; then
+    pkg_cv_USB_LIBS="$USB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
-    if test "$have_libusb_1_0" = "yes"; then
-      AM_CFLAGS="$AM_CFLAGS $LIBUSB_1_0_CFLAGS"
-      USB_LIBS="$USB_LIBS $LIBUSB_1_0_LIBS"
-      HAVE_USB=yes
-    fi
-  fi
 
-  if test "$have_libusb_1_0" = "no"; then
+
-            ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        else
+	        USB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$USB_PKG_ERRORS" >&5
+
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
 if test "x$ac_cv_header_usb_h" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
 $as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
@@ -19740,14 +19761,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
 $as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
 if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
-  USB_LIBS="$USB_LIBS -lusb"
+  USB_LIBS="-lusb"
-                                  HAVE_USB=yes
+             have_usb=yes
+
 fi
 
 fi
 
 
-    for ac_header in lusb0_usb.h
+         for ac_header in lusb0_usb.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
 if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
@@ -19791,42 +19813,430 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
 $as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
 if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
-  USB_LIBS="$USB_LIBS -lusb"
+  USB_LIBS="-lusb"
-				   HAVE_USB=yes
+              have_usb=yes
+
 fi
 
 fi
 
 done
 
-  fi
+
-  ;;
+elif test $pkg_failed = untried; then
-  esac
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
 fi
-if test "$enable_libusb" = "yes" && test "$HAVE_USB" = "no"; then
+rm -f core conftest.err conftest.$ac_objext \
-  as_fn_error $? "USB support requested but required libraries not found." "$LINENO" 5
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-if test "$HAVE_USB" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
-  case ${host_os} in
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
-  os2*)
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+             have_usb=yes
 
-$as_echo "#define HAVE_USBCALLS 1" >>confdefs.h
+fi
 
-  ;;
+fi
-  *)
-  if test "$have_libusb_1_0" = "yes"; then
 
-$as_echo "#define HAVE_LIBUSB_1_0 1" >>confdefs.h
 
-  else
+         for ac_header in lusb0_usb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LUSB0_USB_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+              have_usb=yes
+
+fi
+
+fi
+
+done
+
+
+else
+	USB_CFLAGS=$pkg_cv_USB_CFLAGS
+	USB_LIBS=$pkg_cv_USB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBUSB_LEGACY 1" >>confdefs.h
+
+         have_usb=yes
+
+fi
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5
+$as_echo_n "checking for USB... " >&6; }
+
+if test -n "$USB_CFLAGS"; then
+    pkg_cv_USB_CFLAGS="$USB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$USB_LIBS"; then
+    pkg_cv_USB_LIBS="$USB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        else
+	        USB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$USB_PKG_ERRORS" >&5
+
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+             have_usb=yes
+
+fi
+
+fi
+
+
+         for ac_header in lusb0_usb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LUSB0_USB_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+              have_usb=yes
+
+fi
+
+fi
+
+done
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+             have_usb=yes
+
+fi
+
+fi
+
+
+         for ac_header in lusb0_usb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LUSB0_USB_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+              have_usb=yes
+
+fi
+
+fi
+
+done
+
+
+else
+	USB_CFLAGS=$pkg_cv_USB_CFLAGS
+	USB_LIBS=$pkg_cv_USB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBUSB_LEGACY 1" >>confdefs.h
+
+         have_usb=yes
+
+fi
+
+else
+	USB_CFLAGS=$pkg_cv_USB_CFLAGS
+	USB_LIBS=$pkg_cv_USB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
 
-  fi
+       have_usb=yes
-  ;;
-  esac
-fi
 
+fi
+     ;;
+esac
+
+fi
+if test xyes = "x$with_usb" && test xyes != have_usb; then :
+  as_fn_error $? "USB support requested but required libraries not found." "$LINENO" 5
+
+fi
 
 
 
@@ -23778,10 +24188,10 @@ if test "$SELECTED_BACKENDS" != "" ; then
   echo "*** connected to your local computer won't be supported.  Only a network"
   echo "*** connection to a remote host is possible."
 fi
-if test "$enable_libusb" != "no" && test "$HAVE_USB" != "yes" ; then
+if test "$with_usb" != "no" && test "$have_usb" != "yes" ; then
-  echo "*** Warning: sane-backends will be built without libusb support.  There may"
+  echo "*** Warning: sane-backends will be built without USB support.  There may"
   echo "*** be valid reasons to do so, e.g. if you don't use USB scanners or on"
-  echo "*** platforms without libusb support but generally this means that you"
+  echo "*** platforms without USB support but generally this means that you"
   echo "*** can't use USB devices with SANE. The most probable cause is that"
   if test "${ac_cv_header_usb_h}" != "yes"; then
     echo "*** the libusb header file usb.h is not installed. If you use Linux"

doc/Makefile.in

@@ -222,8 +222,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -282,6 +280,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

frontend/Makefile.in

@@ -253,8 +253,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -313,6 +311,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

include/Makefile.in

@@ -231,8 +231,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -291,6 +289,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

include/sane/config.h.in

@@ -50,9 +50,6 @@
 /* Define to 1 if you have the `atexit' function. */
 #undef HAVE_ATEXIT
 
-/* Define to 1 if you have the <be/drivers/USB_scanner.h> header file. */
-#undef HAVE_BE_DRIVERS_USB_SCANNER_H
-
 /* Define to 1 if you have the <be/kernel/OS.h> header file. */
 #undef HAVE_BE_KERNEL_OS_H
 
@@ -199,11 +196,11 @@
 /* Define to 1 if you have the net-snmp library. */
 #undef HAVE_LIBSNMP
 
-/* Define to 1 if you have libusb. */
+/* Define to 1 if you have libusb-1.0 */
 #undef HAVE_LIBUSB
 
-/* Define to 1 if you have libusb-1.0. */
+/* Define to 1 if you have libusb-0.1 */
-#undef HAVE_LIBUSB_1_0
+#undef HAVE_LIBUSB_LEGACY
 
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H

japi/Makefile.in

@@ -275,8 +275,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -335,6 +333,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

lib/Makefile.in

@@ -80,10 +80,10 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = lib
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs alloca.c getenv.c strndup.c \
+	$(top_srcdir)/mkinstalldirs alloca.c sigprocmask.c inet_pton.c \
-	strdup.c isfdtype.c usleep.c inet_pton.c inet_ntop.c \
+	usleep.c isfdtype.c snprintf.c vsyslog.c getopt1.c strsep.c \
-	snprintf.c vsyslog.c syslog.c getopt1.c strsep.c getopt.c \
+	strndup.c strcasestr.c getopt.c syslog.c sleep.c getenv.c \
-	sleep.c sigprocmask.c strcasestr.c $(top_srcdir)/depcomp
+	inet_ntop.c strdup.c $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
@@ -236,8 +236,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -296,6 +294,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

sanei/Makefile.in

@@ -187,7 +187,7 @@ ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include $(USB_CFLAGS)
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
@@ -248,8 +248,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -308,6 +306,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

testsuite/Makefile.in

@@ -243,8 +243,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -303,6 +301,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

testsuite/sanei/Makefile.in

@@ -399,7 +399,7 @@ ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include $(USB_CFLAGS)
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
@@ -460,8 +460,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -520,6 +518,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

testsuite/tools/Makefile.in

@@ -183,8 +183,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -243,6 +241,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@

tools/Makefile.in

@@ -229,7 +229,7 @@ ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include $(USB_CFLAGS)
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
@@ -290,8 +290,6 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
@@ -350,6 +348,7 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@