65 lines
2.5 KiB
Text
65 lines
2.5 KiB
Text
$NetBSD: patch-configure.ac,v 1.2 2021/03/25 10:47:24 nia Exp $
|
|
|
|
- Fix syntax for autoconf-2.71
|
|
- Always use pkg-config to find libusb1.
|
|
- Support NetBSD.
|
|
|
|
--- configure.ac.orig 2019-06-19 10:34:38.000000000 +0000
|
|
+++ configure.ac
|
|
@@ -20,7 +20,6 @@ LTLDFLAGS="-version-info ${lt_current}:$
|
|
|
|
AC_CONFIG_MACRO_DIR([m4])
|
|
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
|
|
-AC_CONFIG_MACRO_DIR([m4])
|
|
|
|
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
|
LT_INIT
|
|
@@ -92,9 +91,10 @@ case $host in
|
|
CFLAGS="$CFLAGS -I/usr/local/include"
|
|
LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
|
LIBS="${LIBS}"
|
|
- AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
|
|
+ PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
|
|
+ LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
|
|
+ CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
|
|
AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
|
|
- echo libs_priv: $LIBS_LIBUSB_PRIVATE
|
|
;;
|
|
*-kfreebsd*)
|
|
AC_MSG_RESULT([ (kFreeBSD back-end)])
|
|
@@ -104,8 +104,25 @@ case $host in
|
|
os="kfreebsd"
|
|
threads="pthreads"
|
|
|
|
- AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
|
|
- echo libs_priv: $LIBS_LIBUSB_PRIVATE
|
|
+ PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
|
|
+ LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
|
|
+ CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
|
|
+ ;;
|
|
+*-netbsd*)
|
|
+ AC_MSG_RESULT([ (NetBSD back-end)])
|
|
+ AC_DEFINE(OS_NETBSD, 1, [NetBSD implementation])
|
|
+ AC_SUBST(OS_NETBSD)
|
|
+ backend="libusb"
|
|
+ os="netbsd"
|
|
+ threads="pthreads"
|
|
+
|
|
+ CFLAGS="${CFLAGS}"
|
|
+ LDFLAGS="${LDFLAGS}"
|
|
+ LIBS="${LIBS}"
|
|
+ AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
|
|
+ PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
|
|
+ LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
|
|
+ CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
|
|
;;
|
|
*-mingw*)
|
|
AC_MSG_RESULT([ (Windows back-end, using MinGW)])
|
|
@@ -213,6 +230,7 @@ AM_CONDITIONAL(OS_LINUX, test "x$os" = x
|
|
AM_CONDITIONAL(OS_DARWIN, test "x$os" = xdarwin)
|
|
AM_CONDITIONAL(OS_FREEBSD, test "x$os" = xfreebsd)
|
|
AM_CONDITIONAL(OS_KFREEBSD, test "x$os" = xkfreebsd)
|
|
+AM_CONDITIONAL(OS_NETBSD, test "x$os" = xnetbsd)
|
|
AM_CONDITIONAL(OS_WINDOWS, test "x$os" = xwindows)
|
|
|
|
AC_CONFIG_HEADERS([config.h])
|