0001_pkgconfig_libusb.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. ---
  2. configure.in | 35 +++++++++++------------------------
  3. 1 file changed, 11 insertions(+), 24 deletions(-)
  4. --- a/configure.in
  5. +++ b/configure.in
  6. @@ -8,30 +8,17 @@
  7. AM_PROG_LIBTOOL
  8. AC_PROG_CXX
  9. -dnl check for libusb-config
  10. -AC_CHECK_TOOL(HAVELIBUSB, libusb-config)
  11. -
  12. -if test ! -z "$HAVELIBUSB"; then
  13. - LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
  14. - LIBUSB_LIBS=`$HAVELIBUSB --libs`
  15. -
  16. - CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
  17. - LIBS="$LIBS $LIBUSB_LIBS"
  18. -else
  19. - AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.])
  20. -fi
  21. -
  22. -dnl check for version of libusb
  23. -AC_MSG_CHECKING([if libusb version is >= 0.1.7])
  24. -libusb_version_needed="1007"
  25. -libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
  26. +dnl check for libusb
  27. +PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
  28. +CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
  29. +LIBS="$LIBS $LIBUSB_LIBS"
  30. -if test $libusb_version -lt $libusb_version_needed; then
  31. - AC_MSG_RESULT(no)
  32. - AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.])
  33. -else
  34. - AC_MSG_RESULT(yes)
  35. -fi
  36. +dnl Check for recent pkg-config which supports Requires.private
  37. +case `$PKG_CONFIG --version` in
  38. +0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;;
  39. +*) PKGCONFIG_REQUIRES="Requires.private"; ;;
  40. +esac
  41. +AC_SUBST(PKGCONFIG_REQUIRES)
  42. ENABLE_ASYNC_MODE=0
  43. AC_ARG_WITH(async-mode,