From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 3 Jul 2009 20:39:43 +0000 (-0700)
Subject: Require at minimum udev-141
X-Git-Tag: 0.21~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86d80bd128016ec8c0354278e7816b2b184e0fc2;p=platform%2Fupstream%2Fconnman.git

Require at minimum udev-141
---

diff --git a/configure.ac b/configure.ac
index eb9cb45..f65f828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,17 +199,8 @@ AC_ARG_ENABLE(udev, AC_HELP_STRING([--enable-udev],
 		[enable udev support]), [enable_udev=${enableval}])
 if (test "${enable_udev}" = "yes"); then
 	AC_DEFINE(HAVE_UDEV, 1, [Define if udev support is available])
-	PKG_CHECK_MODULES(UDEV, libudev >= 129, dummy=yes,
-				AC_MSG_ERROR(udev >= 129 is required))
-	AC_CHECK_LIB(udev, udev_enumerate_add_match_property, dummy=yes,
-		AC_DEFINE(NEED_UDEV_ENUMERATE_ADD_MATCH_PROPERTY, 1,
-			[Define to 1 if you need the
-				udev_enumerate_add_match_property() function.]))
-	AC_CHECK_LIB(udev, udev_device_get_parent_with_subsystem_devtype, dummy=yes,
-		AC_DEFINE(NEED_UDEV_DEVICE_GET_PARENT_WITH_SUBSYSTEM_DEVTYPE, 1,
-			[Define to 1 if you need the
-				udev_device_get_parent_with_subsystem_devtype()
-									function.]))
+	PKG_CHECK_MODULES(UDEV, libudev >= 141, dummy=yes,
+				AC_MSG_ERROR(udev >= 141 is required))
 	UDEV_DATADIR="`$PKG_CONFIG --variable=rulesdir libudev`"
 	if (test -z "${UDEV_DATADIR}"); then
 		UDEV_DATADIR="${sysconfdir}/udev/rules.d"
diff --git a/src/udev.c b/src/udev.c
index ff81955..d6a25b0 100644
--- a/src/udev.c
+++ b/src/udev.c
@@ -33,22 +33,6 @@
 
 #include "connman.h"
 
-#ifdef NEED_UDEV_ENUMERATE_ADD_MATCH_PROPERTY
-static int udev_enumerate_add_match_property(struct udev_enumerate *enumerate,
-					const char *property, const char *value)
-{
-	return -EINVAL;
-}
-#endif
-
-#ifdef NEED_UDEV_DEVICE_GET_PARENT_WITH_SUBSYSTEM_DEVTYPE
-static struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *device,
-						const char *subsystem, const char *devtype)
-{
-	return NULL;
-}
-#endif
-
 static GSList *device_list = NULL;
 
 static struct connman_device *find_device(const char *interface)