Add initial implementation of g_dbus_add_signal_watch

[framework/connectivity/connman.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0884e80..93501ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(connman, 0.43)
+AC_INIT(connman, 0.47)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -92,12 +92,6 @@ AC_ARG_ENABLE(ofono,
 AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no")
 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}" != "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}])
 
@@ -149,6 +143,23 @@ fi
 AM_CONDITIONAL(RESOLVCONF, test "${enable_resolvconf}" != "no")
 AM_CONDITIONAL(RESOLVCONF_BUILTIN, test "${enable_resolvconf}" = "builtin")
 
+AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM],
+        [specify location of openconnect binary]), [path_openconnect=${withval}])
+
+AC_ARG_ENABLE(openconnect,
+        AC_HELP_STRING([--enable-openconnect], [enable openconnect support]),
+                        [enable_openconnect=${enableval}], [enable_openconnect="no"])
+if (test "${enable_openconnect}" != "no"); then
+        if (test -z "${path_openconnect}"); then
+                AC_PATH_PROG(OPENCONNECT, [openconnect], [], $PATH:/sbin:/usr/sbin)
+        else
+                OPENCONNECT="${path_openconnect}"
+                AC_SUBST(OPENCONNECT)
+        fi
+fi
+AM_CONDITIONAL(OPENCONNECT, test "${enable_openconnect}" != "no")
+AM_CONDITIONAL(OPENCONNECT_BUILTIN, test "${enable_openconnect}" = "builtin")
+
 AC_ARG_ENABLE(loopback,
        AC_HELP_STRING([--enable-loopback], [enable loopback support]),
                        [enable_loopback=${enableval}], [enable_loopback="no"])
@@ -168,13 +179,17 @@ AC_ARG_ENABLE(dnsproxy,
 AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" != "no")
 AM_CONDITIONAL(DNSPROXY_BUILTIN, test "${enable_dnsproxy}" = "builtin")
 
-AC_ARG_ENABLE(novatel, AC_HELP_STRING([--enable-novatel],
-               [enable Novatel support]), [enable_novatel=${enableval}])
-AM_CONDITIONAL(NOVATEL, test "${enable_novatel}" = "yes")
+AC_ARG_ENABLE(google,
+       AC_HELP_STRING([--enable-google], [enable Google Public DNS support]),
+                       [enable_google=${enableval}], [enable_google="no"])
+AM_CONDITIONAL(GOOGLE, test "${enable_google}" != "no")
+AM_CONDITIONAL(GOOGLE_BUILTIN, test "${enable_google}" = "builtin")
 
-AC_ARG_ENABLE(huawei, AC_HELP_STRING([--enable-huawei],
-               [enable HUAWEI support]), [enable_huawei=${enableval}])
-AM_CONDITIONAL(HUAWEI, test "${enable_huawei}" = "yes")
+AC_ARG_ENABLE(moblin,
+       AC_HELP_STRING([--enable-moblin], [enable Moblin features support]),
+                       [enable_moblin=${enableval}], [enable_moblin="no"])
+AM_CONDITIONAL(MOBLIN, test "${enable_moblin}" != "no")
+AM_CONDITIONAL(MOBLIN_BUILTIN, test "${enable_moblin}" = "builtin")
 
 AC_ARG_ENABLE(hso,
        AC_HELP_STRING([--enable-hso], [enable HSO support]),
@@ -188,24 +203,6 @@ AC_ARG_ENABLE(mbm,
 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}])
-
-AC_ARG_ENABLE(ppp, AC_HELP_STRING([--enable-ppp],
-               [enable PPP support]), [enable_ppp=${enableval}])
-if (test "${enable_ppp}" = "yes" || test "${enable_novatel}" = "yes" ||
-                                       test "${enable_huawei}" = "yes"); then
-       if (test -z "${path_pppd}"); then
-               AC_PATH_PROG(PPPD, [pppd], [], $PATH:/sbin:/usr/sbin)
-       else
-               PPPD="${path_pppd}"
-               AC_SUBST(PPPD)
-       fi
-       AC_CHECK_HEADERS(pppd/pppd.h, enable_ppp=yes,
-                       AC_MSG_ERROR(PPP development files are required))
-fi
-AM_CONDITIONAL(PPPD, test "${enable_ppp}" = "yes")
-
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
                        AC_MSG_ERROR(dynamic linking loader is required))
 
@@ -341,18 +338,24 @@ AC_ARG_ENABLE(fake, AC_HELP_STRING([--enable-fake],
                [enable fake device support]), [enable_fake=${enableval}])
 AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes")
 
+AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng],
+               [enable capabilities support]), [enable_capng=${enableval}])
+if (test "${enable_capng}" = "yes"); then
+       PKG_CHECK_MODULES(CAPNG, libcap-ng, dummy=yes,
+                               AC_MSG_ERROR(Capabilities library is required))
+       AC_SUBST(CAPNG_CFLAGS)
+       AC_SUBST(CAPNG_LIBS)
+       AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
+fi
+
 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"