| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 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 | |
| 12 | @@ -363,7 +363,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove |
| 13 | endif |
| 14 | |
| 15 | if !LIBUSB01_BUILD |
| 16 | -hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0 |
| 17 | +hpmudext_la_CFLAGS += ${LIBUSB_1_0_CFLAGS} |
| 18 | endif |
| 19 | endif #!HPLIP_CLASS_DRIVER |
| 20 | # ui (qt3) |
| 21 | --- a/configure.in |
| 22 | +++ b/configure.in |
| 23 | @@ -611,6 +611,10 @@ if test "$class_driver" = "no" && test " |
| 24 | else |
| 25 | AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) |
| 26 | AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) |
| 27 | + PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ], have_libusb_1_0=yes, have_libusb_1_0=no) |
| 28 | + if test "$have_libusb_1_0" = "yes"; then |
| 29 | + CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS" |
| 30 | + fi |
| 31 | fi |
| 32 | fi |
| 33 | |