Require udev-143 or later

diff --git a/configure.ac b/configure.ac
index 9709b9e..9062131 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -346,14 +346,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/src/udev.c b/src/udev.c
index 5e4fdd3..ebc5887 100644 (file)
--- a/src/udev.c
+++ b/src/udev.c
@@ -27,29 +27,12 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
 #include <libudev.h>
 
 #include <glib.h>
 
 #include "connman.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 gboolean rfkill_processing = FALSE;
 
 static GSList *device_list = NULL;