From 3f490a69cb55a4bcea1f4cb51a053d7f9f8237e5 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 16 Jan 2024 13:51:57 +0000 Subject: [PATCH] build: require libudev 196, circa 2012 libudev 196 (systemd really) was released back in 2012, which introduces the hwdb API. Bump the requirement, since even long retired distributions like Debian oldold stable (aka Buster) include newer versions. --- configure.ac | 6 ++---- monitor/hwdb.c | 2 +- src/oui.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 7cbfa8846..cab5da581 100644 --- a/configure.ac +++ b/configure.ac @@ -223,10 +223,8 @@ AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no") AC_ARG_ENABLE(udev, AS_HELP_STRING([--disable-udev], [disable udev device support]), [enable_udev=${enableval}]) if (test "${enable_tools}" != "no" && test "${enable_udev}" != "no"); then - PKG_CHECK_MODULES(UDEV, libudev >= 172) - AC_CHECK_LIB(udev, udev_hwdb_new, - AC_DEFINE(HAVE_UDEV_HWDB_NEW, 1, - [Define to 1 if you have the udev_hwdb_new() function.])) + PKG_CHECK_MODULES(UDEV, libudev >= 196) + AC_DEFINE(HAVE_UDEV, 1, [Define to 1 if udev is required]) fi AC_ARG_WITH([udevdir], AS_HELP_STRING([--with-udevdir=DIR], diff --git a/monitor/hwdb.c b/monitor/hwdb.c index 22de9edfb..6c0d052bb 100644 --- a/monitor/hwdb.c +++ b/monitor/hwdb.c @@ -19,7 +19,7 @@ #include "hwdb.h" -#ifdef HAVE_UDEV_HWDB_NEW +#ifdef HAVE_UDEV #include bool hwdb_get_vendor_model(const char *modalias, char **vendor, char **model) diff --git a/src/oui.c b/src/oui.c index c434f416f..7b3040fb0 100644 --- a/src/oui.c +++ b/src/oui.c @@ -16,7 +16,7 @@ #include "lib/bluetooth.h" #include "oui.h" -#ifdef HAVE_UDEV_HWDB_NEW +#ifdef HAVE_UDEV #include char *batocomp(const bdaddr_t *ba) -- 2.47.3