Reset disconnected state if carrier changes

[connman] / configure.ac

diff --git a/configure.ac b/configure.ac
index 69f028a..ba28251 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,10 @@ AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--enable-bluetooth],
                [enable Bluetooth support]), [enable_bluetooth=${enableval}])
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" = "yes")
 
+AC_ARG_ENABLE(modemmgr, AC_HELP_STRING([--enable-modemmgr],
+                [enable Modem Manager support]), [enable_modemmgr=${enableval}])
+AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" = "yes")
+
 AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM],
        [specify location of udhcpc binary]), [path_udhcpc=${withval}])
 
@@ -203,6 +207,9 @@ fi
 
 PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
                                AC_MSG_ERROR(D-Bus >= 1.0 is required))
+AC_CHECK_LIB(dbus-1, dbus_watch_get_unix_fd, dummy=yes,
+       AC_DEFINE(NEED_DBUS_WATCH_GET_UNIX_FD, 1,
+               [Define to 1 if you need the dbus_watch_get_unix_fd() function.]))
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 DBUS_DATADIR="`$PKG_CONFIG --variable=sysconfdir dbus-1`"
@@ -235,6 +242,16 @@ AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client],
                [enable command line client]), [enable_client=${enableval}])
 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,
+                               AC_MSG_ERROR(Netlink library is required))
+       AC_SUBST(NETLINK_CFLAGS)
+       AC_SUBST(NETLINK_LIBS)
+fi
+AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
+
 AC_ARG_ENABLE(fake, AC_HELP_STRING([--enable-fake],
                [enable fake device support]), [enable_fake=${enableval}])
 AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes")
@@ -247,6 +264,8 @@ AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 SHAVE_INIT
 
 AC_OUTPUT(Makefile gdbus/Makefile include/Makefile include/version.h
-               src/Makefile src/connman.service scripts/connman
-               scripts/Makefile plugins/Makefile client/Makefile
-               test/Makefile doc/Makefile doc/version.xml connman.pc)
+                               src/Makefile src/connman.service
+                               scripts/connman scripts/Makefile
+                               plugins/Makefile client/Makefile
+                               tools/Makefile test/Makefile
+                               doc/Makefile doc/version.xml connman.pc)