Fix MBM detection code to find first control interface

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

diff --git a/configure.ac b/configure.ac
index 2a7ca87..8c10060 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,22 @@
 AC_PREREQ(2.60)
 AC_INIT()
 
-AM_INIT_AUTOMAKE(connman, 0.19)
+AM_INIT_AUTOMAKE(connman, 0.23)
 AM_CONFIG_HEADER(config.h)
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AM_MAINTAINER_MODE
 
 AC_PREFIX_DEFAULT(/usr/local)
 
+PKG_PROG_PKG_CONFIG
+
 COMPILER_FLAGS
 
+AC_SUBST(abs_top_srcdir)
+AC_SUBST(abs_top_builddir)
+
 AC_LANG_C
 
 AC_PROG_CC
@@ -25,8 +32,6 @@ AC_PROG_LIBTOOL
 
 GTK_DOC_CHECK
 
-SHAVE_ARG_ENABLE
-
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
                        [enable compiling with debugging information]), [
        if (test "${enableval}" = "yes" &&
@@ -85,7 +90,8 @@ AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin")
 AC_ARG_ENABLE(modemmgr,
        AC_HELP_STRING([--enable-modemmgr], [enable Modem Manager support]),
                        [enable_modemmgr=${enableval}], [enable_modemmgr="no"])
-AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" = "yes")
+AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" != "no")
+AM_CONDITIONAL(MODEMMGR_BUILTIN, test "${enable_modemmgr}" = "builtin")
 
 AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM],
        [specify location of udhcpc binary]), [path_udhcpc=${withval}])
@@ -158,6 +164,12 @@ AC_ARG_ENABLE(hso,
 AM_CONDITIONAL(HSO, test "${enable_hso}" != "no")
 AM_CONDITIONAL(HSO_BUILTIN, test "${enable_hso}" = "builtin")
 
+AC_ARG_ENABLE(mbm,
+       AC_HELP_STRING([--enable-mbm], [enable MBM support]),
+                       [enable_mbm=${enableval}], [enable_mbm="no"])
+AM_CONDITIONAL(MBM, test "${enable_mbm}" != "no")
+AM_CONDITIONAL(MBM_BUILTIN, test "${enable_mbm}" = "builtin")
+
 AC_ARG_WITH(pppd, AC_HELP_STRING([--with-pppd=PROGRAM],
        [specify location of pppd binary]), [path_pppd=${withval}])
 
@@ -185,24 +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 >= 129, enable_udev=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,
+       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_device_get_parent_with_subsystem_devtype()
-                                                                       function.]))
-       UDEV_DATADIR="`$PKG_CONFIG --variable=rulesdir libudev`"
+                                       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
@@ -219,7 +225,7 @@ AC_ARG_ENABLE(iwmx, AC_HELP_STRING([--enable-iwmx],
 if (test "${enable_iwmx}" = "yes"); then
        enable_threads="yes"
        export PKG_CONFIG_PATH="${pkgconfig_iwmxsdk}"
-       PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, enable_iwmx=yes,
+       PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, dummy=yes,
                                AC_MSG_ERROR(Intel WiMAX SDK is required))
        PKG_CONFIG_PATH=""
        AC_SUBST(IWMXSDK_CFLAGS)
@@ -289,7 +295,7 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes")
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
                [enable testing tools]), [enable_tools=${enableval}])
 if (test "${enable_tools}" = "yes"); then
-       PKG_CHECK_MODULES(NETLINK, libnl-1, enable_netlink=yes,
+       PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes,
                                AC_MSG_ERROR(Netlink library is required))
        AC_SUBST(NETLINK_CFLAGS)
        AC_SUBST(NETLINK_LIBS)
@@ -305,8 +311,6 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
                                        [enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
-SHAVE_INIT
-
 AC_OUTPUT(Makefile gdbus/Makefile gatchat/Makefile
                                include/Makefile include/version.h
                                src/Makefile src/connman.service