Fix MBM detection code to find first control interface

[platform/upstream/connman.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f65f828..8c10060 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.20)
+AM_INIT_AUTOMAKE(connman, 0.23)
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -10,6 +10,8 @@ AM_MAINTAINER_MODE
 
 AC_PREFIX_DEFAULT(/usr/local)
 
+PKG_PROG_PKG_CONFIG
+
 COMPILER_FLAGS
 
 AC_SUBST(abs_top_srcdir)
@@ -195,15 +197,18 @@ AC_CHECK_LIB(c, inotify_init, dummy=yes,
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
                        AC_MSG_ERROR(dynamic linking loader is required))
 
-AC_ARG_ENABLE(udev, AC_HELP_STRING([--enable-udev],
-               [enable udev support]), [enable_udev=${enableval}])
+PKG_CHECK_MODULES(UDEV, libudev >= 141,
+                               [enable_udev="yes"], [enable_udev="no"])
 if (test "${enable_udev}" = "yes"); then
-       AC_DEFINE(HAVE_UDEV, 1, [Define if udev support is available])
-       PKG_CHECK_MODULES(UDEV, libudev >= 141, dummy=yes,
-                               AC_MSG_ERROR(udev >= 141 is required))
-       UDEV_DATADIR="`$PKG_CONFIG --variable=rulesdir libudev`"
+       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"
+       else
+               UDEV_DATADIR="${UDEV_DATADIR}/rules.d"
        fi
        AC_SUBST(UDEV_DATADIR)
 fi