Skip to content

Commit fc677b8

Browse files
z3ntuQbicz
authored andcommitted
configure.ac: Use pkg-config to find libusb on *freebsd
1 parent 9b1a3e8 commit fc677b8

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

configure.ac

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ case $host in
9292
CFLAGS="$CFLAGS -I/usr/local/include"
9393
LDFLAGS="$LDFLAGS -L/usr/local/lib"
9494
LIBS="${LIBS}"
95-
AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
95+
PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
96+
LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
97+
CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
9698
AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
97-
echo libs_priv: $LIBS_LIBUSB_PRIVATE
9899
;;
99100
*-kfreebsd*)
100101
AC_MSG_RESULT([ (kFreeBSD back-end)])
@@ -104,8 +105,9 @@ case $host in
104105
os="kfreebsd"
105106
threads="pthreads"
106107

107-
AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
108-
echo libs_priv: $LIBS_LIBUSB_PRIVATE
108+
PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
109+
LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
110+
CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
109111
;;
110112
*-mingw*)
111113
AC_MSG_RESULT([ (Windows back-end, using MinGW)])

0 commit comments

Comments
 (0)