Zebediah Figura : configure: Check for a recent enough version of libusb.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 106d803db1962bdc7a9161d9a88ef88bb4fd0d09
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=106d803db1962bdc7a9161d9a...

Author: Zebediah Figura 
Date:   Tue Apr 21 23:55:12 2020 -0500

configure: Check for a recent enough version of libusb.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

configure    | 26 +++++++++++++-------------
 configure.ac |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 6c4a5f21b5..0b411702a7 100755
--- a/configure
+++ b/configure
@@ -13941,9 +13941,9 @@ ac_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $USB_CFLAGS"
 ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default"
 if test "x$ac_cv_header_libusb_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5
-$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; }
-if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_interrupt_event_handler in -lusb-1.0" >&5
+$as_echo_n "checking for libusb_interrupt_event_handler in -lusb-1.0... " >&6; }
+if ${ac_cv_lib_usb_1_0_libusb_interrupt_event_handler+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13957,27 +13957,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char libusb_init ();
+char libusb_interrupt_event_handler ();
 int
 main ()
 {
-return libusb_init ();
+return libusb_interrupt_event_handler ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_usb_1_0_libusb_init=yes
+  ac_cv_lib_usb_1_0_libusb_interrupt_event_handler=yes
 else
-  ac_cv_lib_usb_1_0_libusb_init=no
+  ac_cv_lib_usb_1_0_libusb_interrupt_event_handler=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_1_0_libusb_init" >&5
-$as_echo "$ac_cv_lib_usb_1_0_libusb_init" >&6; }
-if test "x$ac_cv_lib_usb_1_0_libusb_init" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" >&5
+$as_echo "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" >&6; }
+if test "x$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" = xyes; then :
   :
 else
   USB_LIBS=""
@@ -13993,11 +13993,11 @@ test -z "$USB_CFLAGS" || USB_CFLAGS=`echo " $USB_CFLAGS" | sed 's/ -I([^/])/ -
 test -z "$USB_LIBS" || USB_LIBS=`echo " $USB_LIBS" | sed 's/ -L([^/])/ -L$(top_builddir)/\1/g'`

fi
-if test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"; then :
+if test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"; then :
   case "x$with_usb" in
-  x)   as_fn_append wine_notices "|libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported." ;;
+  x)   as_fn_append wine_notices "|libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported." ;;
   xno) ;;
-  *)   as_fn_error $? "libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported.
+  *)   as_fn_error $? "libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported.
 This is an error since --with-usb was requested." "$LINENO" 5 ;;
 esac
 enable_wineusb_sys=${enable_wineusb_sys:-no}
diff --git a/configure.ac b/configure.ac
index 37e3445a34..00b3f38d4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1480,11 +1480,11 @@ if test "x$with_usb" != "xno"
 then
     WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb-1.0],,,
         [AC_CHECK_HEADER([libusb.h],
-            [AC_CHECK_LIB(usb-1.0,libusb_init,[:],[USB_LIBS=""],[$USB_LIBS])],
+            [AC_CHECK_LIB(usb-1.0,libusb_interrupt_event_handler,[:],[USB_LIBS=""],[$USB_LIBS])],
             [USB_LIBS=""])])
 fi
-WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"],
-                 [libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported.],
+WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"],
+                 [libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported.],
                  [enable_wineusb_sys])

dnl **** Check for libv4l2 ****