From 7e07ae592ef6bfdc7c4a200809a0c9c9a0b41646 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Tue, 8 Oct 2013 14:57:08 +0200 Subject: [PATCH 1/3] lirc-0.9.0: libusb config is no more --- lirc-0.9.0/configure.ac | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lirc-0.9.0/configure.ac b/lirc-0.9.0/configure.ac index 052908b..20e37a4 100644 --- a/lirc-0.9.0/configure.ac +++ b/lirc-0.9.0/configure.ac @@ -20,11 +20,11 @@ AC_PROG_MAKE_SET AC_PATH_PROG(mknod, mknod, /bin/mknod) AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo) AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin) -AC_PATH_PROG(LIBUSB_CONFIG, libusb-config) AC_PROG_LN_S AC_PROG_LIBTOOL AM_PATH_PYTHON(,, [:]) AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""]) +LIBUSB_CONFIG="pkg-config libusb" dnl Checks for header files. AC_HEADER_STDC @@ -310,15 +310,14 @@ AH_TEMPLATE([SYSCONFDIR], AH_TEMPLATE([USE_SYSLOG], [define if you want to log to syslog instead of logfile]) -if test -n "${LIBUSB_CONFIG}"; then - AC_DEFINE(HAVE_LIBUSB) - possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" -fi - AC_CHECK_LIB(caraca_client, caraca_init, AC_DEFINE(HAVE_LIBCARACA) possible_drivers="${possible_drivers} (caraca)" ) +AC_CHECK_HEADER(usb.h, + AC_DEFINE(HAVE_LIBUSB) + possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" +) AC_CHECK_HEADER(ftdi.h, AC_DEFINE(HAVE_FTDI) possible_drivers="${possible_drivers} (ftdi)" @@ -1449,7 +1448,7 @@ Get it at: Or install these packages from your distro: libusb - libusb-dev + libusb-devel ]) ;; -- 1.8.3.1