diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | plugins/udev.c | 17 |
2 files changed, 1 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index fa339474..c6c94de7 100644 --- a/configure.ac +++ b/configure.ac @@ -105,14 +105,10 @@ AC_ARG_ENABLE(udev, AC_HELP_STRING([--disable-udev], [don't use udev support even if available]), [enable_udev=${enableval}]) if (test "${enable_udev}" != "no"); then - PKG_CHECK_MODULES(UDEV, libudev >= 141, + PKG_CHECK_MODULES(UDEV, libudev >= 143, [enable_udev="yes"], [enable_udev="no"]) fi if (test "${enable_udev}" = "yes"); then - AC_CHECK_LIB(udev, udev_monitor_filter_update, dummy=yes, - AC_DEFINE(NEED_UDEV_MONITOR_FILTER, 1, - [Define to 1 if you need the - udev_monitor_filter...() functions.])) UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`" if (test -z "${UDEV_DATADIR}"); then UDEV_DATADIR="${sysconfdir}/udev/rules.d" diff --git a/plugins/udev.c b/plugins/udev.c index d63cfdcf..243ce9bd 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -25,7 +25,6 @@ #include <errno.h> -#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE #include <libudev.h> #include <glib.h> @@ -35,22 +34,6 @@ #include <ofono/modem.h> #include <ofono/log.h> -#ifdef NEED_UDEV_MONITOR_FILTER -static int udev_monitor_filter_add_match_subsystem_devtype(struct udev_monitor *udev_monitor, - const char *subsystem, const char *devtype) -{ - return -EINVAL; -} -static int udev_monitor_filter_update(struct udev_monitor *udev_monitor) -{ - return -EINVAL; -} -static int udev_monitor_filter_remove(struct udev_monitor *udev_monitor) -{ - return -EINVAL; -} -#endif - static GSList *modem_list = NULL; static struct ofono_modem *find_modem(const char *devpath) |