mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

Make libudev optional.

Browse Source
This commit is contained in:
Martin Ling 2013-12-05 20:18:32 +00:00
parent 6c8716e9da
commit 397d89de3a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -86,10 +86,15 @@ SP_PKGLIBS=""
case $target_os in case $target_os in
*linux*) *linux*)
# On Linux libudev is currently a hard requirement. # On Linux libudev is currently required for enumeration.
AC_ARG_WITH([libudev],
[AS_HELP_STRING([--with-libudev],
[use libudev for serial port enumeration @<:@default=check@:>@])],
[], [with_libudev=check])
AS_IF([test "x$with_libudev" != xno], [
PKG_CHECK_MODULES([libudev], [libudev >= 0], PKG_CHECK_MODULES([libudev], [libudev >= 0],
[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS"; [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
SP_PKGLIBS="$SP_PKGLIBS libudev"]) SP_PKGLIBS="$SP_PKGLIBS libudev"; AC_DEFINE(HAVE_LIBUDEV)])], [])
;; ;;
*darwin*) *darwin*)
LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation" LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"

4
serialport.c
View File

@ -47,7 +47,9 @@
#include <sys/syslimits.h> #include <sys/syslimits.h>
#endif #endif
#ifdef __linux__ #ifdef __linux__
#ifdef HAVE_LIBUDEV
#include "libudev.h" #include "libudev.h"
#endif
#include "linux/serial.h" #include "linux/serial.h"
#include "linux_termios.h" #include "linux_termios.h"
@ -460,7 +462,7 @@ out_release:
IOObjectRelease(iter); IOObjectRelease(iter);
out_done: out_done:
#endif #endif
#ifdef __linux__ #if defined(__linux__) && defined(HAVE_LIBUDEV)
struct udev *ud; struct udev *ud;
struct udev_enumerate *ud_enumerate; struct udev_enumerate *ud_enumerate;
struct udev_list_entry *ud_list; struct udev_list_entry *ud_list;