Skip to content

Commit

Permalink
changed, remove libusb from libcec depends
Browse files Browse the repository at this point in the history
  • Loading branch information
@davilla
davilla committed Oct 15, 2011
1 parent befb23d commit e9f4ea7
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions configure.in
View file
Expand Up @@ -1139,14 +1139,13 @@ if test "x$use_libcec" != "xno"; then
# libcec is dyloaded, so we need to check for its headers and link any depends.
PKG_CHECK_MODULES([CEC],[libcec = 0.7.0],,[use_libcec="no";AC_MSG_RESULT($libcec_disabled)])
if test "x$use_libcec" != "xno" && test "$host_vendor" != "apple"; then
# libcec has libudev as depends under linux and we also need usb headers.
PKG_CHECK_MODULES([USB],[libusb],,[use_libcec="no";AC_MSG_RESULT($libusb_not_found)])
# libcec has libudev as depends under linux.

This comment has been minimized.

Sign in to view

Copy link
@opdenkamp

opdenkamp Oct 15, 2011

Member

it's not just libcec that has libudev as depends, it's PeripheralBusUSB on linux too (general usb device detection)

This comment has been minimized.

Sign in to view

Copy link
@sraue

sraue Oct 15, 2011

Member

what about using

--enable-peripherials

which checks for libudev (if not found for libusb) and

--enable-peripherials-cec

which depends on enabled --enable-peripherials and additional libcec. further peripherials can be added as --enable-peripherials-
PKG_CHECK_MODULES([UDEV],[libudev],,[use_libcec="no";AC_MSG_RESULT($libudev_not_found)])
fi
if test "x$use_libcec" != "xno"; then
if test "$host_vendor" != "apple"; then
# if linux, bring in usb and udev cflags but only udev as lib.
INCLUDES="$INCLUDES $USB_CFLAGS $UDEV_CFLAGS";LIBS="$LIBS $UDEV_LIBS"
# if linux, bring in udev cflags and add lib.
INCLUDES="$INCLUDES $UDEV_CFLAGS";LIBS="$LIBS $UDEV_LIBS"
USE_LIBUDEV=1;AC_DEFINE([HAVE_LIBUDEV],[1],["Define to 1 if libudev is installed"])
fi
INCLUDES="$INCLUDES $CEC_CFLAGS"
Expand Down

2 comments on commit e9f4ea7

@davilla
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's why I kept the checks for libudev and libusb separate from libcec :)

@davilla
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on osx, --enable-peripherials is sort of meaning-less as it uses native usb methods for device detection. no libusb there.

Please sign in to comment.