You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.1 KiB

  1. --- a/Makefile.am
  2. +++ b/Makefile.am
  3. @@ -110,7 +110,7 @@ libhpmud_la_SOURCES += io/hpmud/musb_lib
  4. libhpmud_la_LDFLAGS += -lusb
  5. else
  6. libhpmud_la_SOURCES += io/hpmud/musb.c
  7. -libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0
  8. +libhpmud_la_CFLAGS += ${LIBUSB_1_0_CFLAGS}
  9. libhpmud_la_LDFLAGS += -lusb-1.0
  10. endif
  11. @@ -363,7 +363,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove
  12. endif
  13. if !LIBUSB01_BUILD
  14. -hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0
  15. +hpmudext_la_CFLAGS += ${LIBUSB_1_0_CFLAGS}
  16. endif
  17. endif #!HPLIP_CLASS_DRIVER
  18. # ui (qt3)
  19. --- a/configure.in
  20. +++ b/configure.in
  21. @@ -611,6 +611,10 @@ if test "$class_driver" = "no" && test "
  22. else
  23. AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
  24. AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])
  25. + PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ], have_libusb_1_0=yes, have_libusb_1_0=no)
  26. + if test "$have_libusb_1_0" = "yes"; then
  27. + CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS"
  28. + fi
  29. fi
  30. fi